Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: disable manual rbac by default #1197

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

chore: disable manual rbac by default #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76acef1
chore: disable manual rbac
cjc7373 Nov 14, 2024
3b09a29
patroni's policy rules
cjc7373 Nov 14, 2024
d8060b7
remove manually managed rbac
cjc7373 Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons-cluster/apecloud-mysql/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/apecloud-mysql/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ proxy:
## customized default values to override kblib chart's values
extra:
disableExporter: true
rbacEnabled: true
terminationPolicy: Delete

## metrics sidecars
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/apecloud-postgresql/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ spec:
componentDef: apecloud-postgresql14
{{- include "kblib.componentMonitor" . | indent 6 }}
replicas: {{ include "apecloud-postgresql-cluster.replicas" . }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
1 change: 0 additions & 1 deletion addons-cluster/apecloud-postgresql/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/clickhouse/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions addons-cluster/clickhouse/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion addons-cluster/elasticsearch/templates/cluster-multi-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/elasticsearch/templates/cluster-single-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/elasticsearch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ fullnameOverride: ""
## customized default values to override kblib chart's values
extra:
terminationPolicy: Delete
rbacEnabled: true
disableExporter: false
3 changes: 0 additions & 3 deletions addons-cluster/kafka/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ spec:
name: KubeBlocks
{{- end }}
replicas: {{ $.Values.replicas }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
services:
- name: advertised-listener
{{- if $.Values.nodePortEnabled }}
Expand Down Expand Up @@ -82,7 +81,6 @@ spec:
name: KubeBlocks
{{- end }}
replicas: {{ $.Values.brokerReplicas }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
services:
- name: advertised-listener
{{- if $.Values.nodePortEnabled }}
Expand Down Expand Up @@ -128,7 +126,6 @@ spec:
name: KubeBlocks
{{- end }}
replicas: {{ $.Values.controllerReplicas }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentResources" . | indent 6 }}
{{- if $.Values.storageEnable }}
volumeClaimTemplates:
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/kafka/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions addons-cluster/kblib/templates/_rbac.tpl
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions addons-cluster/kblib/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
4 changes: 0 additions & 4 deletions addons-cluster/kblib/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ disableExporter: true

## @param terminationPolicy
terminationPolicy: Delete

## @param rbacEnabled if true, rbac resources will be created
##
rbacEnabled: false
1 change: 0 additions & 1 deletion addons-cluster/mariadb/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ spec:
- name: mariadb
componentDef: mariadb
replicas: {{ include "mariadb-cluster.replicas" . }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentResources" . | indent 6 }}
1 change: 0 additions & 1 deletion addons-cluster/mariadb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions addons-cluster/milvus/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}
Expand All @@ -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}}
Expand All @@ -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}}
Expand All @@ -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 }}
3 changes: 0 additions & 3 deletions addons-cluster/milvus/templates/standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -35,6 +33,5 @@ spec:
volumeClaimTemplates:
{{- include "milvus.vct.data" . | indent 8 }}
{{- end }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentMonitor" . | indent 6 }}
{{- end }}
1 change: 0 additions & 1 deletion addons-cluster/minio/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 0 additions & 1 deletion addons-cluster/mogdb/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
29 changes: 0 additions & 29 deletions addons-cluster/mogdb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/mongodb/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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 }}
1 change: 0 additions & 1 deletion addons-cluster/mongodb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions addons-cluster/mongodb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,5 @@ storage: 20

hostnetwork: "enabled"

## @param extra.rbacEnabled if true, create rbac
extra:
rbacEnabled: true
terminationPolicy: Delete
terminationPolicy: Delete
2 changes: 0 additions & 2 deletions addons-cluster/mysql/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ proxysql:
cpu: 1
memory: 1

## @param extra.rbacEnabled if true, create rbac
extra:
rbacEnabled: true
terminationPolicy: Delete

orchestrator:
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/official-postgresql/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
componentDefRef: postgresql
{{- include "kblib.componentMonitor" . | indent 6 }}
{{- include "official-postgresql-cluster.replicaCount" . | indent 6 }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentResources" . | indent 6 }}
{{- include "kblib.componentStorages" . | indent 6 }}
1 change: 0 additions & 1 deletion addons-cluster/official-postgresql/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/orioledb/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 0 additions & 1 deletion addons-cluster/orioledb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/qdrant/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/qdrant/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/qdrant/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ storage: 20
## customized default values to override kblib chart's values
extra:
terminationPolicy: Delete
rbacEnabled: true
1 change: 0 additions & 1 deletion addons-cluster/rabbitmq/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 0 additions & 1 deletion addons-cluster/rabbitmq/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion addons-cluster/rabbitmq/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ requests:
storage: 20

extra:
rbacEnabled: true
3 changes: 0 additions & 3 deletions addons-cluster/redis/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Define redis ComponentSpec with ComponentDefinition.
serviceType: NodePort
podService: true
{{- end }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentResources" . | indent 2 }}
{{- include "kblib.componentStorages" . | indent 2 }}
{{- end }}
Expand All @@ -70,7 +69,6 @@ Define redis sentinel ComponentSpec with ComponentDefinition.
serviceType: NodePort
podService: true
{{- end }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
resources:
limits:
cpu: {{ .Values.sentinel.cpu | quote }}
Expand All @@ -93,7 +91,6 @@ Define redis twemproxy ComponentSpec with ComponentDefinition.
*/}}
{{- define "redis-cluster.twemproxyComponentSpec" }}
- name: redis-twemproxy
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
replicas: {{ .Values.twemproxy.replicas }}
resources:
limits:
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/redis/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

Loading