From deb6a5283bc6d77f21d8e15ed8a5e36c6a044dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zhihai=20Fan=20=28=E8=8C=83=E5=BF=97=E6=B5=B7=29?= Date: Mon, 11 Apr 2022 15:40:25 +0800 Subject: [PATCH] remove cluster-proxy-rbac from karmada-host cluster to karmada-apiserver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zhihai Fan (范志海) --- ...xy-admin-rbac.yaml => _karmada_cluster_proxy_admin_rbac.tpl} | 2 ++ charts/templates/post-install-job.yaml | 2 ++ charts/templates/pre-install-job.yaml | 2 ++ 3 files changed, 6 insertions(+) rename charts/templates/{cluster-proxy-admin-rbac.yaml => _karmada_cluster_proxy_admin_rbac.tpl} (92%) diff --git a/charts/templates/cluster-proxy-admin-rbac.yaml b/charts/templates/_karmada_cluster_proxy_admin_rbac.tpl similarity index 92% rename from charts/templates/cluster-proxy-admin-rbac.yaml rename to charts/templates/_karmada_cluster_proxy_admin_rbac.tpl index 40ea62b63..8a9f42424 100644 --- a/charts/templates/cluster-proxy-admin-rbac.yaml +++ b/charts/templates/_karmada_cluster_proxy_admin_rbac.tpl @@ -1,3 +1,4 @@ +{{- define "karmada.proxyRbac" -}} {{- $name := include "karmada.name" . -}} apiVersion: rbac.authorization.k8s.io/v1 @@ -23,4 +24,5 @@ roleRef: subjects: - kind: User name: "system:admin" +{{- end -}} diff --git a/charts/templates/post-install-job.yaml b/charts/templates/post-install-job.yaml index 36be1c229..38fc1b8b5 100644 --- a/charts/templates/post-install-job.yaml +++ b/charts/templates/post-install-job.yaml @@ -12,6 +12,8 @@ data: {{- include "karmada.webhook.configuration" . | nindent 4 }} {{- print "system-namespace.yaml: " | nindent 2 }} |- {{- include "karmada.systemNamespace" . | nindent 4 }} + {{- print "cluster-proxy-admin-rbac.yaml: " | nindent 2 }} |- + {{- include "karmada.proxyRbac" . | nindent 4 }} --- apiVersion: v1 kind: ConfigMap diff --git a/charts/templates/pre-install-job.yaml b/charts/templates/pre-install-job.yaml index 89805878a..70b784ba1 100644 --- a/charts/templates/pre-install-job.yaml +++ b/charts/templates/pre-install-job.yaml @@ -82,6 +82,8 @@ data: {{- include "karmada.systemNamespace" . | nindent 8 }} {{- print "apiservice.yaml: " | nindent 6 }} |- {{- include "karmada.apiservice" . | nindent 8 }} + {{- print "cluster-proxy-admin-rbac.yaml: " | nindent 6 }} |- + {{- include "karmada.proxyRbac" . | nindent 8 }} crds-configmaps.yaml: |- apiVersion: v1 kind: ConfigMap