diff --git a/charts/account-operator/templates/cluster-rolebinding.yaml b/charts/account-operator/templates/cluster-rolebinding.yaml index 45876e6f2..b48cf607c 100644 --- 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 index cea6844ec..92a0524b7 100644 --- 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 index 2eaf7c467..490c917a9 100644 --- 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 index a0375a863..9e4d73ff3 100644 --- a/charts/account-operator/templates/webhook/pki.yaml +++ b/charts/account-operator/templates/webhook/pki.yaml @@ -3,7 +3,6 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: {{ include "common.entity.name" . }}-selfsigned-issuer - namespace: {{ .Release.namespace }} spec: selfSigned: {} --- @@ -11,7 +10,6 @@ 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 index 7c8eb409f..c42d42a78 100644 --- 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 index b63398e13..ed8c904cc 100644 --- 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,30 +1162,27 @@ 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 @@ -1202,4 +1190,4 @@ operator match the snapshot with webhook enabled: 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 index 61277f7a3..e7e389c20 100644 --- 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 index 0f38c84b5..8dc8380f6 100644 --- 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 index 2eaf7c467..490c917a9 100644 --- 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" . }} diff --git a/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap index 37794b5d6..3eb2159a1 100644 --- a/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap @@ -3,7 +3,7 @@ operator match the snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: RELEASE-NAME-extension-manager-operator + name: extension-manager-operator rules: - apiGroups: - core.openmfp.io @@ -46,31 +46,31 @@ operator match the snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: RELEASE-NAME-extension-manager-operator + name: extension-manager-operator roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: RELEASE-NAME-extension-manager-operator + name: extension-manager-operator subjects: - kind: ServiceAccount - name: RELEASE-NAME-extension-manager-operator + name: extension-manager-operator namespace: NAMESPACE 3: | apiVersion: apps/v1 kind: Deployment metadata: - name: RELEASE-NAME-extension-manager-operator + name: extension-manager-operator spec: revisionHistoryLimit: 3 selector: matchLabels: - service: RELEASE-NAME-extension-manager-operator + service: extension-manager-operator template: metadata: annotations: sidecar.istio.io/inject: "true" labels: - service: RELEASE-NAME-extension-manager-operator + service: extension-manager-operator spec: containers: - args: @@ -116,7 +116,7 @@ operator match the snapshot: path: /readyz port: 8081 periodSeconds: 10 - serviceAccountName: RELEASE-NAME-extension-manager-operator + serviceAccountName: extension-manager-operator terminationGracePeriodSeconds: 10 4: | apiVersion: v1 @@ -124,5 +124,4 @@ operator match the snapshot: - name: github kind: ServiceAccount metadata: - name: RELEASE-NAME-extension-manager-operator - namespace: NAMESPACE + name: extension-manager-operator diff --git a/charts/extension-manager-operator/tests/deployment_test.yaml b/charts/extension-manager-operator/tests/deployment_test.yaml index 0a3b0a292..9edce29f7 100644 --- a/charts/extension-manager-operator/tests/deployment_test.yaml +++ b/charts/extension-manager-operator/tests/deployment_test.yaml @@ -9,6 +9,8 @@ values: chart: version: 1.0.0 appVersion: 1.0.0 +release: + name: extension-manager-operator tests: - it: operator match the snapshot asserts: @@ -60,7 +62,7 @@ tests: - equal: path: spec.template.metadata.labels value: - service: RELEASE-NAME-extension-manager-operator + service: extension-manager-operator - it: test imagePullPolicy override template: deployment.yaml set: diff --git a/charts/portal/templates/deploy.yaml b/charts/portal/templates/deploy.yaml index 6fa839a41..6ac2dd415 100644 --- a/charts/portal/templates/deploy.yaml +++ b/charts/portal/templates/deploy.yaml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} labels: app: {{ include "common.entity.name" . }} spec: diff --git a/charts/portal/templates/istio-destination-rule.yaml b/charts/portal/templates/istio-destination-rule.yaml index cbfa097fc..db577dadb 100644 --- a/charts/portal/templates/istio-destination-rule.yaml +++ b/charts/portal/templates/istio-destination-rule.yaml @@ -3,7 +3,6 @@ apiVersion: "networking.istio.io/v1alpha3" kind: "DestinationRule" metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} spec: host: {{ include "common.entity.name" . }}.{{ .Release.Namespace }}.svc.cluster.local trafficPolicy: diff --git a/charts/portal/templates/istio-peerauthentication.yaml b/charts/portal/templates/istio-peerauthentication.yaml index 57be5b47c..a3af91716 100644 --- a/charts/portal/templates/istio-peerauthentication.yaml +++ b/charts/portal/templates/istio-peerauthentication.yaml @@ -3,7 +3,6 @@ apiVersion: "security.istio.io/v1beta1" kind: "PeerAuthentication" metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} spec: selector: matchLabels: diff --git a/charts/portal/templates/istio-virtual-service.yaml b/charts/portal/templates/istio-virtual-service.yaml index f9a7262f0..04e0048fc 100644 --- a/charts/portal/templates/istio-virtual-service.yaml +++ b/charts/portal/templates/istio-virtual-service.yaml @@ -3,7 +3,6 @@ apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} spec: gateways: - {{ .Release.Namespace }}/gateway diff --git a/charts/portal/templates/sa.yaml b/charts/portal/templates/sa.yaml index 2eaf7c467..490c917a9 100644 --- a/charts/portal/templates/sa.yaml +++ b/charts/portal/templates/sa.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/portal/templates/service.yaml b/charts/portal/templates/service.yaml index 94190ee6a..b8c370f1c 100644 --- a/charts/portal/templates/service.yaml +++ b/charts/portal/templates/service.yaml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} spec: selector: app: {{ include "common.entity.name" . }} diff --git a/charts/portal/templates/sidecar.yaml b/charts/portal/templates/sidecar.yaml index 3d172bd63..acfdfb8d5 100644 --- a/charts/portal/templates/sidecar.yaml +++ b/charts/portal/templates/sidecar.yaml @@ -3,7 +3,6 @@ apiVersion: networking.istio.io/v1beta1 kind: Sidecar metadata: name: {{ include "common.entity.name" . }} - namespace: {{ .Release.Namespace }} spec: workloadSelector: labels: diff --git a/charts/portal/tests/__snapshot__/deploy_test.yaml.snap b/charts/portal/tests/__snapshot__/deploy_test.yaml.snap index 176a2317e..fec176318 100644 --- a/charts/portal/tests/__snapshot__/deploy_test.yaml.snap +++ b/charts/portal/tests/__snapshot__/deploy_test.yaml.snap @@ -4,14 +4,13 @@ matches the snapshot: kind: Deployment metadata: labels: - app: RELEASE-NAME-portal - name: RELEASE-NAME-portal - namespace: NAMESPACE + app: portal + name: portal spec: revisionHistoryLimit: 3 selector: matchLabels: - app: RELEASE-NAME-portal + app: portal strategy: rollingUpdate: maxSurge: 5 @@ -19,7 +18,7 @@ matches the snapshot: template: metadata: labels: - app: RELEASE-NAME-portal + app: portal spec: containers: - env: @@ -52,7 +51,7 @@ matches the snapshot: value: .? image: ghcr.io/openmfp/portal:1.0.0 imagePullPolicy: IfNotPresent - name: RELEASE-NAME-portal + name: portal ports: - containerPort: 8080 name: http @@ -69,4 +68,4 @@ matches the snapshot: fsGroup: 2000 runAsGroup: 3000 runAsUser: 1000 - serviceAccountName: RELEASE-NAME-portal + serviceAccountName: portal diff --git a/charts/portal/tests/__snapshot__/istio-virtual_service_test.yaml.snap b/charts/portal/tests/__snapshot__/istio-virtual_service_test.yaml.snap index 61a6bfb54..121dcd3f7 100644 --- a/charts/portal/tests/__snapshot__/istio-virtual_service_test.yaml.snap +++ b/charts/portal/tests/__snapshot__/istio-virtual_service_test.yaml.snap @@ -3,8 +3,7 @@ virtual service match the snapshot: apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: - name: RELEASE-NAME-portal - namespace: NAMESPACE + name: portal spec: gateways: - NAMESPACE/gateway @@ -26,6 +25,6 @@ virtual service match the snapshot: - DELETE route: - destination: - host: RELEASE-NAME-portal.NAMESPACE.svc.cluster.local + host: portal.NAMESPACE.svc.cluster.local port: number: 8080 diff --git a/charts/portal/tests/__snapshot__/istio_test.yaml.snap b/charts/portal/tests/__snapshot__/istio_test.yaml.snap index 749ad78d9..d2f70b4a4 100644 --- a/charts/portal/tests/__snapshot__/istio_test.yaml.snap +++ b/charts/portal/tests/__snapshot__/istio_test.yaml.snap @@ -4,14 +4,13 @@ matches the snapshot: kind: Deployment metadata: labels: - app: RELEASE-NAME-portal - name: RELEASE-NAME-portal - namespace: NAMESPACE + app: portal + name: portal spec: revisionHistoryLimit: 3 selector: matchLabels: - app: RELEASE-NAME-portal + app: portal strategy: rollingUpdate: maxSurge: 5 @@ -19,7 +18,7 @@ matches the snapshot: template: metadata: labels: - app: RELEASE-NAME-portal + app: portal spec: containers: - env: @@ -52,7 +51,7 @@ matches the snapshot: value: .? image: ghcr.io/openmfp/portal:1.0.0 imagePullPolicy: IfNotPresent - name: RELEASE-NAME-portal + name: portal ports: - containerPort: 8080 name: http @@ -69,12 +68,12 @@ matches the snapshot: fsGroup: 2000 runAsGroup: 3000 runAsUser: 1000 - serviceAccountName: RELEASE-NAME-portal + serviceAccountName: portal 2: | apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: RELEASE-NAME-portal-client-secret-portal + name: portal-portal-client-secret-portal namespace: NAMESPACE spec: data: @@ -116,7 +115,7 @@ matches the snapshot: name: contentconfigurations-reader subjects: - kind: ServiceAccount - name: RELEASE-NAME-portal + name: portal namespace: NAMESPACE 5: | apiVersion: v1 @@ -124,21 +123,19 @@ matches the snapshot: - name: github kind: ServiceAccount metadata: - name: RELEASE-NAME-portal - namespace: NAMESPACE + name: portal 6: | apiVersion: v1 kind: Service metadata: - name: RELEASE-NAME-portal - namespace: NAMESPACE + name: portal spec: ports: - name: http port: 8080 protocol: TCP selector: - app: RELEASE-NAME-portal + app: portal type: ClusterIP matches the snapshot with istio disabled: 1: | @@ -146,14 +143,13 @@ matches the snapshot with istio disabled: kind: Deployment metadata: labels: - app: RELEASE-NAME-portal - name: RELEASE-NAME-portal - namespace: NAMESPACE + app: portal + name: portal spec: revisionHistoryLimit: 3 selector: matchLabels: - app: RELEASE-NAME-portal + app: portal strategy: rollingUpdate: maxSurge: 5 @@ -161,7 +157,7 @@ matches the snapshot with istio disabled: template: metadata: labels: - app: RELEASE-NAME-portal + app: portal spec: containers: - env: @@ -194,7 +190,7 @@ matches the snapshot with istio disabled: value: .? image: ghcr.io/openmfp/portal:1.0.0 imagePullPolicy: IfNotPresent - name: RELEASE-NAME-portal + name: portal ports: - containerPort: 8080 name: http @@ -211,12 +207,12 @@ matches the snapshot with istio disabled: fsGroup: 2000 runAsGroup: 3000 runAsUser: 1000 - serviceAccountName: RELEASE-NAME-portal + serviceAccountName: portal 2: | apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: RELEASE-NAME-portal-client-secret-portal + name: portal-portal-client-secret-portal namespace: NAMESPACE spec: data: @@ -258,7 +254,7 @@ matches the snapshot with istio disabled: name: contentconfigurations-reader subjects: - kind: ServiceAccount - name: RELEASE-NAME-portal + name: portal namespace: NAMESPACE 5: | apiVersion: v1 @@ -266,19 +262,17 @@ matches the snapshot with istio disabled: - name: github kind: ServiceAccount metadata: - name: RELEASE-NAME-portal - namespace: NAMESPACE + name: portal 6: | apiVersion: v1 kind: Service metadata: - name: RELEASE-NAME-portal - namespace: NAMESPACE + name: portal spec: ports: - name: http port: 8080 protocol: TCP selector: - app: RELEASE-NAME-portal + app: portal type: ClusterIP diff --git a/charts/portal/tests/deploy_test.yaml b/charts/portal/tests/deploy_test.yaml index 2472af1b5..c43b71bdf 100644 --- a/charts/portal/tests/deploy_test.yaml +++ b/charts/portal/tests/deploy_test.yaml @@ -4,6 +4,8 @@ templates: chart: version: 1.0.0 appVersion: 1.0.0 +release: + name: portal tests: - it: matches the snapshot values: diff --git a/charts/portal/tests/istio-virtual_service_test.yaml b/charts/portal/tests/istio-virtual_service_test.yaml index 2d302f27a..671febe33 100644 --- a/charts/portal/tests/istio-virtual_service_test.yaml +++ b/charts/portal/tests/istio-virtual_service_test.yaml @@ -3,6 +3,8 @@ templates: - istio-virtual-service.yaml values: - ../test-values.yaml +release: + name: portal tests: - it: virtual service match the snapshot set: diff --git a/charts/portal/tests/istio_test.yaml b/charts/portal/tests/istio_test.yaml index fe1897498..b061c3de5 100644 --- a/charts/portal/tests/istio_test.yaml +++ b/charts/portal/tests/istio_test.yaml @@ -2,6 +2,8 @@ suite: deploy chart: version: 1.0.0 appVersion: 1.0.0 +release: + name: portal tests: - it: matches the snapshot set: