feat: update portal release name in templates and tests

On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Nov 25, 2024 · a0166b7 · a0166b7
1 parent 6883e75
commit a0166b7
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 120 deletions.
diff --git a/charts/account-operator/templates/cluster-rolebinding.yaml b/charts/account-operator/templates/cluster-rolebinding.yaml
@@ -5,7 +5,6 @@ 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/templates/deployment.yaml b/charts/account-operator/templates/deployment.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.entity.name" . }}
-  namespace: {{ .Release.Namespace }}
   {{- if .Values.webhooks.enabled }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "common.entity.name" . }}-serving-cert

diff --git a/charts/account-operator/templates/service-account.yaml b/charts/account-operator/templates/service-account.yaml
@@ -2,5 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "common.entity.name" . }}
-  namespace: {{ .Release.Namespace }}
 {{- include "common.imagePullSecret" . }}
diff --git a/charts/account-operator/templates/webhook/pki.yaml b/charts/account-operator/templates/webhook/pki.yaml
@@ -3,15 +3,13 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ include "common.entity.name" . }}-selfsigned-issuer
-  namespace: {{ .Release.namespace }}
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "common.entity.name" . }}-serving-cert
-  namespace: {{ .Release.namespace }}
 spec:
   dnsNames:
   - {{ include "common.entity.name" . }}-webhook.{{ .Release.Namespace }}.svc

diff --git a/charts/account-operator/templates/webhook/service.yaml b/charts/account-operator/templates/webhook/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "common.entity.name" . }}-webhook
-  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - port: 443

diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -209,7 +209,7 @@ operator match the snapshot:
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     rules:
       - apiGroups:
           - core.openmfp.io
@@ -265,32 +265,30 @@ operator match the snapshot:
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     subjects:
       - kind: ServiceAccount
-        name: RELEASE-NAME-account-operator
-        namespace: NAMESPACE
+        name: account-operator
   4: |
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+      name: account-operator
     spec:
       revisionHistoryLimit: 3
       selector:
         matchLabels:
-          service: RELEASE-NAME-account-operator
+          service: account-operator
       template:
         metadata:
           annotations: null
           labels:
             control-plane: controller-manager
-            service: RELEASE-NAME-account-operator
+            service: account-operator
         spec:
           containers:
             - args:
@@ -359,9 +357,9 @@ operator match the snapshot:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: RELEASE-NAME
+              serviceAccountName: account-operator
               volumeMounts: null
-          serviceAccountName: RELEASE-NAME-account-operator
+          serviceAccountName: account-operator
           terminationGracePeriodSeconds: 10
           volumes: null
   5: |
@@ -370,8 +368,7 @@ operator match the snapshot:
       - name: github
     kind: ServiceAccount
     metadata:
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+      name: account-operator
 operator match the snapshot (with kubeconfigSecret):
   1: |
     apiVersion: apiextensions.k8s.io/v1
@@ -583,7 +580,7 @@ operator match the snapshot (with kubeconfigSecret):
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     rules:
       - apiGroups:
           - core.openmfp.io
@@ -639,32 +636,30 @@ operator match the snapshot (with kubeconfigSecret):
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     subjects:
       - kind: ServiceAccount
-        name: RELEASE-NAME-account-operator
-        namespace: NAMESPACE
+        name: account-operator
   4: |
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+      name: account-operator
     spec:
       revisionHistoryLimit: 3
       selector:
         matchLabels:
-          service: RELEASE-NAME-account-operator
+          service: account-operator
       template:
         metadata:
           annotations: null
           labels:
             control-plane: controller-manager
-            service: RELEASE-NAME-account-operator
+            service: account-operator
         spec:
           containers:
             - args:
@@ -735,11 +730,11 @@ operator match the snapshot (with kubeconfigSecret):
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: RELEASE-NAME
+              serviceAccountName: account-operator
               volumeMounts:
                 - mountPath: /api-kubeconfig
                   name: external-api-server
-          serviceAccountName: RELEASE-NAME-account-operator
+          serviceAccountName: account-operator
           terminationGracePeriodSeconds: 10
           volumes:
             - name: external-api-server
@@ -751,8 +746,7 @@ operator match the snapshot (with kubeconfigSecret):
       - name: github
     kind: ServiceAccount
     metadata:
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+      name: account-operator
 operator match the snapshot with webhook enabled:
   1: |
     apiVersion: apiextensions.k8s.io/v1
@@ -964,7 +958,7 @@ operator match the snapshot with webhook enabled:
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     rules:
       - apiGroups:
           - core.openmfp.io
@@ -1020,35 +1014,33 @@ operator match the snapshot with webhook enabled:
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole
-      name: RELEASE-NAME-account-operator
+      name: account-operator
     subjects:
       - kind: ServiceAccount
-        name: RELEASE-NAME-account-operator
-        namespace: NAMESPACE
+        name: account-operator
   4: |
     apiVersion: apps/v1
     kind: Deployment
     metadata:
       annotations:
