generic 1.9.0

Author: dbpolito

charts/generic/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v2
 name: generic
 description: Generic Chart
-version: 1.8.2
+version: 1.9.0

charts/generic/templates/deployment.yaml

@@ -167,12 +167,12 @@ spec:
           {{- end }}
         {{- end }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.deployment.nodeSelector | default .Values.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.deployment.affinity | default .Values.affinity }}
       affinity: {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.deployment.tolerations | default .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

charts/generic/templates/jobs.yaml

@@ -23,7 +23,7 @@ metadata:
     "helm.sh/hook": {{ . }}
     {{- end }}
     {{- with $job.hookWeight }}
-    "helm.sh/hook-weight": {{ . }}
+    "helm.sh/hook-weight": {{ . | quote }}
     {{- end }}
     {{- with $job.hookDeletePolicy }}
     "helm.sh/hook-delete-policy": {{ . }} # hook-succeeded

charts/generic/templates/role.yaml

@@ -3,5 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "generic.serviceAccountName" . }}
+  labels: {{ include "generic.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.role.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
 rules: {{ toYaml .Values.serviceAccount.role.rules | nindent 2 }}
 {{- end }}

charts/generic/templates/rolebinding.yaml

@@ -4,6 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ $serviceAccountName }}
+  labels: {{ include "generic.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.role.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
 subjects:
   - kind: ServiceAccount
     name: {{ $serviceAccountName }}

charts/generic/values.yaml

@@ -178,6 +178,7 @@ serviceAccount:
 
   role:
     create: false
+    # annotations: {}
     rules: []
 
 # annotations: {}
@@ -214,6 +215,11 @@ serviceAccount:
 #   targetCPUUtilizationPercentage: 80
 #   # targetMemoryUtilizationPercentage: 80
 
+deployment: {}
+  # nodeSelector:
+  # tolerations:
+  # affinity:
+
 # nodeSelector:
 
 # tolerations: