chore: remove manually managed rbac

apecloud · Jan 20, 2025 · e9b7c41 · e9b7c41
1 parent 4f28db1
commit e9b7c41
Show file tree

Hide file tree

Showing 78 changed files with 7 additions and 324 deletions.
diff --git a/addons-cluster/apecloud-mysql/templates/rbac.yaml b/addons-cluster/apecloud-mysql/templates/rbac.yaml
diff --git a/addons-cluster/apecloud-postgresql/templates/cluster.yaml b/addons-cluster/apecloud-postgresql/templates/cluster.yaml
@@ -15,4 +15,3 @@ spec:
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
       replicas: {{ include "apecloud-postgresql-cluster.replicas" . }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
diff --git a/addons-cluster/apecloud-postgresql/templates/rbac.yaml b/addons-cluster/apecloud-postgresql/templates/rbac.yaml
diff --git a/addons-cluster/clickhouse/templates/_helpers.tpl b/addons-cluster/clickhouse/templates/_helpers.tpl
@@ -54,13 +54,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ .Release.Name }}
 {{- end}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "clickhouse-cluster.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
 {{/*
 TLS file
 */}}
@@ -88,7 +81,6 @@ Define clickhouse componentSpec with ComponentDefinition.
   replicas: {{ $.Values.replicas | default 2 }}
   disableExporter: {{ $.Values.disableExporter | default "false" }}
   serviceVersion: {{ $.Values.version }}
-  serviceAccountName: {{ include "clickhouse-cluster.serviceAccountName" $ }}
   systemAccounts:
     - name: admin
       passwordConfig:
@@ -158,7 +150,6 @@ Define clickhouse shardingComponentSpec with ComponentDefinition.
     replicas: {{ $.Values.replicas | default 2 }}
     disableExporter: {{ $.Values.disableExporter | default "false" }}
     serviceVersion: {{ $.Values.version }}
-    serviceAccountName: {{ include "clickhouse-cluster.serviceAccountName" $ }}
     systemAccounts:
     - name: admin
       passwordConfig:
@@ -185,7 +176,6 @@ Define clickhouse componentSpec with compatible ComponentDefinition API
   replicas: {{ $.Values.replicas | default 2 }}
   disableExporter: {{ $.Values.disableExporter | default "false" }}
   serviceVersion: {{ $.Values.version }}
-  serviceAccountName: {{ include "clickhouse-cluster.serviceAccountName" $ }}
   {{- with $.Values.tolerations }}
   tolerations: {{ .| toYaml | nindent 4 }}
   {{- end }}

diff --git a/addons-cluster/clickhouse/templates/rbac.yaml b/addons-cluster/clickhouse/templates/rbac.yaml
diff --git a/addons-cluster/clickhouse/values.yaml b/addons-cluster/clickhouse/values.yaml
@@ -68,6 +68,3 @@ extra:
   ## Define Cluster termination policy.
   ## Options: DoNotTerminate, Halt, Delete, WipeOut.
   terminationPolicy: DoNotTerminate
-
-  ## If true, RBAC resources will be created
-  rbacEnabled: false
diff --git a/addons-cluster/elasticsearch/templates/_helpers.tpl b/addons-cluster/elasticsearch/templates/_helpers.tpl
@@ -54,13 +54,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ include "elasticsearch-cluster.fullname" .}}
 {{- end}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "elasticsearch-cluster.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
 {{- define "elasticsearch-cluster.replicaCount" }}
 {{- if eq .Values.mode "single-node" }}
 replicas: 1

diff --git a/addons-cluster/elasticsearch/templates/cluster-multi-node.yaml b/addons-cluster/elasticsearch/templates/cluster-multi-node.yaml
@@ -13,7 +13,6 @@ spec:
     - name: mdit
       componentDef: elasticsearch-{{ include "elasticsearch.majorVersion" . }}
       serviceVersion: {{ include "elasticsearch.version" . }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "elasticsearch-cluster.schedulingPolicy" . | indent 6 }}
       {{- include "elasticsearch-cluster.replicaCount" . | indent 6 }}
       {{- include "kblib.componentMonitor" . | indent 6 }}

