fix: no syncer policy rules (#1438)

apecloud · Jan 24, 2025 · d5f2bc4 · d5f2bc4
1 parent 46865de
commit d5f2bc4
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 -}}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: