Merge pull request #44 from equinor/master

Release radix-cluster-cleanup
equinor · Apr 18, 2024 · 09c77a7 · 09c77a7
2 parents 17d9c50 + c1fca10
commit 09c77a7
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 22 deletions.
diff --git a/charts/radix-cluster-cleanup/Chart.yaml b/charts/radix-cluster-cleanup/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: 1.0.11
 description: A Helm chart for Kubernetes
 name: radix-cluster-cleanup
-version: 1.0.11
+version: 1.0.12
diff --git a/charts/radix-cluster-cleanup/templates/deployment.yaml b/charts/radix-cluster-cleanup/templates/deployment.yaml
@@ -14,29 +14,26 @@ spec:
       {{- include "radix-cluster-cleanup.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-    {{- if (.Values.metrics.enabled) }}
+      {{- if (.Values.metrics.enabled) }}
       annotations:
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
         {{- if (.Values.metrics.annotations) }}
         {{- toYaml .Values.metrics.annotations | nindent 8 }}
         {{- end }}
-    {{- end }}
+      {{- end }}
       labels:
         {{- include "radix-cluster-cleanup.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "radix-cluster-cleanup.serviceAccountName" . }}
-    {{- with .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
+      {{- end }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-        supplementalGroups:
-          - 1000
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           env:
@@ -60,19 +57,27 @@ spec:
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.securityContext }}
           securityContext:
-            privileged: false
-            readOnlyRootFilesystem: false
-            allowPrivilegeEscalation: false
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}          
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-    {{- with .Values.affinity }}
+      {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
+      {{- end }}
+      {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
+      {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}        
diff --git a/charts/radix-cluster-cleanup/templates/serviceaccount.yaml b/charts/radix-cluster-cleanup/templates/serviceaccount.yaml
@@ -4,4 +4,8 @@ metadata:
   name: {{ include "radix-cluster-cleanup.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "radix-cluster-cleanup.labels" . | nindent 4 }}
+    {{- include "radix-cluster-cleanup.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}      
diff --git a/charts/radix-cluster-cleanup/values.yaml b/charts/radix-cluster-cleanup/values.yaml
@@ -14,6 +14,8 @@ serviceAccount:
   # The name of the service account to use.
   # If not set, a name is generated using the fullname template
   name: ""
+  # Annotations to add to the service account
+  annotations: {}
 
 image:
   repository: xx
@@ -37,3 +39,22 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+podSecurityContext:
+  runAsNonRoot: true
+  runAsUser: 1000
+  runAsGroup: 1000
+  fsGroup: 1000
+  supplementalGroups:
+    - 1000
+
+securityContext:
+  privileged: false
+  readOnlyRootFilesystem: false
+  allowPrivilegeEscalation: false
+
+# Additional volumes to add to the radix-cluster-cleanup pod.
+volumes: []
+
+# Additional volume mounts to add to the radix-cluster-cleanup container.
+volumeMounts: []
diff --git a/radix-cluster-cleanup/go.mod b/radix-cluster-cleanup/go.mod
@@ -58,7 +58,7 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/radix-cluster-cleanup/go.sum b/radix-cluster-cleanup/go.sum
@@ -193,8 +193,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=