feat(release-csc-4.2.0): release csc charts version 4.2.0 (#82)

Co-authored-by: Shubhashri Shirode <[email protected]>
logicmonitor · Feb 15, 2023 · 394a646 · 394a646
1 parent 4408921
commit 394a646
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/charts/collectorset-controller/Chart.yaml b/charts/collectorset-controller/Chart.yaml
@@ -6,11 +6,11 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: collectorset-controller
-version: 4.1.0
+version: 4.2.0
 home: https://logicmonitor.github.io/helm-charts
-appVersion: v6.1.0
+appVersion: v6.2.0
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts
     # repository: file://../lmutil
-    version: 0.1.1
+    version: 0.1.6
diff --git a/charts/collectorset-controller/crds/collectorset.yaml b/charts/collectorset-controller/crds/collectorset.yaml
@@ -909,6 +909,17 @@ spec:
                         takes precedence.
                       format: int64
                       type: integer
+                    seccompProfile:
+                      type: object
+                      properties:
+                        localhostProfile:
+                          type: string
+                        type:
+                          type: string
+                          enum:
+                            - Unconfined
+                            - RuntimeDefault
+                            - Localhost
                     seLinuxOptions:
                       description: SELinuxOptions are the labels to be applied to the
                         container

diff --git a/charts/collectorset-controller/templates/deployment.yaml b/charts/collectorset-controller/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
       annotations:
         {{- include "collectorset-controller.annotations" . | nindent 8 }}
     spec:
-      securityContext: {{ toYaml .Values.podSecurityContext | nindent 8 }}
+      securityContext: {{ include "lmutil.pod-sec-context-nonroot" (list . "lmutil.custom-pod-sec-context-nonroot") | nindent 8 }}
       serviceAccountName: {{ include "collectorset-controller.serviceAccountName" . }}
     {{- with .Values.affinity }}
       affinity:
@@ -39,7 +39,7 @@ spec:
     {{- end }}
       containers:
         - name: collectorset-controller
-          securityContext: {{ toYaml .Values.securityContext | nindent 12 }}
+          securityContext: {{ include "lmutil.container-sec-context-nonroot" (list . "lmutil.custom-container-sec-context-nonroot") | nindent 12 }}
           image: {{ include "csc-image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | default (.Values.global.image.pullPolicy | default "Always") }}
           {{ if and ( .Values.probe.enabled) ( .Values.probe.grpcContainerProbeEnabled ) ( semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version )}}

diff --git a/charts/collectorset-controller/templates/openshift-scc.yaml b/charts/collectorset-controller/templates/openshift-scc.yaml
@@ -0,0 +1,8 @@
+{{ $saUsers := list (printf "%s:%s" (include "lmutil.release.namespace" .) (include "collectorset-controller.serviceAccountName" .)) }}
+{{ $params := list . "lm-nonroot-v2-collectorset-controller" $saUsers }}
+{{ include "lmutil.openshift-scc-nonroot-v2" $params }}
+---
+{{ $users := list (printf "%s:%s-collector" (include "lmutil.release.namespace" .) (include "collectorset-controller.serviceAccountName" .)) }}
+{{ $caps := list "NET_RAW" "SETFCAP" }}
+{{ $input := list . "lm-anyuid-collector" $users $caps }}
+{{ include "lmutil.openshift-scc-anyuid" $input }}
diff --git a/charts/collectorset-controller/templates/serviceaccount.yaml b/charts/collectorset-controller/templates/serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "collectorset-controller.serviceAccountName" . }}
   namespace: {{ template "lmutil.release.namespace" . }}
   labels:
-      {{- include "collectorset-controller.labels" . | nindent 4}}
+    {{- include "collectorset-controller.labels" . | nindent 4}}
   annotations:
     {{- include "collectorset-controller.annotations" . | nindent 4}}
 imagePullSecrets:

diff --git a/charts/collectorset-controller/values.yaml b/charts/collectorset-controller/values.yaml
@@ -62,10 +62,7 @@ global:
     pullPolicy: Always
   imagePullSecrets: []
 
-podSecurityContext:
-  fsGroup: 65534
-  runAsGroup: 65534
-  runAsUser: 65534
+podSecurityContext: {}
 securityContext:
   capabilities:
     add: []