feat(chart): use nodeSelector instead of affinity, support replicaCou…

…nt and affinity
kubernetes-sigs · Sep 13, 2022 · 1b803ed · 1b803ed
1 parent 8e61536
commit 1b803ed
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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 }}
diff --git 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: []