From 7d6987bbc151cf6dfe502b5b57c828a87593c316 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 14:44:55 +0100
Subject: [PATCH] OZG-4624 rename clusterroles and serviceaccount
---
src/main/helm/templates/deployment.yaml | 2 +-
.../rbacs/keycloak_admin_secret_read.yaml | 8 ++---
.../helm/templates/rbacs/keycloak_read.yaml | 32 +++++++++----------
.../helm/templates/rbacs/keycloak_write.yaml | 32 +++++++++----------
.../helm/templates/rbacs/serviceaccount.yaml | 2 +-
.../rbacs/keycloak_admin_secret_read.yaml | 8 ++---
src/test/helm/rbacs/keycloak_read_test.yaml | 32 +++++++++----------
src/test/helm/rbacs/keycloak_write_test.yaml | 32 +++++++++----------
src/test/helm/rbacs/serviceaccount_test.yaml | 2 +-
9 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 79e994e..6d26ef9 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 b38ae12..bdeabe9 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 0951f3c..3f06a8e 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 1cee24d..2ec2cee 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 ff35db3..f9f224e 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 214392d..3e0b5d3 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 840ac9b..a142a96 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 6aa6630..7467082 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 5f79cd6..44323bb 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
--
GitLab