-        cert-manager.io/inject-ca-from: NAMESPACE/RELEASE-NAME-account-operator-serving-cert
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+        cert-manager.io/inject-ca-from: NAMESPACE/account-operator-serving-cert
+      name: account-operator
     spec:
       revisionHistoryLimit: 3
       selector:
         matchLabels:
-          service: RELEASE-NAME-account-operator
+          service: account-operator
       template:
         metadata:
           annotations:
             traffic.sidecar.istio.io/excludeInboundPorts: "9443"
           labels:
             control-plane: controller-manager
-            service: RELEASE-NAME-account-operator
+            service: account-operator
         spec:
           containers:
             - args:
@@ -1120,39 +1112,38 @@ operator match the snapshot with webhook enabled:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: RELEASE-NAME
+              serviceAccountName: account-operator
               volumeMounts:
                 - mountPath: /certs
                   name: cert
                   readOnly: true
-          serviceAccountName: RELEASE-NAME-account-operator
+          serviceAccountName: account-operator
           terminationGracePeriodSeconds: 10
           volumes:
             - name: cert
               secret:
                 defaultMode: 420
-                secretName: RELEASE-NAME-account-operator-webhook-server-cert
+                secretName: account-operator-webhook-server-cert
   5: |
     apiVersion: v1
     imagePullSecrets:
       - name: github
     kind: ServiceAccount
     metadata:
-      name: RELEASE-NAME-account-operator
-      namespace: NAMESPACE
+      name: account-operator
   6: |
     apiVersion: admissionregistration.k8s.io/v1
     kind: MutatingWebhookConfiguration
     metadata:
       annotations:
-        cert-manager.io/inject-ca-from: NAMESPACE/RELEASE-NAME-account-operator-serving-cert
-      name: RELEASE-NAME-account-operator-mutating-webhook-configuration
+        cert-manager.io/inject-ca-from: NAMESPACE/account-operator-serving-cert
+      name: account-operator-mutating-webhook-configuration
     webhooks:
       - admissionReviewVersions:
           - v1
         clientConfig:
           service:
-            name: RELEASE-NAME-account-operator-webhook
+            name: account-operator-webhook
             namespace: NAMESPACE
             path: /mutate-core-openmfp-io-v1alpha1-account
         failurePolicy: Fail
@@ -1171,35 +1162,32 @@ operator match the snapshot with webhook enabled:
     apiVersion: cert-manager.io/v1
     kind: Issuer
     metadata:
-      name: RELEASE-NAME-account-operator-selfsigned-issuer
-      namespace: null
+      name: account-operator-selfsigned-issuer
     spec:
       selfSigned: {}
   8: |
     apiVersion: cert-manager.io/v1
     kind: Certificate
     metadata:
-      name: RELEASE-NAME-account-operator-serving-cert
-      namespace: null
+      name: account-operator-serving-cert
     spec:
       dnsNames:
-        - RELEASE-NAME-account-operator-webhook.NAMESPACE.svc
-        - RELEASE-NAME-account-operator-webhook.NAMESPACE.svc.cluster.local
+        - account-operator-webhook.NAMESPACE.svc
+        - account-operator-webhook.NAMESPACE.svc.cluster.local
       issuerRef:
         kind: Issuer
-        name: RELEASE-NAME-account-operator-selfsigned-issuer
-      secretName: RELEASE-NAME-account-operator-webhook-server-cert
+        name: account-operator-selfsigned-issuer
+      secretName: account-operator-webhook-server-cert
   9: |
     apiVersion: v1
     kind: Service
     metadata:
-      name: RELEASE-NAME-account-operator-webhook
-      namespace: NAMESPACE
+      name: account-operator-webhook
     spec:
       ports:
         - port: 443
           protocol: TCP
           targetPort: 9443
       selector:
         control-plane: controller-manager
-        service: RELEASE-NAME-account-operator
+        service: account-operator
diff --git a/charts/account-operator/tests/deployment_test.yaml b/charts/account-operator/tests/deployment_test.yaml
@@ -1,6 +1,8 @@
 suite: operator
 chart:
   appVersion: 0.0.0
+release:
+  name: account-operator
 tests:
   - it: operator match the snapshot
     asserts:
@@ -28,7 +30,7 @@ tests:
               type: RuntimeDefault
       - equal:
           path: spec.template.spec.containers[0].serviceAccountName
-          value: RELEASE-NAME
+          value: account-operator
       - equal:
           path: spec.template.spec.containers[0].automountServiceAccountToken
           value: true
diff --git a/charts/common/test-chart/templates/vs.yaml b/charts/common/test-chart/templates/vs.yaml
@@ -3,7 +3,6 @@ apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
   name: {{ include "common.entity.name" . }}
-  namespace: {{ .Release.Namespace }}
 spec:
   gateways:
     - {{ .Release.Namespace }}/gateway

diff --git a/charts/extension-manager-operator/templates/service-account.yaml b/charts/extension-manager-operator/templates/service-account.yaml
@@ -2,5 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "common.entity.name" . }}
-  namespace: {{ .Release.Namespace }}
 {{- include "common.imagePullSecret" . }}