From ed8a9fdd23a47db1ec4442c1961cfc71d6ada965 Mon Sep 17 00:00:00 2001 From: Spicoud Date: Wed, 13 Dec 2023 14:59:03 +0100 Subject: [PATCH] fix extra init container --- bouyguestelecom/spin/Chart.yaml | 2 +- bouyguestelecom/spin/templates/deployment.yaml | 8 ++++---- bouyguestelecom/spin/values.schema.json | 12 ++++++------ bouyguestelecom/spin/values.yaml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bouyguestelecom/spin/Chart.yaml b/bouyguestelecom/spin/Chart.yaml index fd2d702..673eb8f 100644 --- a/bouyguestelecom/spin/Chart.yaml +++ b/bouyguestelecom/spin/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/bouyguestelecom/spin/templates/deployment.yaml b/bouyguestelecom/spin/templates/deployment.yaml index d7b459d..86aae3b 100644 --- a/bouyguestelecom/spin/templates/deployment.yaml +++ b/bouyguestelecom/spin/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: {{- if .Values.deployment.extraInitContainers }} initContainers: {{- with .Values.deployment.extraInitContainers }} - {{- toYaml . | nindent 8 }} + {{- tpl . $ | nindent 8 }} {{- end }} {{- end }} containers: @@ -58,7 +58,7 @@ spec: {{- toYaml . | nindent 10 }} {{- end }} {{- with .Values.deployment.containerExtraSpecs }} - {{- toYaml . | nindent 10 }} + {{- tpl . $ | nindent 10 }} {{- end }} imagePullPolicy: {{ .Values.deployment.image.pullPolicy }} ports: @@ -69,7 +69,7 @@ spec: containerPort: {{ default .Values.service.httpAdminPort .Values.deployment.containerAdminPort }} {{- end }} {{- with .Values.deployment.containerExtraPorts }} - {{- toYaml . | nindent 12 }} + {{- tpl . $ | nindent 12 }} {{- end }} livenessProbe: {{- toYaml .Values.deployment.livenessProbe | nindent 12 }} @@ -77,7 +77,7 @@ spec: {{- toYaml .Values.deployment.readinessProbe | nindent 12 }} {{- with .Values.deployment.startupProbe }} startupProbe: - {{- toYaml . | nindent 12 }} + {{- tpl . $ | nindent 12 }} {{- end }} resources: {{- toYaml .Values.deployment.resources | nindent 12 }} diff --git a/bouyguestelecom/spin/values.schema.json b/bouyguestelecom/spin/values.schema.json index 3318b30..cca741a 100644 --- a/bouyguestelecom/spin/values.schema.json +++ b/bouyguestelecom/spin/values.schema.json @@ -205,12 +205,12 @@ }] }, "extraInitContainers": { - "type": "array", - "default": [], + "type": "string", + "default": "", "title": "The extraInitContainers Schema", "items": {}, "examples": [ - [] + "" ] }, "restartPolicy": { @@ -632,7 +632,7 @@ "enabled": false, "fsGroup": 1001 }, - "extraInitContainers": [], + "extraInitContainers": "", "restartPolicy": "Always", "securityContext": { "enabled": false @@ -1402,7 +1402,7 @@ "enabled": false, "fsGroup": 1001 }, - "extraInitContainers": [], + "extraInitContainers": "", "restartPolicy": "Always", "securityContext": { "enabled": false @@ -1529,4 +1529,4 @@ "repository": "votre-repo" } }] -} \ No newline at end of file +} diff --git a/bouyguestelecom/spin/values.yaml b/bouyguestelecom/spin/values.yaml index 015ab0d..f882c96 100644 --- a/bouyguestelecom/spin/values.yaml +++ b/bouyguestelecom/spin/values.yaml @@ -41,7 +41,7 @@ deployment: # -- Set the File System Group (fsGroup) for the pod volumes fsGroup: 1001 ## generic value # -- Add initContainers - extraInitContainers: [] + extraInitContainers: "" # - name: init-container-1 # image: your-image-1:tag # - name: init-container-2