Merge pull request #309 from saitejaopsmx/oes3.12

Removing the env for initContainers
OpsMx · May 26, 2022 · 70c1fe8 · 70c1fe8
2 parents 6aeb359 + 8b35992
commit 70c1fe8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: oes
-version: 3.12.5
-appVersion: 3.12.3
-description: "ISD-3.12.3 - Improvements in loading Application dashboard in ISD UI"
+version: 3.12.6
+appVersion: 3.12.4
+description: "ISD-3.12.4 - Improvements in loading Application dashboard in ISD UI"
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png
 maintainers:
 - email: [email protected]

diff --git a/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml b/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
@@ -191,10 +191,6 @@ spec:
           subPath: cacerts
           name: cacerts
         {{- end }}
-        {{- if .Values.halyard.env }}
-        env:
-{{ toYaml .Values.halyard.env | indent 8 }}
-        {{- end }}
       {{- if and (.Values.gitopsHalyard.enabled) (eq .Values.gitopsHalyard.repo.type "git") }}
       - name: "halyardconfig-update"
         command:
@@ -249,10 +245,6 @@ spec:
         {{- end }}
         - mountPath: /tmp/autoconfig
           name: halyard-overrideurl
-        {{- if .Values.halyard.env }}
-        env:
-{{ toYaml .Values.halyard.env | indent 8 }}
-        {{- end }}
       {{- end }}
       volumes:
       {{- if or .Values.gitopsHalyard.enabled (not .Values.halyard.persistence.enabled) }}

diff --git a/charts/oes/values.yaml b/charts/oes/values.yaml
@@ -256,7 +256,7 @@ autopilot:
   ## Image specific details
   image:
     repository: ubi8-oes-autopilot
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations:
@@ -289,7 +289,7 @@ audit:
   ##
   image:
     repository: ubi8-oes-audit-service
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   serviceAnnotations: {}
@@ -311,7 +311,7 @@ auditClient:
   ##
   image:
     repository: ubi8-oes-audit-client
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   serviceAnnotations: {}
@@ -333,7 +333,7 @@ datascience:
   ##
   image:
     repository: ubi8-oes-datascience
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   serviceAnnotations: {}
@@ -352,7 +352,7 @@ dashboard:
   ## Image specific details
   image:
     repository: ubi8-oes-dashboard
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations:
@@ -405,7 +405,7 @@ gate:
   ## Image specific details
   image:
     repository: ubi8-gate
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   serviceAnnotations: {}
@@ -482,7 +482,7 @@ platform:
   ## Image specific details
   image:
     repository: ubi8-oes-platform
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations:
@@ -544,7 +544,7 @@ sapor:
   ## Image specific details
   image:
     repository: ubi8-oes-sapor
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations:
@@ -636,7 +636,7 @@ ui:
   ## Image specific details
   image:
     repository: ubi8-oes-ui
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations:
@@ -654,7 +654,7 @@ visibility:
   ## Image specific details
   image:
     repository: ubi8-oes-visibility
-    tag: v3.12.3
+    tag: v3.12.4
     pullPolicy: IfNotPresent
 
   annotations: