feat: add namespace to ServiceAccount in cluster role binding and upd…

…ate image pull secret handling On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Nov 25, 2024 · 69ce62e · 69ce62e
1 parent c2860ca
commit 69ce62e
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 3 deletions.
diff --git a/charts/account-operator/charts/account-operator-crds-0.1.5.tgz b/charts/account-operator/charts/account-operator-crds-0.1.5.tgz
diff --git a/charts/account-operator/charts/common-0.1.5.tgz b/charts/account-operator/charts/common-0.1.5.tgz
diff --git a/charts/account-operator/templates/cluster-rolebinding.yaml b/charts/account-operator/templates/cluster-rolebinding.yaml
@@ -5,6 +5,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: {{ include "common.entity.name" . }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: {{ include "common.entity.name" . }}

diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -273,6 +273,7 @@ operator match the snapshot:
     subjects:
       - kind: ServiceAccount
         name: account-operator
+        namespace: NAMESPACE
   4: |
     apiVersion: apps/v1
     kind: Deployment
@@ -644,6 +645,7 @@ operator match the snapshot (with kubeconfigSecret):
     subjects:
       - kind: ServiceAccount
         name: account-operator
+        namespace: NAMESPACE
   4: |
     apiVersion: apps/v1
     kind: Deployment
@@ -1022,6 +1024,7 @@ operator match the snapshot with webhook enabled:
     subjects:
       - kind: ServiceAccount
         name: account-operator
+        namespace: NAMESPACE
   4: |
     apiVersion: apps/v1
     kind: Deployment

diff --git a/charts/common/templates/_deploymentHelpers.tpl b/charts/common/templates/_deploymentHelpers.tpl
@@ -126,6 +126,13 @@ automountServiceAccountToken: {{ not (eq (.Values.security).mountServiceAccountT
 {{- define "common.terminationGracePeriodSeconds" -}}
 {{ .Values.terminationGracePeriodSeconds | default 10 }}
 {{- end }}
+
 {{- define "common.imagePullPolicy" -}}
-{{ .Values.imagePullPolicy | default "Always" }}
-{{- end }}
+{{- if .Values.imagePullPolicy -}}
+{{ .Values.imagePullPolicy }}
+{{- else if and .Values.global (.Values.global.imagePullPolicy) -}}
+{{ .Values.global.imagePullPolicy }}
+{{- else -}}
+Always
+{{- end -}}
+{{- end }}
diff --git a/charts/common/templates/_imagePullSecret.tpl b/charts/common/templates/_imagePullSecret.tpl
@@ -1,5 +1,5 @@
 {{- define "common.imagePullSecret" }}
-{{- if .Values.imagePullSecret }}
+{{- if or .Values.imagePullSecret ((.Values).global).imagePullSecret }}
 imagePullSecrets:
   - name: {{ default .Values.imagePullSecret (.Values.global).imagePullSecret }}
 {{- end }}

diff --git a/charts/extension-manager-operator/charts/common-0.1.5.tgz b/charts/extension-manager-operator/charts/common-0.1.5.tgz
diff --git a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz
diff --git a/charts/extension-manager-operator/templates/cluster-role.yaml b/charts/extension-manager-operator/templates/cluster-role.yaml
@@ -40,3 +40,11 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
diff --git a/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -42,6 +42,14 @@ operator match the snapshot:
           - update
           - patch
           - delete
+      - apiGroups:
+          - ""
+        resources:
+          - namespaces
+        verbs:
+          - get
+          - list
+          - watch
   2: |
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding

diff --git a/charts/extension-manager-operator/tests/deployment_test.yaml b/charts/extension-manager-operator/tests/deployment_test.yaml
@@ -75,6 +75,16 @@ tests:
     template: service-account.yaml
     set:
       imagePullSecret: my-secret
+    asserts:
+      - equal:
+          path: imagePullSecrets
+          value: 
+            - name: my-secret
+  - it: configure global imagePullSecret
+    template: service-account.yaml
+    set:
+      global:
+        imagePullSecret: my-secret
     asserts:
       - equal:
           path: imagePullSecrets

diff --git a/charts/portal/charts/common-0.1.5.tgz b/charts/portal/charts/common-0.1.5.tgz