fix(installer): Remove duplicate volumes and volumeMounts configurati…

…on (#8950) Co-authored-by: Christian Heckelmann <89777493+heckelmann@users.noreply.github.com>
keptn · Oct 5, 2022 · 1abd798 · 1abd798
1 parent a7507ed
commit 1abd798
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/installer/manifests/keptn/templates/shipyard-controller.yaml b/installer/manifests/keptn/templates/shipyard-controller.yaml
@@ -23,10 +23,6 @@ spec:
       serviceAccountName: keptn-shipyard-controller
       containers:
         - name: shipyard-controller
-          volumeMounts:
-            - name: keptn-git-config-volume
-              mountPath: /keptn-git-config
-              readOnly: true
           image: {{ include "keptn.common.images.image" ( dict "imageRoot" .Values.shipyardController.image "global" .Values.global.keptn "defaultTag" .Chart.AppVersion) | quote }}
           lifecycle:
             preStop:
@@ -106,8 +102,11 @@ spec:
           resources:
             {{- toYaml .Values.shipyardController.resources | nindent 12 }}
           {{- include "keptn.common.container-security-context" . | nindent 10 }}
-          {{- if .Values.shipyardController.extraVolumeMounts }}
           volumeMounts:
+            - name: keptn-git-config-volume
+              mountPath: /keptn-git-config
+              readOnly: true
+          {{- if .Values.shipyardController.extraVolumeMounts }}
           {{- include "keptn.common.tplvalues.render" ( dict "value" .Values.shipyardController.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
         {{- with .Values.shipyardController.sidecars }}
@@ -118,11 +117,10 @@ spec:
         - name: keptn-git-config-volume
           configMap:
             name: keptn-git-config
-      {{- include "keptn.nodeSelector" (dict "value" .Values.shipyardController.nodeSelector "default" .Values.nodeSelector "indent" 6 "context" . )}}
       {{- if .Values.shipyardController.extraVolumes }}
-      volumes:
       {{- include "keptn.common.tplvalues.render" ( dict "value" .Values.shipyardController.extraVolumes "context" $) | nindent 8 }}
       {{- end }}
+      {{- include "keptn.nodeSelector" (dict "value" .Values.shipyardController.nodeSelector "default" .Values.nodeSelector "indent" 6 "context" . )}}
 ---
 apiVersion: v1
 kind: Service