diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 79e994ebf4cd1fec736d3328fe81ab269d271b8f..6d26ef996e96b1224e817ec1fd95709be47b92fc 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -44,7 +44,7 @@ spec:
labels:
{{- include "app.matchLabels" . | indent 8 }}
spec:
- serviceAccountName: ozg-operator-serviceaccount
+ serviceAccountName: ozgcloud-keycloak-operator-serviceaccount
containers:
- name: ozg-operator
image: "{{ required "image.repo must be set" (.Values.image).repo }}/{{ required "image.name must be set" (.Values.image).name }}:{{ required "image.tag must be set" (.Values.image).tag }}"
diff --git a/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml b/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
index b38ae12bd95b52c9a1ea412197e7f101443844c5..bdeabe9c8b3141eedbb9d11ed35fae962e1f7c04 100644
--- a/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
@@ -25,21 +25,21 @@
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-admin-secret-viewer-role-binding
+ name: ozgcloud-keycloak-operator-admin-secret-viewer-role-binding
namespace: keycloak
subjects:
- kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
- name: ozg-operator-keycloak-admin-secret-viewer-role
+ name: ozgcloud-keycloak-operator-admin-secret-viewer-role
apiGroup: rbac.authorization.k8s.io
---
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-admin-secret-viewer-role
+ name: ozgcloud-keycloak-operator-admin-secret-viewer-role
namespace: keycloak
rules:
- apiGroups:
diff --git a/src/main/helm/templates/rbacs/keycloak_read.yaml b/src/main/helm/templates/rbacs/keycloak_read.yaml
index 0951f3cb825c2d15e554b3e3ba2661c552a020a0..3f06a8e17cd5ca203d93f6323533307c935ab35a 100644
--- a/src/main/helm/templates/rbacs/keycloak_read.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_read.yaml
@@ -26,36 +26,36 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-viewer-role-binding
+ name: ozgcloud-keycloak-operator-viewer-role-binding
subjects:
- kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
- name: ozg-operator-keycloak-viewer-role
+ name: ozgcloud-keycloak-operator-viewer-role
apiGroup: rbac.authorization.k8s.io
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-viewer-role
+ name: ozgcloud-keycloak-operator-viewer-role
rules:
- apiGroups:
- operator.ozgcloud.de
resources:
- - ozgkeycloakusers
- - ozgkeycloakusers/status
- - ozgkeycloakusers/finalizers
- - ozgkeycloakgroups
- - ozgkeycloakgroups/status
- - ozgkeycloakgroups/finalizers
- - ozgkeycloakrealms
- - ozgkeycloakrealms/status
- - ozgkeycloakrealms/finalizers
- - ozgkeycloakclients
- - ozgkeycloakclients/status
- - ozgkeycloakclients/finalizers
+ - ozgcloudkeycloakusers
+ - ozgcloudkeycloakusers/status
+ - ozgcloudkeycloakusers/finalizers
+ - ozgcloudkeycloakgroups
+ - ozgcloudkeycloakgroups/status
+ - ozgcloudkeycloakgroups/finalizers
+ - ozgcloudkeycloakrealms
+ - ozgcloudkeycloakrealms/status
+ - ozgcloudkeycloakrealms/finalizers
+ - ozgcloudkeycloakclients
+ - ozgcloudkeycloakclients/status
+ - ozgcloudkeycloakclients/finalizers
verbs:
- get
- list
diff --git a/src/main/helm/templates/rbacs/keycloak_write.yaml b/src/main/helm/templates/rbacs/keycloak_write.yaml
index 1cee24d8ec3921bafda009acd8f3a30bfc15fa5f..2ec2cee30e234bdd10d92b590baba4931767fafb 100644
--- a/src/main/helm/templates/rbacs/keycloak_write.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_write.yaml
@@ -26,36 +26,36 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-write-role-binding
+ name: ozgcloud-keycloak-operator-write-role-binding
subjects:
- kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
- name: ozg-operator-keycloak-write-role
+ name: ozgcloud-keycloak-operator-write-role
apiGroup: rbac.authorization.k8s.io
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: ozg-operator-keycloak-write-role
+ name: ozgcloud-keycloak-operator-write-role
rules:
- apiGroups:
- operator.ozgcloud.de
resources:
- - ozgkeycloakusers
- - ozgkeycloakusers/status
- - ozgkeycloakusers/finalizers
- - ozgkeycloakgroups
- - ozgkeycloakgroups/status
- - ozgkeycloakgroups/finalizers
- - ozgkeycloakrealms
- - ozgkeycloakrealms/status
- - ozgkeycloakrealms/finalizers
- - ozgkeycloakclients
- - ozgkeycloakclients/status
- - ozgkeycloakclients/finalizers
+ - ozgcloudkeycloakusers
+ - ozgcloudkeycloakusers/status
+ - ozgcloudkeycloakusers/finalizers
+ - ozgcloudkeycloakgroups
+ - ozgcloudkeycloakgroups/status
+ - ozgcloudkeycloakgroups/finalizers
+ - ozgcloudkeycloakrealms
+ - ozgcloudkeycloakrealms/status
+ - ozgcloudkeycloakrealms/finalizers
+ - ozgcloudkeycloakclients
+ - ozgcloudkeycloakclients/status
+ - ozgcloudkeycloakclients/finalizers
verbs:
- patch
- update
\ No newline at end of file
diff --git a/src/main/helm/templates/rbacs/serviceaccount.yaml b/src/main/helm/templates/rbacs/serviceaccount.yaml
index ff35db37800d21c01ba1742395fb57b0fde96553..f9f224ecc844a4042afc49a90066806ccc405981 100644
--- a/src/main/helm/templates/rbacs/serviceaccount.yaml
+++ b/src/main/helm/templates/rbacs/serviceaccount.yaml
@@ -24,5 +24,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
index 214392dc7e8e146750874e6c06aa2ec67305175a..3e0b5d38ca885de86b162a37aad518115221290e 100644
--- a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
+++ b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
@@ -36,7 +36,7 @@ tests:
documentIndex: 0
- equal:
path: metadata.name
- value: ozg-operator-keycloak-admin-secret-viewer-role-binding
+ value: ozgcloud-keycloak-operator-admin-secret-viewer-role-binding
documentIndex: 0
- equal:
path: metadata.namespace
@@ -48,7 +48,7 @@ tests:
path: subjects
content:
kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: test-namespace
documentIndex: 0
- it: test RoleBinding roleRef
@@ -57,7 +57,7 @@ tests:
path: roleRef
value:
kind: Role
- name: ozg-operator-keycloak-admin-secret-viewer-role
+ name: ozgcloud-keycloak-operator-admin-secret-viewer-role
apiGroup: rbac.authorization.k8s.io
documentIndex: 0
@@ -68,7 +68,7 @@ tests:
documentIndex: 1
- equal:
path: metadata.name
- value: ozg-operator-keycloak-admin-secret-viewer-role
+ value: ozgcloud-keycloak-operator-admin-secret-viewer-role
documentIndex: 1
- equal:
path: metadata.namespace
diff --git a/src/test/helm/rbacs/keycloak_read_test.yaml b/src/test/helm/rbacs/keycloak_read_test.yaml
index 840ac9bda92453fa466217fb726932599a7dab3a..a142a9695fe64d51b927d7f42e0f0b293ab91923 100644
--- a/src/test/helm/rbacs/keycloak_read_test.yaml
+++ b/src/test/helm/rbacs/keycloak_read_test.yaml
@@ -36,7 +36,7 @@ tests:
documentIndex: 0
- equal:
path: metadata.name
- value: ozg-operator-keycloak-viewer-role-binding
+ value: ozgcloud-keycloak-operator-viewer-role-binding
documentIndex: 0
- it: test ClusterRoleBinding subject
asserts:
@@ -44,7 +44,7 @@ tests:
path: subjects
content:
kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: test-namespace
documentIndex: 0
- it: test ClusterRoleBinding roleRef
@@ -53,7 +53,7 @@ tests:
path: roleRef
value:
kind: ClusterRole
- name: ozg-operator-keycloak-viewer-role
+ name: ozgcloud-keycloak-operator-viewer-role
apiGroup: rbac.authorization.k8s.io
documentIndex: 0
@@ -64,7 +64,7 @@ tests:
documentIndex: 1
- equal:
path: metadata.name
- value: ozg-operator-keycloak-viewer-role
+ value: ozgcloud-keycloak-operator-viewer-role
documentIndex: 1
- it: test ClusterRoleBinding rules
asserts:
@@ -74,18 +74,18 @@ tests:
apiGroups:
- operator.ozgcloud.de
resources:
- - ozgkeycloakusers
- - ozgkeycloakusers/status
- - ozgkeycloakusers/finalizers
- - ozgkeycloakgroups
- - ozgkeycloakgroups/status
- - ozgkeycloakgroups/finalizers
- - ozgkeycloakrealms
- - ozgkeycloakrealms/status
- - ozgkeycloakrealms/finalizers
- - ozgkeycloakclients
- - ozgkeycloakclients/status
- - ozgkeycloakclients/finalizers
+ - ozgcloudkeycloakusers
+ - ozgcloudkeycloakusers/status
+ - ozgcloudkeycloakusers/finalizers
+ - ozgcloudkeycloakgroups
+ - ozgcloudkeycloakgroups/status
+ - ozgcloudkeycloakgroups/finalizers
+ - ozgcloudkeycloakrealms
+ - ozgcloudkeycloakrealms/status
+ - ozgcloudkeycloakrealms/finalizers
+ - ozgcloudkeycloakclients
+ - ozgcloudkeycloakclients/status
+ - ozgcloudkeycloakclients/finalizers
verbs:
- get
- list
diff --git a/src/test/helm/rbacs/keycloak_write_test.yaml b/src/test/helm/rbacs/keycloak_write_test.yaml
index 6aa6630738727ae77a84194ea3a769b89ceffa95..746708269097782a9bceb45f25aa0ee653e61634 100644
--- a/src/test/helm/rbacs/keycloak_write_test.yaml
+++ b/src/test/helm/rbacs/keycloak_write_test.yaml
@@ -36,7 +36,7 @@ tests:
documentIndex: 0
- equal:
path: metadata.name
- value: ozg-operator-keycloak-write-role-binding
+ value: ozgcloud-keycloak-operator-write-role-binding
documentIndex: 0
- it: test ClusterRoleBinding subject
asserts:
@@ -44,7 +44,7 @@ tests:
path: subjects
content:
kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: test-namespace
documentIndex: 0
- it: test ClusterRoleBinding roleRef
@@ -53,7 +53,7 @@ tests:
path: roleRef
value:
kind: ClusterRole
- name: ozg-operator-keycloak-write-role
+ name: ozgcloud-keycloak-operator-write-role
apiGroup: rbac.authorization.k8s.io
documentIndex: 0
@@ -64,7 +64,7 @@ tests:
documentIndex: 1
- equal:
path: metadata.name
- value: ozg-operator-keycloak-write-role
+ value: ozgcloud-keycloak-operator-write-role
documentIndex: 1
- it: test ClusterRoleBinding rules
asserts:
@@ -74,18 +74,18 @@ tests:
apiGroups:
- operator.ozgcloud.de
resources:
- - ozgkeycloakusers
- - ozgkeycloakusers/status
- - ozgkeycloakusers/finalizers
- - ozgkeycloakgroups
- - ozgkeycloakgroups/status
- - ozgkeycloakgroups/finalizers
- - ozgkeycloakrealms
- - ozgkeycloakrealms/status
- - ozgkeycloakrealms/finalizers
- - ozgkeycloakclients
- - ozgkeycloakclients/status
- - ozgkeycloakclients/finalizers
+ - ozgcloudkeycloakusers
+ - ozgcloudkeycloakusers/status
+ - ozgcloudkeycloakusers/finalizers
+ - ozgcloudkeycloakgroups
+ - ozgcloudkeycloakgroups/status
+ - ozgcloudkeycloakgroups/finalizers
+ - ozgcloudkeycloakrealms
+ - ozgcloudkeycloakrealms/status
+ - ozgcloudkeycloakrealms/finalizers
+ - ozgcloudkeycloakclients
+ - ozgcloudkeycloakclients/status
+ - ozgcloudkeycloakclients/finalizers
verbs:
- patch
- update
diff --git a/src/test/helm/rbacs/serviceaccount_test.yaml b/src/test/helm/rbacs/serviceaccount_test.yaml
index 5f79cd62174d48bac5b5fc5fbd6964213840e51b..44323bb0b341d2a4ed8f06b48f9de7e7b576b0b3 100644
--- a/src/test/helm/rbacs/serviceaccount_test.yaml
+++ b/src/test/helm/rbacs/serviceaccount_test.yaml
@@ -35,7 +35,7 @@ tests:
of: ServiceAccount
- equal:
path: metadata.name
- value: ozg-operator-serviceaccount
+ value: ozgcloud-keycloak-operator-serviceaccount
- equal:
path: metadata.namespace
value: test-namespace
\ No newline at end of file