Revise hub-cluster-robot chart

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · Aug 22, 2024 · 318c357 · 318c357
1 parent c6d491d
commit 318c357
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/...uster-robot/common/rbac/cluster_role.yaml → ...s/hub-cluster-robot/common/rbac/role.yaml b/...uster-robot/common/rbac/cluster_role.yaml → ...s/hub-cluster-robot/common/rbac/role.yaml
@@ -1,7 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
   name: open-cluster-management:hub-cluster-robot:cluster-auth
+  namespace: open-cluster-management-cluster-auth
 rules:
   - apiGroups: [""]
     resources: ["secrets", "serviceaccounts"]

diff --git a/charts/hub-cluster-robot/common/rbac/role_binding.yaml b/charts/hub-cluster-robot/common/rbac/role_binding.yaml
@@ -5,9 +5,9 @@ metadata:
   namespace: open-cluster-management-cluster-auth
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: open-cluster-management:hub-cluster-robot
+  kind: Role
+  name: open-cluster-management:hub-cluster-robot:cluster-auth
 subjects:
   - kind: ServiceAccount
     name: hub-cluster-robot
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "hub-cluster-robot.namespace" . }}
diff --git a/charts/hub-cluster-robot/common/rbac/service_account.yaml b/charts/hub-cluster-robot/common/rbac/service_account.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: hub-cluster-robot
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "hub-cluster-robot.namespace" . }}
diff --git a/charts/hub-cluster-robot/templates/k8s/addon.yaml b/charts/hub-cluster-robot/templates/k8s/addon.yaml
@@ -3,7 +3,7 @@
 {{- $restpl := $.Files.Get "common/rbac/service_account.yaml" }}
 {{ tpl $restpl $ }}
 ---
-{{- $restpl := $.Files.Get "common/rbac/cluster_role.yaml" }}
+{{- $restpl := $.Files.Get "common/rbac/role.yaml" }}
 {{ tpl $restpl $ }}
 ---
 {{- $restpl := $.Files.Get "common/rbac/role_binding.yaml" }}

diff --git a/charts/hub-cluster-robot/templates/ocm-mc/addon.yaml b/charts/hub-cluster-robot/templates/ocm-mc/addon.yaml
@@ -29,7 +29,7 @@ spec:
               {{- $restpl := $.Files.Get "common/rbac/service_account.yaml" -}}
               {{- tpl $restpl $ | nindent 14 }}
               ---
-              {{- $restpl := $.Files.Get "common/rbac/cluster_role.yaml" -}}
+              {{- $restpl := $.Files.Get "common/rbac/role.yaml" -}}
               {{- tpl $restpl $ | nindent 14 }}
               ---
               {{- $restpl := $.Files.Get "common/rbac/role_binding.yaml" -}}

diff --git a/charts/hub-cluster-robot/values.yaml b/charts/hub-cluster-robot/values.yaml
@@ -2,7 +2,7 @@ nameOverride: ""
 fullnameOverride: ""
 
 kubeconfigSecretName: ""
-addonManagerNamespace: open-cluster-management-cluster-auth
+addonManagerNamespace: open-cluster-management
 
 kubectl:
   image: ghcr.io/appscode/kubectl-nonroot:1.25