remove manually managed rbac

apecloud · Nov 29, 2024 · fc22eaf · fc22eaf
1 parent 17a4490
commit fc22eaf
Show file tree

Hide file tree

Showing 42 changed files with 1 addition and 165 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-mysql/values.yaml b/addons-cluster/apecloud-mysql/values.yaml
@@ -50,7 +50,6 @@ proxy:
 ## customized default values to override kblib chart's values
 extra:
   disableExporter: true
-  rbacEnabled: true
   terminationPolicy: Delete
 
 

diff --git a/addons-cluster/apecloud-postgresql/templates/cluster.yaml b/addons-cluster/apecloud-postgresql/templates/cluster.yaml
@@ -13,4 +13,3 @@ spec:
       serviceVersion: {{ .Values.version }}
       {{- include "kblib.componentMonitor" . | 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/rbac.yaml b/addons-cluster/clickhouse/templates/rbac.yaml
diff --git a/addons-cluster/clickhouse/values.yaml b/addons-cluster/clickhouse/values.yaml
@@ -66,6 +66,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/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: false
   disableExporter: false
diff --git a/addons-cluster/kafka/templates/cluster.yaml b/addons-cluster/kafka/templates/cluster.yaml
@@ -36,7 +36,6 @@ spec:
         name: KubeBlocks
       {{- end }}
       replicas: {{ $.Values.replicas }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       services:
         - name: advertised-listener
         {{- if $.Values.nodePortEnabled }}
@@ -83,7 +82,6 @@ spec:
         name: KubeBlocks
       {{- end }}
       replicas: {{ $.Values.brokerReplicas }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       services:
         - name: advertised-listener
         {{- if $.Values.nodePortEnabled }}
@@ -129,7 +127,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,8 +6,3 @@ disableExporter: true
 
 ## @param terminationPolicy
 terminationPolicy: Delete
-
-## @param rbacEnabled 
-## Specify whether rbac resources will be created by client, 
-## otherwise KubeBlocks server will try to create rbac resources.
-rbacEnabled: false
diff --git a/addons-cluster/mariadb/templates/rbac.yaml b/addons-cluster/mariadb/templates/rbac.yaml
diff --git a/addons-cluster/milvus/templates/cluster.yaml b/addons-cluster/milvus/templates/cluster.yaml
@@ -18,7 +18,6 @@ spec:
         {{- include "milvus.serviceRef.meta" . | indent 8 }}
         {{- include "milvus.serviceRef.log" . | indent 8 }}
         {{- include "milvus.serviceRef.object" . | indent 8 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     {{- end }}
     - name: mixcoord
@@ -28,7 +27,6 @@ spec:
         {{- include "milvus.serviceRef.meta" . | indent 8 }}
         {{- include "milvus.serviceRef.log" . | indent 8 }}
         {{- include "milvus.serviceRef.object" . | indent 8 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     - name: datanode
       replicas: {{ .Values.datanode.replicas}}
@@ -38,7 +36,6 @@ spec:
         {{- include "milvus.serviceRef.meta" . | indent 8 }}
         {{- include "milvus.serviceRef.log" . | indent 8 }}
         {{- include "milvus.serviceRef.object" . | indent 8 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     - name: indexnode
       replicas: {{ .Values.indexnode.replicas}}
@@ -48,7 +45,6 @@ spec:
         {{- include "milvus.serviceRef.meta" . | indent 8 }}
         {{- include "milvus.serviceRef.log" . | indent 8 }}
         {{- include "milvus.serviceRef.object" . | indent 8 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     - name: querynode
       replicas: {{ .Values.querynode.replicas}}
@@ -58,6 +54,5 @@ spec:
         {{- include "milvus.serviceRef.meta" . | indent 8 }}
         {{- include "milvus.serviceRef.log" . | indent 8 }}
         {{- include "milvus.serviceRef.object" . | indent 8 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
 {{- end }}
diff --git a/addons-cluster/milvus/templates/standalone.yaml b/addons-cluster/milvus/templates/standalone.yaml
@@ -17,7 +17,6 @@ spec:
       volumeClaimTemplates:
         {{- include "milvus.vct.data" . | indent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     - name: minio
       replicas: {{ .Values.replicas | default 1 }}
@@ -26,7 +25,6 @@ spec:
       volumeClaimTemplates:
         {{- include "milvus.vct.data" . | indent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
     - name: milvus
       replicas: {{ .Values.replicas | default 1 }}
@@ -35,6 +33,5 @@ spec:
       volumeClaimTemplates:
         {{- include "milvus.vct.data" . | indent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
 {{- end }}
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,7 +31,5 @@ storage: 20
 
 hostnetwork: "enabled"
 
-## @param extra.rbacEnabled if true, create rbac
 extra:
-  rbacEnabled: false
-  terminationPolicy: Delete
+  terminationPolicy: Delete
diff --git a/addons-cluster/mysql/values.yaml b/addons-cluster/mysql/values.yaml
@@ -43,9 +43,7 @@ proxysql:
   cpu: 1
   memory: 1
 
-## @param extra.rbacEnabled if true, create rbac
 extra:
-  rbacEnabled: false
   terminationPolicy: Delete
 
 orchestrator:

diff --git a/addons-cluster/orioledb/templates/cluster.yaml b/addons-cluster/orioledb/templates/cluster.yaml
@@ -8,6 +8,5 @@
         namespace: {{ .Values.etcd.namespace | default "default" }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
       {{- include "orioledb-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
diff --git a/addons-cluster/orioledb/templates/rbac.yaml b/addons-cluster/orioledb/templates/rbac.yaml
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: false
diff --git a/addons-cluster/rabbitmq/templates/cluster.yaml b/addons-cluster/rabbitmq/templates/cluster.yaml
@@ -11,6 +11,5 @@ spec:
       componentDef: rabbitmq
       serviceVersion: {{ .Values.version }}
       {{- include "rabbitmq-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
diff --git a/addons-cluster/rabbitmq/templates/rbac.yaml b/addons-cluster/rabbitmq/templates/rbac.yaml
diff --git a/addons-cluster/rabbitmq/values.yaml b/addons-cluster/rabbitmq/values.yaml
@@ -30,5 +30,4 @@ requests:
 storage: 20
 
 extra:
-  rbacEnabled: false
   terminationPolicy: Delete
diff --git a/addons-cluster/redis/templates/_helpers.tpl b/addons-cluster/redis/templates/_helpers.tpl
@@ -56,7 +56,6 @@ Define redis ComponentSpec with ComponentDefinition.
   env:
   - name: CUSTOM_SENTINEL_MASTER_NAME
     value: {{ .Values.sentinel.customMasterName | default "" }}
-  serviceAccountName: {{ include "kblib.serviceAccountName" . }}
   {{- include "kblib.componentResources" . | indent 2 }}
   {{- include "kblib.componentStorages" . | indent 2 }}
 {{- end }}
@@ -73,7 +72,6 @@ Define redis sentinel ComponentSpec with ComponentDefinition.
     serviceType: NodePort
     podService: true
   {{- end }}
-  serviceAccountName: {{ include "kblib.serviceAccountName" . }}
   resources:
     limits:
       cpu: {{ .Values.sentinel.cpu | quote }}
@@ -96,7 +94,6 @@ Define redis twemproxy ComponentSpec with ComponentDefinition.
 */}}
 {{- define "redis-cluster.twemproxyComponentSpec" }}
 - name: redis-twemproxy
-  serviceAccountName: {{ include "kblib.serviceAccountName" . }}
   replicas: {{ .Values.twemproxy.replicas }}
   resources:
     limits:

diff --git a/addons-cluster/redis/templates/rbac.yaml b/addons-cluster/redis/templates/rbac.yaml
diff --git a/addons-cluster/redis/values.yaml b/addons-cluster/redis/values.yaml
@@ -70,7 +70,6 @@ redisCluster:
   shardCount: 3
 
 extra:
-  rbacEnabled: false
 
 prometheus:
   enabled: false