diff --git a/addons-cluster/elasticsearch/templates/cluster-single-node.yaml b/addons-cluster/elasticsearch/templates/cluster-single-node.yaml
@@ -13,7 +13,6 @@ spec:
     - name: mdit
       componentDef: elasticsearch-{{ include "elasticsearch.majorVersion" . }}
       serviceVersion: {{ include "elasticsearch.version" . }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "elasticsearch-cluster.schedulingPolicy" . | indent 6 }}
       {{- include "elasticsearch-cluster.replicaCount" . | indent 6 }}
       {{- include "kblib.componentMonitor" . | indent 6 }}

diff --git a/addons-cluster/elasticsearch/values.yaml b/addons-cluster/elasticsearch/values.yaml
@@ -29,5 +29,4 @@ fullnameOverride: ""
 ## customized default values to override kblib chart's values
 extra:
   terminationPolicy: Delete
-  rbacEnabled: true
   disableExporter: false
diff --git a/addons-cluster/kafka/templates/_helpers.tpl b/addons-cluster/kafka/templates/_helpers.tpl
@@ -54,13 +54,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ include "kafka-cluster.fullname" .}}
 {{- end}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "kafka-cluster.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
 {{/*
 Define kafka broker component name
 */}}

diff --git a/addons-cluster/kafka/templates/cluster.yaml b/addons-cluster/kafka/templates/cluster.yaml
@@ -21,7 +21,6 @@ spec:
         name: KubeBlocks
       {{- end }}
       replicas: {{ .Values.replicas }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       services:
         - name: advertised-listener
         {{- if .Values.nodePortEnabled }}
@@ -71,7 +70,6 @@ spec:
         name: KubeBlocks
       {{- end }}
       replicas: {{ .Values.brokerReplicas }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       services:
         - name: advertised-listener
         {{- if .Values.nodePortEnabled }}
@@ -120,7 +118,6 @@ spec:
         name: KubeBlocks
       {{- end }}
       replicas: {{ .Values.controllerReplicas }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- if .Values.storageEnable }}
       volumeClaimTemplates:

diff --git a/addons-cluster/kafka/templates/rbac.yaml b/addons-cluster/kafka/templates/rbac.yaml
diff --git a/addons-cluster/kblib/templates/_rbac.tpl b/addons-cluster/kblib/templates/_rbac.tpl
diff --git a/addons-cluster/kblib/values.schema.json b/addons-cluster/kblib/values.schema.json
@@ -19,12 +19,6 @@
         "Delete",
         "WipeOut"
       ]
-    },
-    "rbacEnabled": {
-      "title": "RBAC Enabled",
-      "description": "Specify whether rbac resources will be created by client, otherwise KubeBlocks server will try to create rbac resources.",
-      "type": "boolean",
-      "default": false
     }
   }
 }
diff --git a/addons-cluster/kblib/values.yaml b/addons-cluster/kblib/values.yaml
@@ -6,7 +6,3 @@ disableExporter: true
 
 ## @param terminationPolicy
 terminationPolicy: Delete
