feat(helm): Use new values in templates

Author: Techassi

deploy/helm/secret-operator/templates/controller-deployment.yaml

@@ -17,8 +17,9 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
-        # TODO (@Techassi): Gate this behind the maintance.customResourceDefinition.maintain field
+        {{- if .Values.maintenance.customResourceDefinitions.maintain }}
         webhook.stackable.tech/conversion: enabled
+        {{- end }}
         {{- include "operator.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.image.pullSecrets }}
@@ -50,8 +51,6 @@ spec:
             # (which is turn pulls in https://github.com/stackabletech/operator-rs/blob/main/crates/stackable-operator/src/cli.rs)
             # You can read there about the expected values and purposes.
 
-            # TODO (@Techassi): Gate the DISABLE_CRD_MAINTENANCE env var behind maintance.customResourceDefinition.maintain field
-
             # Sometimes products need to know the operator image, e.g. the opa-bundle-builder OPA
             # sidecar uses the operator image.
             - name: OPERATOR_IMAGE
@@ -84,6 +83,7 @@ spec:
               value: {{ .Values.kubernetesClusterDomain | quote }}
             {{- end }}
             {{- include "telemetry.envVars" . | nindent 12 }}
+            {{- include "maintenance.envVars" . | nindent 12 }}
       {{- with .Values.controllerService.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/helm/secret-operator/templates/csi-node-driver-daemonset.yaml

@@ -91,6 +91,7 @@ spec:
               value: {{ .Values.kubernetesClusterDomain | quote }}
             {{- end }}
             {{- include "telemetry.envVars" . | nindent 12 }}
+            {{- include "maintenance.envVars" . | nindent 12 }}
           volumeMounts:
             - name: csi
               mountPath: /csi

deploy/helm/secret-operator/templates/roles.yaml

@@ -122,8 +122,10 @@ rules:
       - secretclasses
       - truststores
     verbs:
+      {{- if .Values.maintenance.customResourceDefinitions.maintain }}
       - create
       - patch
+      {{- end }}
       - get
       - watch
       - list

deploy/helm/secret-operator/templates/service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.maintenance.customResourceDefinitions.maintain }}
 ---
 apiVersion: v1
 kind: Service
@@ -10,11 +11,11 @@ metadata:
     {{- include "operator.labels" . | nindent 4 }}
 spec:
   selector:
-    # TODO (@Techassi): Gate this behind the maintance.customResourceDefinition.maintain field
     webhook.stackable.tech/conversion: enabled
     {{- include "operator.selectorLabels" . | nindent 4 }}
   ports:
     - name: conversion-webhook
       protocol: TCP
       port: 8443
       targetPort: 8443
+{{- end }}

deploy/helm/secret-operator/values.yaml

@@ -119,6 +119,15 @@ secretClasses:
     # Defaults to the namespace where secret-op is installed.
     caSecretNamespace: null
 
+maintenance:
+  endOfSupportCheck:
+    enabled: true
+    # mode: offline
+    # interval: 24h
+
+  customResourceDefinitions:
+    maintain: true
+
 # See all available options and detailed explanations about the concept here:
 # https://docs.stackable.tech/home/stable/concepts/telemetry/
 telemetry: