diff --git a/addons-cluster/apecloud-mysql/templates/rbac.yaml b/addons-cluster/apecloud-mysql/templates/rbac.yaml deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/apecloud-mysql/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/apecloud-mysql/values.yaml b/addons-cluster/apecloud-mysql/values.yaml index d7589bbca..629feeaa0 100644 --- 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 index 3c3b16a7a..d3af202a0 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/apecloud-postgresql/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/clickhouse/templates/rbac.yaml b/addons-cluster/clickhouse/templates/rbac.yaml deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/clickhouse/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/clickhouse/values.yaml b/addons-cluster/clickhouse/values.yaml index 2148c32f7..a6af9c31d 100644 --- 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 \ No newline at end of file diff --git a/addons-cluster/elasticsearch/templates/cluster-multi-node.yaml b/addons-cluster/elasticsearch/templates/cluster-multi-node.yaml index a7c705307..660a72dca 100644 --- 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 index 5ec9e7dbb..60f0a2386 100644 --- 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 index cbcc448a4..0f90e062c 100644 --- 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 index 3250905fa..0c7109752 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/kafka/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/kblib/templates/_rbac.tpl b/addons-cluster/kblib/templates/_rbac.tpl deleted file mode 100644 index 3ccd11f08..000000000 --- a/addons-cluster/kblib/templates/_rbac.tpl +++ /dev/null @@ -1,71 +0,0 @@ -{{/* -Define the service account name -*/}} -{{- define "kblib.serviceAccountName" -}} -{{- if .Values.extra.rbacEnabled }} -{{- printf "kb-%s" (include "kblib.clusterName" .) }} -{{- else }} -{{- "" }} -{{- end }} -{{- end }} - -{{/* -Define the role name -*/}} -{{- define "kblib.roleName" -}} -{{- printf "kb-%s" (include "kblib.clusterName" .) }} -{{- end }} - -{{/* -Define the rolebinding name -*/}} -{{- define "kblib.roleBindingName" -}} -{{- printf "kb-%s" (include "kblib.clusterName" .) }} -{{- end }} - -{{/* -Define the service account -*/}} -{{- define "kblib.serviceAccount" }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "kblib.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kblib.clusterLabels" . | nindent 4 }} -{{- end }} - -{{/* -Define the rolebinding -*/}} -{{- define "kblib.roleBinding" }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: {{ include "kblib.roleBindingName" . }} - labels: - {{- include "kblib.clusterLabels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kubeblocks-cluster-pod-role -subjects: - - kind: ServiceAccount - name: {{ include "kblib.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end }} - -{{/* -Define the whole rbac -*/}} -{{- define "kblib.rbac" }} -{{- if .Values.extra.rbacEnabled }} ---- -{{- include "kblib.serviceAccount" . }} ---- -{{- include "kblib.roleBinding" . }} -{{- else }} -{{- "" }} -{{- end }} -{{- end }} diff --git a/addons-cluster/kblib/values.schema.json b/addons-cluster/kblib/values.schema.json index 3392eb618..1fa11e787 100644 --- 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 index 80cf59b34..29463dd30 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/mariadb/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/milvus/templates/cluster.yaml b/addons-cluster/milvus/templates/cluster.yaml index e74f25ed5..fa9744ac8 100644 --- 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 index bacce8e6e..ca984ee8f 100644 --- 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 index 450260a6b..da6cbd18f 100644 --- 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 index 480ed8408..facb8eb93 100644 --- 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 deleted file mode 100644 index 36fef80f1..000000000 --- a/addons-cluster/mogdb/templates/rbac.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- include "kblib.rbac" . }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: {{ printf "%s-switchover-role" (include "kblib.clusterName" .) }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kblib.clusterLabels" . | nindent 4 }} - app.kubernetes.io/required-by: pod -rules: - - apiGroups: [""] - resources: ["pods/exec"] - verbs: ["create"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: {{ printf "%s-switchover" (include "kblib.clusterName" .) }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kblib.clusterLabels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: {{ printf "%s-switchover-role" (include "kblib.clusterName" .) }} -subjects: - - kind: ServiceAccount - name: {{ printf "kb-%s" (include "kblib.clusterName" .) }} \ No newline at end of file diff --git a/addons-cluster/mongodb/templates/cluster.yaml b/addons-cluster/mongodb/templates/cluster.yaml index 4f8892e90..6993370fa 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/mongodb/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/mongodb/values.yaml b/addons-cluster/mongodb/values.yaml index fc8dd7046..1e8657041 100644 --- 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 \ No newline at end of file + terminationPolicy: Delete diff --git a/addons-cluster/mysql/values.yaml b/addons-cluster/mysql/values.yaml index 45528d8ee..8cb841a4e 100644 --- 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 index f1d0bc327..0043e5eb2 100644 --- 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 }} \ No newline at end of file diff --git a/addons-cluster/orioledb/templates/rbac.yaml b/addons-cluster/orioledb/templates/rbac.yaml deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/orioledb/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/qdrant/templates/cluster.yaml b/addons-cluster/qdrant/templates/cluster.yaml index c74a5573b..45a21be3f 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/qdrant/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/qdrant/values.yaml b/addons-cluster/qdrant/values.yaml index 7769bd7b6..352ae2914 100644 --- 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 index 61bca4c81..f97a5a04b 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/rabbitmq/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/rabbitmq/values.yaml b/addons-cluster/rabbitmq/values.yaml index e8371fc3b..e10961cec 100644 --- 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 index 3a47e89a8..30cfc4608 100644 --- 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 deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/redis/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/redis/values.yaml b/addons-cluster/redis/values.yaml index 9c256decd..5cacd4dfc 100644 --- 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 diff --git a/addons-cluster/starrocks-ce/templates/cluster.yaml b/addons-cluster/starrocks-ce/templates/cluster.yaml index f3e846777..4721a5c54 100644 --- a/addons-cluster/starrocks-ce/templates/cluster.yaml +++ b/addons-cluster/starrocks-ce/templates/cluster.yaml @@ -12,14 +12,12 @@ spec: - name: fe componentDef: starrocks-ce-fe {{- include "kblib.componentMonitor" . | indent 6 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} serviceVersion: {{ include "starrocks.version" . }} replicas: {{ .Values.replicas | default 1 }} {{- include "kblib.componentResources" . | indent 6 }} {{- include "kblib.componentStorages" . | indent 6 }} - name: be componentDef: starrocks-ce-be - serviceAccountName: {{ include "kblib.serviceAccountName" . }} serviceVersion: {{ include "starrocks.version" . }} replicas: {{ index .Values.beReplicas | default 1 }} resources: diff --git a/addons-cluster/tdengine/templates/cluster.yaml b/addons-cluster/tdengine/templates/cluster.yaml index e8b6ce6fa..f6ae40b76 100644 --- a/addons-cluster/tdengine/templates/cluster.yaml +++ b/addons-cluster/tdengine/templates/cluster.yaml @@ -11,6 +11,5 @@ spec: componentDef: tdengine {{- include "kblib.componentMonitor" . | indent 6 }} {{- include "tdengine-cluster.replicaCount" . | indent 6 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentResources" . | indent 6 }} {{- include "kblib.componentStorages" . | indent 6 }} diff --git a/addons-cluster/tdengine/templates/rbac.yaml b/addons-cluster/tdengine/templates/rbac.yaml deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/tdengine/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/tidb/templates/rbac.yaml b/addons-cluster/tidb/templates/rbac.yaml deleted file mode 100644 index fee43950f..000000000 --- a/addons-cluster/tidb/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} diff --git a/addons-cluster/tidb/values.yaml b/addons-cluster/tidb/values.yaml index 356facb17..c9ebe8519 100644 --- a/addons-cluster/tidb/values.yaml +++ b/addons-cluster/tidb/values.yaml @@ -57,4 +57,3 @@ serviceAccount: name: "" extra: - rbacEnabled: false diff --git a/addons-cluster/vanilla-postgresql/templates/rbac.yaml b/addons-cluster/vanilla-postgresql/templates/rbac.yaml deleted file mode 100644 index 08875e8bf..000000000 --- a/addons-cluster/vanilla-postgresql/templates/rbac.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "kblib.rbac" . }} \ No newline at end of file diff --git a/addons-cluster/zookeeper/templates/cluster.yaml b/addons-cluster/zookeeper/templates/cluster.yaml index 01ad5742e..1d98be092 100644 --- a/addons-cluster/zookeeper/templates/cluster.yaml +++ b/addons-cluster/zookeeper/templates/cluster.yaml @@ -12,7 +12,6 @@ spec: ## TODO: use regex pattern when cluster validation supported componentDef: zookeeper replicas: {{ .Values.replicas }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} serviceVersion: {{ .Values.version }} {{- include "kblib.componentMonitor" . | indent 6 }} {{- include "kblib.componentResources" . | indent 6 }}