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

chore: remove rbac related definition #1197

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+163 −324
Open

chore: remove rbac related definition #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f28db1
patroni's policy rules
cjc7373 Nov 14, 2024
e9b7c41
chore: remove manually managed rbac
cjc7373 Nov 14, 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-postgresql/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
1 change: 0 additions & 1 deletion addons-cluster/apecloud-postgresql/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions addons-cluster/clickhouse/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
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 @@ -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
7 changes: 0 additions & 7 deletions addons-cluster/elasticsearch/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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
7 changes: 0 additions & 7 deletions addons-cluster/kafka/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
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 @@ -21,7 +21,6 @@ spec:
name: KubeBlocks
{{- end }}
replicas: {{ .Values.replicas }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
services:
- name: advertised-listener
{{- if .Values.nodePortEnabled }}
Expand Down Expand Up @@ -71,7 +70,6 @@ spec:
name: KubeBlocks
{{- end }}
replicas: {{ .Values.brokerReplicas }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
services:
- name: advertised-listener
{{- if .Values.nodePortEnabled }}
Expand Down Expand Up @@ -120,7 +118,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
11 changes: 0 additions & 11 deletions addons-cluster/loki/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
1 change: 0 additions & 1 deletion addons-cluster/mariadb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

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 @@ -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 }}
1 change: 0 additions & 1 deletion addons-cluster/mongodb/templates/rbac.yaml
View file
Open in desktop

This file was deleted.

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

hostnetwork: "enabled"

## @param extra.rbacEnabled if true, create rbac
extra:
terminationPolicy: Delete
terminationPolicy: Delete
1 change: 0 additions & 1 deletion addons-cluster/mysql/values.yaml
View file
Open in desktop
Original file line number Diff 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
7 changes: 0 additions & 7 deletions addons-cluster/opensearch/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
11 changes: 0 additions & 11 deletions addons-cluster/polardbx/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
8 changes: 0 additions & 8 deletions addons-cluster/pulsar/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
7 changes: 0 additions & 7 deletions addons-cluster/qdrant/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
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
Loading
Loading