From d5f2bc449401849d7643bd3b4f7dbfe1bebe6572 Mon Sep 17 00:00:00 2001 From: wangyelei Date: Fri, 24 Jan 2025 11:52:23 +0800 Subject: [PATCH] fix: no syncer policy rules (#1438) --- addons/apecloud-mysql/Chart.yaml | 7 ++++ .../templates/cmpd-apecloudmysql.yaml | 1 + addons/apecloud-postgresql/Chart.yaml | 7 ++++ .../templates/cmpd-apepg.yaml | 1 + addons/kblib/templates/_common.tpl | 33 +++++++++++++++++++ addons/mongodb/Chart.yaml | 6 ++++ .../templates/componentdefinition.yaml | 1 + addons/mysql/Chart.yaml | 5 +++ addons/mysql/templates/cmpd-mysql57-orc.yaml | 1 + addons/mysql/templates/cmpd-mysql57.yaml | 1 + addons/mysql/templates/cmpd-mysql80-mgr.yaml | 1 + addons/mysql/templates/cmpd-mysql80-orc.yaml | 1 + addons/mysql/templates/cmpd-mysql80.yaml | 1 + addons/mysql/templates/cmpd-mysql84-mgr.yaml | 1 + addons/mysql/templates/cmpd-mysql84.yaml | 1 + .../vanilla-postgresql/templates/cmpd-12.yaml | 1 + .../vanilla-postgresql/templates/cmpd-14.yaml | 1 + .../vanilla-postgresql/templates/cmpd-15.yaml | 2 ++ 18 files changed, 72 insertions(+) create mode 100644 addons/kblib/templates/_common.tpl diff --git a/addons/apecloud-mysql/Chart.yaml b/addons/apecloud-mysql/Chart.yaml index e84eecd4d..fa89e192e 100644 --- a/addons/apecloud-mysql/Chart.yaml +++ b/addons/apecloud-mysql/Chart.yaml @@ -23,6 +23,13 @@ maintainers: sources: - https://github.com/apecloud/kubeblocks/ + +dependencies: + - name: kblib + version: 0.1.0 + repository: file://../kblib + alias: extra + annotations: addon.kubeblocks.io/kubeblocks-version: ">=1.0.0" addon.kubeblocks.io/model: "RDBMS" diff --git a/addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml b/addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml index 5f609b2bc..8abe398b6 100644 --- a/addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml +++ b/addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml @@ -21,6 +21,7 @@ spec: constraintRef: {{ include "apecloud-mysql.configConstraintVttabletName" . }} volumeName: mysql-scale-config namespace: {{ .Release.Namespace }} + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - command: diff --git a/addons/apecloud-postgresql/Chart.yaml b/addons/apecloud-postgresql/Chart.yaml index f2bf8c828..51f06c102 100644 --- a/addons/apecloud-postgresql/Chart.yaml +++ b/addons/apecloud-postgresql/Chart.yaml @@ -22,6 +22,13 @@ maintainers: sources: - https://github.com/apecloud/kubeblocks/ + +dependencies: + - name: kblib + version: 0.1.0 + repository: file://../kblib + alias: extra + annotations: addon.kubeblocks.io/kubeblocks-version: ">=1.0.0" addon.kubeblocks.io/model: "RDBMS" diff --git a/addons/apecloud-postgresql/templates/cmpd-apepg.yaml b/addons/apecloud-postgresql/templates/cmpd-apepg.yaml index 02c28157a..3c42cef51 100644 --- a/addons/apecloud-postgresql/templates/cmpd-apepg.yaml +++ b/addons/apecloud-postgresql/templates/cmpd-apepg.yaml @@ -24,4 +24,5 @@ spec: namespace: {{ .Release.Namespace }} volumeName: scripts defaultMode: 0555 + {{- include "kblib.syncer.policyRules" . | nindent 2 }} {{- include "apecloud-postgresql.spec.runtime.common" . | nindent 2 }} diff --git a/addons/kblib/templates/_common.tpl b/addons/kblib/templates/_common.tpl new file mode 100644 index 000000000..269c2be3d --- /dev/null +++ b/addons/kblib/templates/_common.tpl @@ -0,0 +1,33 @@ +{{- define "kblib.syncer.policyRules" -}} +policyRules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - create + - get + - list + - patch + - update +- apiGroups: + - "" + resources: + - pods + verbs: + - get + - list +- apiGroups: + - "" + resources: + - events + verbs: + - create +- apiGroups: + - "apps.kubeblocks.io" + resources: + - clusters + verbs: + - get + - list +{{- end -}} \ No newline at end of file diff --git a/addons/mongodb/Chart.yaml b/addons/mongodb/Chart.yaml index 4564ce6e8..8874ff957 100644 --- a/addons/mongodb/Chart.yaml +++ b/addons/mongodb/Chart.yaml @@ -22,6 +22,12 @@ maintainers: - name: xuriwuyun url: https://github.com/apecloud/kubeblocks/ +dependencies: + - name: kblib + version: 0.1.0 + repository: file://../kblib + alias: extra + annotations: addon.kubeblocks.io/kubeblocks-version: ">=1.0.0" addon.kubeblocks.io/model: "document" diff --git a/addons/mongodb/templates/componentdefinition.yaml b/addons/mongodb/templates/componentdefinition.yaml index 86aa27006..90703d325 100644 --- a/addons/mongodb/templates/componentdefinition.yaml +++ b/addons/mongodb/templates/componentdefinition.yaml @@ -69,6 +69,7 @@ spec: - name: secondary updatePriority: 1 participatesInQuorum: true + {{- include "kblib.syncer.policyRules" . | nindent 2 }} lifecycleActions: roleProbe: periodSeconds: {{ .Values.roleProbe.periodSeconds }} diff --git a/addons/mysql/Chart.yaml b/addons/mysql/Chart.yaml index 8a206c4eb..8023f2929 100644 --- a/addons/mysql/Chart.yaml +++ b/addons/mysql/Chart.yaml @@ -16,6 +16,11 @@ appVersion: "5.7.44" home: https://kubeblocks.io/ icon: https://kubeblocks.io/img/logo.png +dependencies: + - name: kblib + version: 0.1.0 + repository: file://../kblib + alias: extra maintainers: - name: xuriwuyun diff --git a/addons/mysql/templates/cmpd-mysql57-orc.yaml b/addons/mysql/templates/cmpd-mysql57-orc.yaml index 7e0fd0ce2..6a4e88b58 100644 --- a/addons/mysql/templates/cmpd-mysql57-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql57-orc.yaml @@ -35,6 +35,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - image: {{ .Values.image.registry | default "docker.io" }}/apecloud/mysql_audit_log:5.7.44 diff --git a/addons/mysql/templates/cmpd-mysql57.yaml b/addons/mysql/templates/cmpd-mysql57.yaml index dc3df780d..36517125f 100644 --- a/addons/mysql/templates/cmpd-mysql57.yaml +++ b/addons/mysql/templates/cmpd-mysql57.yaml @@ -17,6 +17,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - image: {{ .Values.image.registry | default "docker.io" }}/apecloud/mysql_audit_log:5.7.44 diff --git a/addons/mysql/templates/cmpd-mysql80-mgr.yaml b/addons/mysql/templates/cmpd-mysql80-mgr.yaml index 69d45a3d8..7514893f4 100644 --- a/addons/mysql/templates/cmpd-mysql80-mgr.yaml +++ b/addons/mysql/templates/cmpd-mysql80-mgr.yaml @@ -17,6 +17,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - image: {{ .Values.image.registry | default "docker.io" }}/apecloud/mysql_audit_log:8.0.33 diff --git a/addons/mysql/templates/cmpd-mysql80-orc.yaml b/addons/mysql/templates/cmpd-mysql80-orc.yaml index 192f4ce6f..0562ea550 100644 --- a/addons/mysql/templates/cmpd-mysql80-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql80-orc.yaml @@ -35,6 +35,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - image: {{ .Values.image.registry | default "docker.io" }}/apecloud/mysql_audit_log:8.0.33 diff --git a/addons/mysql/templates/cmpd-mysql80.yaml b/addons/mysql/templates/cmpd-mysql80.yaml index 959422b0d..9c4a81b90 100644 --- a/addons/mysql/templates/cmpd-mysql80.yaml +++ b/addons/mysql/templates/cmpd-mysql80.yaml @@ -17,6 +17,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - image: {{ .Values.image.registry | default "docker.io" }}/apecloud/mysql_audit_log:8.0.33 diff --git a/addons/mysql/templates/cmpd-mysql84-mgr.yaml b/addons/mysql/templates/cmpd-mysql84-mgr.yaml index 152bf6814..524d969c3 100644 --- a/addons/mysql/templates/cmpd-mysql84-mgr.yaml +++ b/addons/mysql/templates/cmpd-mysql84-mgr.yaml @@ -17,6 +17,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - command: diff --git a/addons/mysql/templates/cmpd-mysql84.yaml b/addons/mysql/templates/cmpd-mysql84.yaml index f535347c3..f713e7cd1 100644 --- a/addons/mysql/templates/cmpd-mysql84.yaml +++ b/addons/mysql/templates/cmpd-mysql84.yaml @@ -17,6 +17,7 @@ spec: namespace: {{ .Release.Namespace }} reRenderResourceTypes: - vscale + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: initContainers: - command: diff --git a/addons/vanilla-postgresql/templates/cmpd-12.yaml b/addons/vanilla-postgresql/templates/cmpd-12.yaml index 26213fc85..c1c0551a2 100644 --- a/addons/vanilla-postgresql/templates/cmpd-12.yaml +++ b/addons/vanilla-postgresql/templates/cmpd-12.yaml @@ -24,6 +24,7 @@ spec: namespace: {{ .Release.Namespace }} volumeName: scripts defaultMode: 0555 + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }} containers: diff --git a/addons/vanilla-postgresql/templates/cmpd-14.yaml b/addons/vanilla-postgresql/templates/cmpd-14.yaml index 866567cb5..8922db06c 100644 --- a/addons/vanilla-postgresql/templates/cmpd-14.yaml +++ b/addons/vanilla-postgresql/templates/cmpd-14.yaml @@ -24,6 +24,7 @@ spec: namespace: {{ .Release.Namespace }} volumeName: scripts defaultMode: 0555 + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }} containers: diff --git a/addons/vanilla-postgresql/templates/cmpd-15.yaml b/addons/vanilla-postgresql/templates/cmpd-15.yaml index 212aba7a6..4eed926ba 100644 --- a/addons/vanilla-postgresql/templates/cmpd-15.yaml +++ b/addons/vanilla-postgresql/templates/cmpd-15.yaml @@ -24,6 +24,7 @@ spec: namespace: {{ .Release.Namespace }} volumeName: scripts defaultMode: 0555 + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }} containers: @@ -57,6 +58,7 @@ spec: namespace: {{ .Release.Namespace }} volumeName: scripts defaultMode: 0555 + {{- include "kblib.syncer.policyRules" . | nindent 2 }} runtime: {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }} containers: