Prevent terminationGracePeriodSeconds being treated as string in helm…

… charts (#628) add terminationGracePeriodSeconds to serverConfig in helm charts via json6902
SeldonIO · Nov 23, 2022 · c4b5476 · c4b5476
1 parent 085e553
commit c4b5476
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
@@ -1410,7 +1410,8 @@ spec:
     securityContext: {{- toYaml .Values.serverConfig.securityContext
       | nindent 6 }}
     serviceAccountName: seldon-server
-    terminationGracePeriodSeconds: '{{ .Values.serverConfig.terminationGracePeriodSeconds}}'
+    terminationGracePeriodSeconds: {{ .Values.serverConfig.terminationGracePeriodSeconds
+      }}
     volumes:
     - name: downstream-ca-certs
       secret:
@@ -1648,7 +1649,8 @@ spec:
     securityContext: {{- toYaml .Values.serverConfig.securityContext
       | nindent 6 }}
     serviceAccountName: seldon-server
-    terminationGracePeriodSeconds: '{{ .Values.serverConfig.terminationGracePeriodSeconds}}'
+    terminationGracePeriodSeconds: {{ .Values.serverConfig.terminationGracePeriodSeconds
+      }}
     volumes:
     - configMap:
         name: seldon-agent

diff --git a/k8s/kustomize/helm-components/patch_mlserver.yaml b/k8s/kustomize/helm-components/patch_mlserver.yaml
@@ -4,7 +4,6 @@ metadata:
   name: mlserver
 spec:
   podSpec:
-    terminationGracePeriodSeconds: '{{ .Values.serverConfig.terminationGracePeriodSeconds}}'
     containers:
     - image: '{{ .Values.serverConfig.rclone.image.registry }}/{{ .Values.serverConfig.rclone.image.repository }}:{{ .Values.serverConfig.rclone.image.tag }}'
       imagePullPolicy: '{{ .Values.serverConfig.rclone.image.pullPolicy }}'

diff --git a/k8s/kustomize/helm-components/patch_mlserver_serverconfig_json6902.yaml b/k8s/kustomize/helm-components/patch_mlserver_serverconfig_json6902.yaml
@@ -1,3 +1,6 @@
 - op: replace
   path: /spec/podSpec/securityContext
   value: HACK_REMOVE_ME{{- toYaml .Values.serverConfig.securityContext | nindent 6 }}
+- op: add
+  path: /spec/podSpec/terminationGracePeriodSeconds
+  value: HACK_REMOVE_ME{{ .Values.serverConfig.terminationGracePeriodSeconds }}
diff --git a/k8s/kustomize/helm-components/patch_triton.yaml b/k8s/kustomize/helm-components/patch_triton.yaml
@@ -4,7 +4,6 @@ metadata:
   name: triton
 spec:
   podSpec:
-    terminationGracePeriodSeconds: '{{ .Values.serverConfig.terminationGracePeriodSeconds}}'
     containers:
     - image: '{{ .Values.serverConfig.rclone.image.registry }}/{{ .Values.serverConfig.rclone.image.repository }}:{{ .Values.serverConfig.rclone.image.tag }}'
       imagePullPolicy: '{{ .Values.serverConfig.rclone.image.pullPolicy }}'

diff --git a/k8s/kustomize/helm-components/patch_triton_serverconfig_json6902.yaml b/k8s/kustomize/helm-components/patch_triton_serverconfig_json6902.yaml
@@ -1,3 +1,6 @@
 - op: replace
   path: /spec/podSpec/securityContext
   value: HACK_REMOVE_ME{{- toYaml .Values.serverConfig.securityContext | nindent 6 }}
+- op: add
+  path: /spec/podSpec/terminationGracePeriodSeconds
+  value: HACK_REMOVE_ME{{ .Values.serverConfig.terminationGracePeriodSeconds }}