Merge pull request #36 from djkormo/chart-test-3

adding 2.0.6 chart version
djkormo · Dec 13, 2023 · 4838e55 · 4838e55
2 parents 3e3a521 + 7aec13a
commit 4838e55
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 34 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.5
+version: 2.0.6
 # 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.5"
+appVersion: "2.0.6"
 
diff --git a/charts/adcs-issuer/templates/adcsissuer-crd.yaml b/charts/adcs-issuer/templates/adcsissuer-crd.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crd.install  }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -84,4 +85,6 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
+
+{{- end  }}    
diff --git a/charts/adcs-issuer/templates/adcsrequest-crd.yaml b/charts/adcs-issuer/templates/adcsrequest-crd.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crd.install  }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -101,4 +102,6 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
+
+{{- end  }}    
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
@@ -1,3 +1,4 @@
+{{- if .Values.controllerManager.rbac.enabled  }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -24,8 +25,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "chart.fullname" . }}-cert-manager-controller-approve:adcs-certmanager-csf-nokia-com'
+  name: {{ include "chart.fullname" . }}-cert-manager-controller-approve:adcs-certmanager-csf-nokia-com
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "chart.fullname" . }}-cert-manager'
-  namespace: '{{ .Release.Namespace }}'
+  name: {{ .Values.controllerManager.rbac.serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+
+{{- end  }}    
diff --git a/charts/adcs-issuer/templates/clusteradcsissuer-crd.yaml b/charts/adcs-issuer/templates/clusteradcsissuer-crd.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crd.install  }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -84,4 +85,6 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
+
+{{- end  }}  
diff --git a/charts/adcs-issuer/templates/deployment.yaml b/charts/adcs-issuer/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "chart.fullname" . }}-controller-manager
+  namespace: {{ .Release.Namespace }}
   labels:
     control-plane: controller-manager
   {{- include "chart.labels" . | nindent 4 }}
@@ -20,7 +21,7 @@ spec:
       containers:
       - args:
         - --enable-leader-election=true
-        - --cluster-resource-namespace=${POD_NAMESPACE}
+        - --cluster-resource-namespace={{ .Release.Namespace }}
         - --zap-log-level=5
         - --disable-approved-check=false
         command:
@@ -38,6 +39,7 @@ spec:
               fieldPath: metadata.namespace
 
         image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: Always
         name: manager
         ports:
         - containerPort: 9443
@@ -56,7 +58,10 @@ spec:
           subPath: ca-certificates.crt
           readOnly: true
         {{- end }}  
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 
+      securityContext:
+        {{- toYaml  .Values.controllerManager.securityContext | nindent 8 }}
+      serviceAccountName: {{ .Values.controllerManager.rbac.serviceAccountName }}
       volumes:
       {{- if .Values.controllerManager.enabledWebHooks  }}
       - name: cert

diff --git a/charts/adcs-issuer/templates/leader-election-rbac.yaml b/charts/adcs-issuer/templates/leader-election-rbac.yaml
@@ -1,7 +1,9 @@
+{{- if .Values.controllerManager.rbac.enabled  }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "chart.fullname" . }}-leader-election-role
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 rules:
@@ -49,8 +51,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: '{{ include "chart.fullname" . }}-leader-election-role'
+  name: {{ include "chart.fullname" . }}-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: default
-  namespace: '{{ .Release.Namespace }}'
+  name: {{ .Values.controllerManager.rbac.serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+
+{{- end  }}  
diff --git a/charts/adcs-issuer/templates/manager-rbac.yaml b/charts/adcs-issuer/templates/manager-rbac.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controllerManager.rbac.enabled  }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -110,8 +111,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "chart.fullname" . }}-manager-role'
+  name: {{ include "chart.fullname" . }}-manager-role
 subjects:
 - kind: ServiceAccount
-  name: default
-  namespace: '{{ .Release.Namespace }}'
+  name: {{ .Values.controllerManager.rbac.serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+
+{{- end  }}    
diff --git a/charts/adcs-issuer/templates/metrics-service.yaml b/charts/adcs-issuer/templates/metrics-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "chart.fullname" . }}-controller-manager-metrics-service
+  namespace: {{ .Release.Namespace }}
   labels:
     control-plane: controller-manager
   {{- include "chart.labels" . | nindent 4 }}

diff --git a/charts/adcs-issuer/templates/proxy-rbac.yaml b/charts/adcs-issuer/templates/proxy-rbac.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controllerManager.rbac.enabled  }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -27,8 +28,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "chart.fullname" . }}-proxy-role'
+  name: {{ include "chart.fullname" . }}-proxy-role
 subjects:
 - kind: ServiceAccount
-  name: default
-  namespace: '{{ .Release.Namespace }}'
+  name: {{ .Values.controllerManager.rbac.serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+
+{{- end  }}    
diff --git a/charts/adcs-issuer/templates/serving-cert.yaml b/charts/adcs-issuer/templates/serving-cert.yaml
diff --git a/charts/adcs-issuer/templates/webhook-service.yaml b/charts/adcs-issuer/templates/webhook-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "chart.fullname" . }}-webhook-service
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 spec:

diff --git a/charts/adcs-issuer/values.yaml b/charts/adcs-issuer/values.yaml
@@ -1,3 +1,6 @@
+crd:
+  install: true
+
 controllerManager:
   manager:
     image:
@@ -11,6 +14,11 @@ controllerManager:
         cpu: 100m
         memory: 100Mi
 
+  rbac:
+    enabled: true
+    serviceAccountName: adcs-operator
+
+
   replicas: 1
 
   environment:
@@ -22,8 +30,10 @@ controllerManager:
     - --cluster-resource-namespace=cert-manager
     - --zap-log-level=5
     - --disable-approved-check=false
+
   securityContext:
     runAsUser: 1000
+
   enabledWebHooks: false
   enabledCaCerts: false
   caCertsSecretName: ca-certificates
@@ -40,3 +50,4 @@ webhookService:
     targetPort: 9443
   type: ClusterIP
 
+