fix: wrong deployments (#472)

mend · Mar 19, 2024 · f0a7490 · f0a7490
1 parent fff4912
commit f0a7490
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/helm-charts/mend-renovate-ce/Chart.yaml b/helm-charts/mend-renovate-ce/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mend-renovate-ce
-version: 6.11.0
+version: 6.11.1
 appVersion: 6.11.0
 description: Mend Renovate Community Edition
 home: https://github.com/mend/renovate-ce-ee

diff --git a/helm-charts/mend-renovate-ce/templates/deployment.yaml b/helm-charts/mend-renovate-ce/templates/deployment.yaml
@@ -101,7 +101,7 @@ spec:
             - name: MEND_RNV_BITBUCKET_PAT
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "mend-renovate.server-secret-name" . }}
+                  name: {{ include "mend-renovate.secret-name" . }}
                   key: mendRnvBitbucketPat
                   optional: true
             {{- end }}
@@ -122,7 +122,7 @@ spec:
             - name: PGPASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "mend-renovate.server-secret-name" . }}
+                  name: {{ include "mend-renovate.secret-name" . }}
                   key: pgPassword
                   optional: true
             {{- end }}
@@ -131,7 +131,7 @@ spec:
             - name: MEND_RNV_ADMIN_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "mend-renovate.server-secret-name" . }}
+                  name: {{ include "mend-renovate.secret-name" . }}
                   key: mendRnvAdminToken
                   optional: true
             {{- end }}
@@ -262,10 +262,10 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector:
       {{- toYaml . | nindent 8 }}
-      {{- if $.Values.imagePullSecrets }}
-      imagePullSecrets:
-        - name: {{ $.Values.imagePullSecrets }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        - name: {{ .Values.imagePullSecrets }}
       {{- end }}
       volumes:
         - name: {{ .Release.Name }}-config-js-volume

diff --git a/helm-charts/mend-renovate-ee/Chart.yaml b/helm-charts/mend-renovate-ee/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mend-renovate-enterprise-edition
-version: 0.6.0
+version: 0.7.0
 appVersion: 6.11.0
 description: Mend Renovate Enterprise Edition
 home: https://github.com/mend/renovate-ce-ee

diff --git a/helm-charts/mend-renovate-ee/templates/server-deployment.yaml b/helm-charts/mend-renovate-ee/templates/server-deployment.yaml
@@ -39,7 +39,7 @@ spec:
         - name: {{ .Chart.Name }}-server
           image: "{{ .Values.renovateServer.image.repository }}:{{ .Values.renovateServer.image.tag }}"
           imagePullPolicy: {{ .Values.renovateServer.image.pullPolicy }}
-          {{- with .Values.containerSecurityContext }}
+          {{- with .Values.renovateServer.containerSecurityContext }}
           securityContext: {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
@@ -224,11 +224,11 @@ spec:
       {{- with .Values.renovateServer.nodeSelector }}
       nodeSelector:
       {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.renovateServer.imagePullSecrets }}
       imagePullSecrets:
         - name: .Values.renovateServer.imagePullSecrets
       {{- end }}
-      {{- end }}
       volumes:
         - name: {{ .Release.Name }}-database-volume
           {{- if .Values.dataPersistence.enabled }}

diff --git a/helm-charts/mend-renovate-ee/templates/worker-deployment.yaml b/helm-charts/mend-renovate-ee/templates/worker-deployment.yaml
@@ -37,7 +37,7 @@ spec:
         - name: {{ .Chart.Name }}-worker
           image: "{{ .Values.renovateWorker.image.repository }}:{{ .Values.renovateWorker.image.tag }}"
           imagePullPolicy: {{ .Values.renovateWorker.image.pullPolicy }}
-          {{- with .Values.containerSecurityContext }}
+          {{- with .Values.renovateServer.containerSecurityContext }}
           securityContext: {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
@@ -124,11 +124,11 @@ spec:
       {{- with .Values.renovateWorker.nodeSelector }}
       nodeSelector:
       {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.renovateWorker.imagePullSecrets }}
       imagePullSecrets:
         - name: .Values.renovateWorker.imagePullSecrets
       {{- end }}
-      {{- end }}
       volumes:
         - name: {{ .Release.Name }}-config-js-volume
           configMap:

diff --git a/helm-charts/mend-renovate-ee/values.yaml b/helm-charts/mend-renovate-ee/values.yaml
@@ -256,6 +256,19 @@ renovateWorker:
 
   affinity: {}
 
+
+  podSecurityContext: {}
+  #   runAsNonRoot: true
+  #   seccompProfile:
+  #     type: RuntimeDefault
+
+  containerSecurityContext: {}
+  #   allowPrivilegeEscalation: false
+  #   readOnlyRootFilesystem: true
+  #   capabilities:
+  #     drop:
+  #       - ALL
+
   # name of the image pull secret
   imagePullSecrets: ""