🧹 update helmify and helm chart (#1317)

Signed-off-by: Ivan Milchev <ivan@mondoo.com>

Author: imilchev

Makefile

@@ -346,7 +346,7 @@ catalog-push: ## Push a catalog image.
 
 HELMIFY = $(LOCALBIN)/helmify
 helmify: $(LOCALBIN) ## Download helmify locally if necessary.
-	GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@v0.4.3
+	GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@v0.4.18
 
 helm: manifests kustomize helmify
 	$(KUSTOMIZE) build config/default | $(HELMIFY) $(CHART_NAME)

charts/mondoo-operator/templates/deployment.yaml

@@ -1,24 +1,3 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "mondoo-operator.fullname" . }}-controller-manager
-  labels:
-  {{- include "mondoo-operator.labels" . | nindent 4 }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "mondoo-operator.fullname" . }}-k8s-resources-scanning
-  labels:
-  {{- include "mondoo-operator.labels" . | nindent 4 }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "mondoo-operator.fullname" . }}-webhook
-  labels:
-  {{- include "mondoo-operator.labels" . | nindent 4 }}
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -76,7 +55,7 @@ spec:
           }}
         securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext
           | nindent 10 }}
-      securityContext:
-        runAsNonRoot: true
+      securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
+        8 }}
       serviceAccountName: {{ include "mondoo-operator.fullname" . }}-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10

charts/mondoo-operator/templates/k8s-resources-scanning-rbac.yaml

@@ -27,4 +27,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "mondoo-operator.fullname" . }}-k8s-resources-scanning'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

charts/mondoo-operator/templates/leader-election-rbac.yaml

@@ -50,4 +50,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "mondoo-operator.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

charts/mondoo-operator/templates/manager-config.yaml

@@ -6,4 +6,4 @@ metadata:
   {{- include "mondoo-operator.labels" . | nindent 4 }}
 data:
   controller_manager_config.yaml: {{ .Values.managerConfig.controllerManagerConfigYaml
-    | toYaml | indent 1 }}
+    | toYaml | indent 1 }}

charts/mondoo-operator/templates/manager-rbac.yaml

@@ -6,9 +6,10 @@ metadata:
   {{- include "mondoo-operator.labels" . | nindent 4 }}
 rules:
 - apiGroups:
-  - admissionregistration.k8s.io
+  - ""
   resources:
-  - validatingwebhookconfigurations
+  - configmaps
+  - services
   verbs:
   - create
   - delete
@@ -18,33 +19,27 @@ rules:
   - update
   - watch
 - apiGroups:
-  - apps
+  - ""
   resources:
-  - daemonsets
-  - deployments
+  - namespaces
+  - nodes
+  - pods
   verbs:
-  - create
-  - delete
   - get
   - list
-  - patch
-  - update
   - watch
 - apiGroups:
-  - apps
+  - ""
   resources:
-  - daemonsets
-  - deployments
-  - replicasets
-  - statefulsets
+  - secrets
   verbs:
+  - create
+  - delete
   - get
-  - list
-  - watch
 - apiGroups:
-  - batch
+  - admissionregistration.k8s.io
   resources:
-  - cronjobs
+  - validatingwebhookconfigurations
   verbs:
   - create
   - delete
@@ -54,37 +49,31 @@ rules:
   - update
   - watch
 - apiGroups:
-  - batch
+  - apps
   resources:
-  - cronjobs
-  - jobs
+  - daemonsets
+  - deployments
   verbs:
+  - create
+  - delete
   - get
   - list
+  - patch
+  - update
   - watch
 - apiGroups:
-  - batch
-  resources:
-  - jobs
-  verbs:
-  - deletecollection
-- apiGroups:
-  - cert-manager.io
+  - apps
   resources:
-  - certificates
-  - issuers
+  - replicasets
+  - statefulsets
   verbs:
-  - create
-  - delete
   - get
   - list
-  - patch
-  - update
   - watch
 - apiGroups:
-  - ""
+  - batch
   resources:
-  - configmaps
+  - cronjobs
   verbs:
   - create
   - delete
@@ -94,27 +83,19 @@ rules:
   - update
   - watch
 - apiGroups:
-  - ""
+  - batch
   resources:
-  - namespaces
-  - nodes
-  - pods
+  - jobs
   verbs:
+  - deletecollection
   - get
   - list
   - watch
 - apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - create
-  - delete
-  - get
-- apiGroups:
-  - ""
+  - cert-manager.io
   resources:
-  - services
+  - certificates
+  - issuers
   verbs:
   - create
   - delete
@@ -136,12 +117,14 @@ rules:
   - k8s.mondoo.com
   resources:
   - mondooauditconfigs/finalizers
+  - mondoooperatorconfigs/finalizers
   verbs:
   - update
 - apiGroups:
   - k8s.mondoo.com
   resources:
   - mondooauditconfigs/status
+  - mondoooperatorconfigs/status
   verbs:
   - get
   - patch
@@ -154,20 +137,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - k8s.mondoo.com
-  resources:
-  - mondoooperatorconfigs/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - k8s.mondoo.com
-  resources:
-  - mondoooperatorconfigs/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -194,4 +163,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "mondoo-operator.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

charts/mondoo-operator/templates/metrics-service.yaml

@@ -7,6 +7,6 @@ metadata:
 spec:
   type: {{ .Values.metricsService.type }}
   selector:
-  {{- include "mondoo-operator.selectorLabels" . | nindent 4 }}
+    {{- include "mondoo-operator.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
+  {{- .Values.metricsService.ports | toYaml | nindent 2 }}