fix bug when no env provided

InseeFr · Jan 26, 2023 · 82917d0 · 82917d0
1 parent 5d1daf2
commit 82917d0
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 9 deletions.
diff --git a/charts/coleman-access/Chart.yaml b/charts/coleman-access/Chart.yaml
@@ -3,5 +3,5 @@ name: coleman-access
 description: A Helm chart for Coleman Access UI and API
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.16.0"
diff --git a/charts/coleman-access/templates/api/deployment.yaml b/charts/coleman-access/templates/api/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.api.securityContext | nindent 12 }}
           image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.api.image.pullPolicy }}
+         {{- if and .Values.api.env .Values.api.enabled }} 
           envFrom:
             - configMapRef:
                 name: {{ template "coleman-access.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/coleman-access/templates/ui/deployment.yaml b/charts/coleman-access/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "coleman-access.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/coleman-management/Chart.yaml b/charts/coleman-management/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.5.7
+version: 0.5.8
 appVersion: "1.16.0"
diff --git a/charts/coleman-management/templates/api/deployment.yaml b/charts/coleman-management/templates/api/deployment.yaml
@@ -48,9 +48,11 @@ spec:
             - name: SPRING_DATASOURCE_USERNAME
               value: {{ .Values.postgresql.auth.username | quote}}
           {{- end }}
+          {{- if and .Values.api.env .Values.api.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "coleman-management.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/coleman-management/templates/ui/deployment.yaml b/charts/coleman-management/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "coleman-management.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/massive-attack/Chart.yaml b/charts/massive-attack/Chart.yaml
@@ -3,5 +3,5 @@ name: massive-attack
 description: A Helm chart for Massive Attack API, UI and DB
 
 type: application
-version: 0.1.5
+version: 0.2.0
 appVersion: "1.16.0"
diff --git a/charts/massive-attack/templates/api/deployment.yaml b/charts/massive-attack/templates/api/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.api.securityContext | nindent 12 }}
           image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.api.image.pullPolicy }}
+          {{- if and .Values.api.env .Values.api.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "massive-attack.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/massive-attack/templates/ui/deployment.yaml b/charts/massive-attack/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "massive-attack.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/moog/Chart.yaml b/charts/moog/Chart.yaml
@@ -15,7 +15,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.0.2
+version: 0.1.0
 
 # 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/charts/moog/templates/deployment.yaml b/charts/moog/templates/deployment.yaml
@@ -33,9 +33,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if and .Values.env }}
           envFrom:
             - configMapRef:
                 name: {{ template "moog.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/my-surveys/Chart.yaml b/charts/my-surveys/Chart.yaml
@@ -15,7 +15,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.0.1
+version: 0.1.0
 
 # 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/charts/my-surveys/templates/deployment.yaml b/charts/my-surveys/templates/deployment.yaml
@@ -33,9 +33,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if and .Values.env }}
           envFrom:
             - configMapRef:
                 name: {{ template "my-surveys.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/pearl/Chart.yaml b/charts/pearl/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.16.0"
diff --git a/charts/pearl/templates/api/deployment.yaml b/charts/pearl/templates/api/deployment.yaml
@@ -46,9 +46,11 @@ spec:
             - name: FR_INSEE_PEARLJAM_PERSISTENCE_DATABASE_SCHEMA
               value: {{ .Values.postgresql.auth.database | quote}}
           {{- end }}
+          {{- if and .Values.api.env .Values.api.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "pearl.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/pearl/templates/ui/deployment.yaml b/charts/pearl/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "pearl.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/queen/Chart.yaml b/charts/queen/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.3.2
+version: 0.4.0
 appVersion: "1.16.0"
diff --git a/charts/queen/templates/api/deployment.yaml b/charts/queen/templates/api/deployment.yaml
@@ -46,9 +46,11 @@ spec:
             - name: FR_INSEE_QUEEN_PERSISTENCE_DATABASE_SCHEMA
               value: {{ .Values.postgresql.auth.database | quote}}
           {{- end }}
+          {{- if and .Values.api.env .Values.api.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "queen.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/queen/templates/ui/deployment.yaml b/charts/queen/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "queen.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/sonor/Chart.yaml b/charts/sonor/Chart.yaml
@@ -15,7 +15,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.5
+version: 0.2.0
 
 # 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/charts/sonor/templates/deployment.yaml b/charts/sonor/templates/deployment.yaml
@@ -33,9 +33,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if and .Values.env }}
           envFrom:
             - configMapRef:
                 name: {{ template "sonor.fullname" . }}
+          {{-end }}
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/stromae-v2/Chart.yaml b/charts/stromae-v2/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.5.9
+version: 0.6.0
 appVersion: "1.16.0"
diff --git a/charts/stromae-v2/templates/api/deployment.yaml b/charts/stromae-v2/templates/api/deployment.yaml
@@ -46,9 +46,11 @@ spec:
             - name: FR_INSEE_QUEEN_PERSISTENCE_DATABASE_SCHEMA
               value: {{ .Values.postgresql.auth.database | quote}}
           {{- end }}
+          {{- if and .Values.api.env .Values.api.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "stromae.api.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/stromae-v2/templates/ui/deployment.yaml b/charts/stromae-v2/templates/ui/deployment.yaml
@@ -32,9 +32,11 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+          {{- if and .Values.ui.env .Values.ui.enabled }}
           envFrom:
             - configMapRef:
                 name: {{ template "stromae.ui.fullname" . }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 80