adding 2.0.8 chart version

djkormo · Dec 14, 2023 · 9577f49 · 9577f49
1 parent a5e2a35
commit 9577f49
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/charts/adcs-issuer/Chart.yaml b/charts/adcs-issuer/Chart.yaml
@@ -13,10 +13,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.7
+version: 2.0.8
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.0.7"
+appVersion: "2.0.8"
 
diff --git a/...-issuer/templates/cert-manager-controller-approve-dcs-certmanager-csf-nokia-com-rbac.yaml b/...-issuer/templates/cert-manager-controller-approve-dcs-certmanager-csf-nokia-com-rbac.yaml
@@ -30,5 +30,7 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Values.controllerManager.rbac.serviceAccountName }}
   namespace: {{ .Release.Namespace }}
-
+- kind: ServiceAccount
+  name: {{ .Values.controllerManager.rbac.certManagerServiceAccountName }}
+  namespace: {{ .Values.controllerManager.rbac.certManagerNamespace }}
 {{- end  }}    
diff --git a/charts/adcs-issuer/templates/deployment.yaml b/charts/adcs-issuer/templates/deployment.yaml
@@ -19,11 +19,17 @@ spec:
       {{- include "chart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
+        {{- if .Values.controllerManager.arguments }}
       - args:
-        - --enable-leader-election=true
-        - --cluster-resource-namespace={{ .Release.Namespace }}
-        - --zap-log-level=5
-        - --disable-approved-check=false
+        {{- range $key, $value := .Values.controllerManager.arguments }}
+        {{- if $value }}
+        - --{{ $key }}={{ $value }}
+        {{- else }}
+        - --{{ $key  }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+
         command:
         - /manager
         env:
@@ -60,7 +66,7 @@ spec:
         {{- end }}  
       terminationGracePeriodSeconds: 
       securityContext:
-        {{- toYaml  .Values.controllerManager.securityContext | nindent 8 }}
+        {{- toYaml  .Values.controllerManager.securityContext | nindent 10 }}
       serviceAccountName: {{ .Values.controllerManager.rbac.serviceAccountName }}
       volumes:
       {{- if .Values.controllerManager.enabledWebHooks  }}

diff --git a/charts/adcs-issuer/values.yaml b/charts/adcs-issuer/values.yaml
@@ -16,7 +16,9 @@ controllerManager:
 
   rbac:
     enabled: true
-    serviceAccountName: adcs-issuser
+    serviceAccountName: adcs-issuer
+    certManagerNamespace: cert-manager
+    certManagerServiceAccountName: cert-manager 
 
 
   replicas: 1
@@ -26,10 +28,10 @@ controllerManager:
     ENABLE_WEBHOOKS: "false"
     ENABLE_DEBUG: "false"
   arguments:
-    - --enable-leader-election=true
-    - --cluster-resource-namespace=cert-manager
-    - --zap-log-level=5
-    - --disable-approved-check=false
+    enable-leader-election: "true"
+    cluster-resource-namespace: cert-manager
+    zap-log-level: 5
+    disable-approved-check: "false"
 
   securityContext:
     runAsUser: 1000