From 3677d19342cf8a3c2ef2de4eddb99fc6f3421774 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Fri, 1 Dec 2023 10:18:31 +0100 Subject: [PATCH] OZG-4183 adjust renaming --- src/main/helm/templates/keycloak-user-crd.yaml | 2 +- src/main/helm/templates/network_policy.yaml | 2 +- .../ozgcloud_keycloak_operator_secrets_read_role.yaml | 2 +- .../ozgcloud_keycloak_operator_secrets_read_role_binding.yaml | 4 ++-- .../ozgcloud_keycloak_operator_secrets_write_role.yaml | 2 +- ...ozgcloud_keycloak_operator_secrets_write_role_binding.yaml | 4 ++-- src/test/helm/keycloak-user-crd-test.yaml | 2 +- src/test/helm/network_policy_test.yaml | 2 +- ...loud_keycloak_operator_secrets_read_role_binding_test.yaml | 4 ++-- .../ozgcloud_keycloak_operator_secrets_read_role_test.yaml | 2 +- ...oud_keycloak_operator_secrets_write_role_binding_test.yaml | 4 ++-- .../ozgcloud_keycloak_operator_secrets_write_role_test.yaml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml index 03d3ae0b..1800e7a7 100644 --- a/src/main/helm/templates/keycloak-user-crd.yaml +++ b/src/main/helm/templates/keycloak-user-crd.yaml @@ -1,7 +1,7 @@ {{ if .Values.sso.api_user }} --- apiVersion: operator.ozgcloud.de/v1 -kind: OzgKeycloakUser +kind: OzgCloudKeycloakUser metadata: name: {{ include "app.generateKeycloakUserRessourceName" . }} namespace: {{ include "app.namespace" . }} diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml index 104939f0..e8a339f4 100644 --- a/src/main/helm/templates/network_policy.yaml +++ b/src/main/helm/templates/network_policy.yaml @@ -45,7 +45,7 @@ spec: - to: - podSelector: matchLabels: - component: ozg-mongodb + component: ozgcloud-mongodb ports: - port: 27017 protocol: TCP diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml index 72c233c8..02f30c4d 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ozg-operator-secrets-read-role-user-manager + name: ozgcloud-keycloak-operator-secrets-read-role-user-manager namespace: {{ include "app.namespace" $ }} rules: - apiGroups: diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml index 2fbe6c8b..fdcf591e 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ozg-operator-secrets-read-role-binding-user-manager + name: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager namespace: {{ include "app.namespace" . }} subjects: - kind: ServiceAccount @@ -10,6 +10,6 @@ subjects: namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }} roleRef: kind: Role - name: ozg-operator-secrets-read-role-user-manager + name: ozgcloud-keycloak-operator-secrets-read-role-user-manager apiGroup: rbac.authorization.k8s.io {{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml index b4b25822..f5f02cf3 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ozg-operator-secrets-write-role-user-manager + name: ozgcloud-keycloak-operator-secrets-write-role-user-manager namespace: {{ include "app.namespace" $ }} rules: - apiGroups: diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml index d6b4532d..ad6a1e11 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ozg-operator-secrets-write-role-binding-user-manager + name: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager namespace: {{ include "app.namespace" . }} subjects: - kind: ServiceAccount @@ -10,6 +10,6 @@ subjects: namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }} roleRef: kind: Role - name: ozg-operator-secrets-write-role-user-manager + name: ozgcloud-keycloak-operator-secrets-write-role-user-manager apiGroup: rbac.authorization.k8s.io {{- end }} \ No newline at end of file diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml index 59177f41..7003396f 100644 --- a/src/test/helm/keycloak-user-crd-test.yaml +++ b/src/test/helm/keycloak-user-crd-test.yaml @@ -38,7 +38,7 @@ tests: - isAPIVersion: of: operator.ozgcloud.de/v1 - isKind: - of: OzgKeycloakUser + of: OzgCloudKeycloakUser - it: should have metadata set: sso: diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml index a4c43863..ed301b85 100644 --- a/src/test/helm/network_policy_test.yaml +++ b/src/test/helm/network_policy_test.yaml @@ -61,7 +61,7 @@ tests: - to: - podSelector: matchLabels: - component: ozg-mongodb + component: ozgcloud-mongodb ports: - port: 27017 protocol: TCP diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml index 447e1fee..3acc4647 100644 --- a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml +++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml @@ -25,7 +25,7 @@ tests: asserts: - equal: path: metadata.name - value: ozg-operator-secrets-read-role-binding-user-manager + value: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager - equal: path: metadata.namespace value: by-helm-test @@ -54,7 +54,7 @@ tests: value: Role - equal: path: roleRef.name - value: ozg-operator-secrets-read-role-user-manager + value: ozgcloud-keycloak-operator-secrets-read-role-user-manager - equal: path: roleRef.apiGroup value: rbac.authorization.k8s.io diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml index d2561e2e..4464f2f2 100644 --- a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml +++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml @@ -23,7 +23,7 @@ tests: asserts: - equal: path: metadata.name - value: ozg-operator-secrets-read-role-user-manager + value: ozgcloud-keycloak-operator-secrets-read-role-user-manager - equal: path: metadata.namespace value: by-helm-test diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml index a274845f..0522ac02 100644 --- a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml +++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml @@ -25,7 +25,7 @@ tests: asserts: - equal: path: metadata.name - value: ozg-operator-secrets-write-role-binding-user-manager + value: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager - equal: path: metadata.namespace value: by-helm-test @@ -54,7 +54,7 @@ tests: value: Role - equal: path: roleRef.name - value: ozg-operator-secrets-write-role-user-manager + value: ozgcloud-keycloak-operator-secrets-write-role-user-manager - equal: path: roleRef.apiGroup value: rbac.authorization.k8s.io diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml index a334dbfa..f5a36504 100644 --- a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml +++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml @@ -23,7 +23,7 @@ tests: asserts: - equal: path: metadata.name - value: ozg-operator-secrets-write-role-user-manager + value: ozgcloud-keycloak-operator-secrets-write-role-user-manager - equal: path: metadata.namespace value: by-helm-test -- GitLab