-
-## @param rbacEnabled if true, rbac resources will be created
-##
-rbacEnabled: false
diff --git a/addons-cluster/loki/templates/_helpers.tpl b/addons-cluster/loki/templates/_helpers.tpl
@@ -50,17 +50,6 @@ app.kubernetes.io/name: {{ include "loki-cluster.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "loki-cluster.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "loki-cluster.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
 {{- define "clustername" -}}
 {{ include "loki-cluster.fullname" .}}
 {{- end}}

diff --git a/addons-cluster/mariadb/templates/rbac.yaml b/addons-cluster/mariadb/templates/rbac.yaml
diff --git a/addons-cluster/minio/templates/cluster.yaml b/addons-cluster/minio/templates/cluster.yaml
@@ -13,7 +13,6 @@ spec:
       env:
       - name: MINIO_BUCKETS
         value: {{ .Values.buckets }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
diff --git a/addons-cluster/mogdb/templates/cluster.yaml b/addons-cluster/mogdb/templates/cluster.yaml
@@ -12,6 +12,5 @@ spec:
       serviceVersion: {{ .Values.version | quote}}
       {{- include "kblib.componentMonitor" . | indent 6 }}
       {{- include "mogdb-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
diff --git a/addons-cluster/mogdb/templates/rbac.yaml b/addons-cluster/mogdb/templates/rbac.yaml
diff --git a/addons-cluster/mongodb/templates/cluster.yaml b/addons-cluster/mongodb/templates/cluster.yaml
@@ -16,6 +16,5 @@ spec:
     - name: mongodb
       serviceVersion: {{ .Values.version }}
       {{- include "mongodb-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
diff --git a/addons-cluster/mongodb/templates/rbac.yaml b/addons-cluster/mongodb/templates/rbac.yaml
diff --git a/addons-cluster/mongodb/values.yaml b/addons-cluster/mongodb/values.yaml
@@ -31,6 +31,5 @@ storage: 20
 
 hostnetwork: "enabled"
 
-## @param extra.rbacEnabled if true, create rbac
 extra:
-  terminationPolicy: Delete
+  terminationPolicy: Delete
diff --git a/addons-cluster/mysql/values.yaml b/addons-cluster/mysql/values.yaml
@@ -38,7 +38,6 @@ proxysql:
   cpu: 1
   memory: 1
 
-## @param extra.rbacEnabled if true, create rbac
 extra:
   terminationPolicy: Delete
 

diff --git a/addons-cluster/opensearch/templates/_helpers.tpl b/addons-cluster/opensearch/templates/_helpers.tpl
@@ -53,10 +53,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- define "clustername" -}}
 {{ include "opensearch-cluster.fullname" .}}
 {{- end}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "opensearch-cluster.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
diff --git a/addons-cluster/polardbx/templates/_helpers.tpl b/addons-cluster/polardbx/templates/_helpers.tpl
@@ -49,14 +49,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "polardbx.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "polardbx.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "polardbx.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/addons-cluster/pulsar/templates/_helpers.tpl b/addons-cluster/pulsar/templates/_helpers.tpl
@@ -54,14 +54,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ include "pulsar-cluster.fullname" .}}
 {{- end}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "pulsar-cluster.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
-
 {{/*
 Pulsar broker FQDN
 */}}

diff --git a/addons-cluster/qdrant/templates/_helpers.tpl b/addons-cluster/qdrant/templates/_helpers.tpl
@@ -54,13 +54,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ include "qdrant.fullname" .}}
 {{- end}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "qdrant.serviceAccountName" -}}
-{{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
 {{- define "qdrant.version" }}
 {{- trimPrefix "qdrant-" .Values.version }}
 {{- end }}
diff --git a/addons-cluster/qdrant/templates/cluster.yaml b/addons-cluster/qdrant/templates/cluster.yaml
@@ -12,7 +12,6 @@ spec:
     - name: qdrant
       componentDef: qdrant
       serviceVersion: {{ include "qdrant.version" . }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
       replicas: {{ .Values.replicas | default 1 }}
       {{- include "kblib.componentResources" . | indent 6 }}

diff --git a/addons-cluster/qdrant/templates/rbac.yaml b/addons-cluster/qdrant/templates/rbac.yaml
diff --git a/addons-cluster/qdrant/values.yaml b/addons-cluster/qdrant/values.yaml
@@ -28,4 +28,3 @@ storage: 20
 ## customized default values to override kblib chart's values
 extra:
   terminationPolicy: Delete
-  rbacEnabled: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ proxysql: @@
       cpu: 1
       memory: 1
-    ## @param extra.rbacEnabled if true, create rbac
     extra:
       terminationPolicy: Delete
@@ Expand Down @@