From b20cb5dbd5b01a7b63b5b629991a67498cf876bd Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrew.cobaugh@gmail.com>
Date: Tue, 13 Sep 2022 15:56:48 -0400
Subject: [PATCH] feat(chart): use nodeSelector instead of affinity, support
 replicaCount and affinity

---
 charts/gmsa/Chart.yaml                |   2 +-
 charts/gmsa/templates/deployment.yaml |  18 ++++++++---------
 charts/gmsa/templates/pdb.yaml        |  19 ++++++++++++++++++
 charts/gmsa/values.yaml               |   8 ++++++++
 charts/repo/gmsa-0.5.0.tgz            | Bin 0 -> 4045 bytes
 charts/repo/index.yaml                |  27 +++++++++++++++++++++-----
 6 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 charts/gmsa/templates/pdb.yaml
 create mode 100644 charts/repo/gmsa-0.5.0.tgz

diff --git a/charts/gmsa/Chart.yaml b/charts/gmsa/Chart.yaml
index 1f583978..98d5d124 100644
--- a/charts/gmsa/Chart.yaml
+++ b/charts/gmsa/Chart.yaml
@@ -10,4 +10,4 @@ name: gmsa
 sources:
 - https://github.com/kubernetes-sigs/windows-gmsa
 type: application
-version: 0.4.4
+version: 0.5.0
diff --git a/charts/gmsa/templates/deployment.yaml b/charts/gmsa/templates/deployment.yaml
index 57bc8d6d..2139cb93 100644
--- a/charts/gmsa/templates/deployment.yaml
+++ b/charts/gmsa/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{.Release.Namespace}}
   labels: {{ include "gmsa.chartref" . | nindent 4 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app: {{ .Release.Name }}
@@ -18,19 +18,19 @@ spec:
       securityContext: {{ toYaml .Values.podSecurityContext | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ .Release.Name }}
+      {{- with .Values.affinity }}
       affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/os
-                    operator: In
-                    values:
-                      - linux
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+      {{- with .Values.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Release.Name }}
           image: '{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}'
diff --git a/charts/gmsa/templates/pdb.yaml b/charts/gmsa/templates/pdb.yaml
new file mode 100644
index 00000000..73fc397b
--- /dev/null
+++ b/charts/gmsa/templates/pdb.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:  {{ include "gmsa.chartref" . | nindent 4 }}
+
+spec:
+{{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+{{- end }}
+{{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/gmsa/values.yaml b/charts/gmsa/values.yaml
index b083614b..c93650ac 100644
--- a/charts/gmsa/values.yaml
+++ b/charts/gmsa/values.yaml
@@ -31,7 +31,15 @@ setPodOs: ture
 global:
   systemDefaultRegistry: ""
 
+affinity: {}
+nodeselector: {}
+podDisruptionBudget:
+  enabled: false
+  # minAvailable: 1
+  # maxUnavailable: 1
+
 podSecurityContext: {}
+replicaCount: 2
 securityContext: {}
 tolerations: []
 
diff --git a/charts/repo/gmsa-0.5.0.tgz b/charts/repo/gmsa-0.5.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..55e6e13d905cefb708aad36ba9e3557ee385b7f2
GIT binary patch
literal 4045
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

literal 0
HcmV?d00001

diff --git a/charts/repo/index.yaml b/charts/repo/index.yaml
index e63b075f..e5332bf6 100644
--- a/charts/repo/index.yaml
+++ b/charts/repo/index.yaml
@@ -3,7 +3,24 @@ entries:
   gmsa:
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2022-07-19T13:45:23.7139652-07:00"
+    created: "2022-09-13T21:57:51.527971-04:00"
+    description: Windows GMSA Configuration
+    digest: 19003bcc3f5af484afd5a9ad0c833a861420daf7e50964563ecaf92e4a1dc35c
+    keywords:
+    - Windows
+    - Windows GMSA
+    - GMSA
+    - Active Directory
+    name: gmsa
+    sources:
+    - https://github.com/kubernetes-sigs/windows-gmsa
+    type: application
+    urls:
+    - gmsa-0.5.0.tgz
+    version: 0.5.0
+  - apiVersion: v2
+    appVersion: 0.4.0
+    created: "2022-09-13T21:57:51.527486-04:00"
     description: Windows GMSA Configuration
     digest: 1f6b8bbfe6af4088f80d08d3065094ab1504054526bea6e4477459fb738f504b
     keywords:
@@ -20,7 +37,7 @@ entries:
     version: 0.4.4
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2022-07-19T13:45:23.7136327-07:00"
+    created: "2022-09-13T21:57:51.526874-04:00"
     description: Windows GMSA Configuration
     digest: 399a4d03dfc08ac4cd811106ab55d525845ca715f0edbdcfcafcfa02cceaf108
     keywords:
@@ -37,7 +54,7 @@ entries:
     version: 0.4.2
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2022-07-19T13:45:23.7132983-07:00"
+    created: "2022-09-13T21:57:51.526244-04:00"
     description: Windows GMSA Configuration
     digest: 0709c8666554bf7b521c003d33f6198dafe03bf883161e132e929dac478bda45
     keywords:
@@ -54,7 +71,7 @@ entries:
     version: 0.4.1
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2022-07-19T13:45:23.7129363-07:00"
+    created: "2022-09-13T21:57:51.525622-04:00"
     description: Windows GMSA Configuration
     digest: 7f29d22ba85d90a18e5b9c4e1a7d9ba1149d5827a2ca37b9a6fe1966e3598767
     keywords:
@@ -69,4 +86,4 @@ entries:
     urls:
     - gmsa-0.4.0.tgz
     version: 0.4.0
-generated: "2022-07-19T13:45:23.712461-07:00"
+generated: "2022-09-13T21:57:51.524379-04:00"