feat:add namespace for kubeblocks pika cluster helm chart (OpenAtomFo…

…undation#2480) * add kubeblock component post start demo * convert pika kubeblocks helm chart to new component definition api (cherry picked from commit 60535d6) * modify cluster yaml * remove dirty code * refine pika cluster yaml * add PIKA_CODIS_DASHBOARD_SVC_NAME var reference * add namespace for kubeblocks pika cluster helm chart * add namespace for sa and rolebinding
chengyu-l · Mar 13, 2024 · 28b2057 · 28b2057
1 parent 2ef4658
commit 28b2057
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git a/tools/kubeblocks_helm/pika-cluster/templates/cluster.yaml b/tools/kubeblocks_helm/pika-cluster/templates/cluster.yaml
@@ -2,6 +2,7 @@ apiVersion: apps.kubeblocks.io/v1alpha1
 kind: Cluster
 metadata:
   name: {{ include "clustername" . }}
+  namespace: {{ .Release.Namespace }}
   labels: {{ include "pika-cluster.labels" . | nindent 4 }}
 spec:
   clusterDefinitionRef: pika  # ref clusterDefinition.name

diff --git a/tools/kubeblocks_helm/pika-cluster/templates/rolebinding.yaml b/tools/kubeblocks_helm/pika-cluster/templates/rolebinding.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: kb-{{ include "clustername" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{ include "pika-cluster.labels" . | nindent 4 }}
 roleRef:

diff --git a/tools/kubeblocks_helm/pika-cluster/templates/serviceaccount.yaml b/tools/kubeblocks_helm/pika-cluster/templates/serviceaccount.yaml
@@ -2,5 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "pika-cluster.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{ include "pika-cluster.labels" . | nindent 4 }}
diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-dashboard.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-dashboard.yaml
@@ -21,6 +21,7 @@ spec:
   configs:
     - name: codis-dashboard-config
       templateRef: pika-conf-template
+      namespace: {{ .Release.Namespace }}
       volumeName: config
   runtime:
     initContainers:

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-proxy.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-proxy.yaml
@@ -24,6 +24,7 @@ spec:
   configs:
     - name: codis-proxy-config
       templateRef: pika-conf-template
+      namespace: {{ .Release.Namespace }}
       volumeName: config
   runtime:
     initContainers:

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-group.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-group.yaml
@@ -21,10 +21,12 @@ spec:
   configs:
     - name: pika-config
       templateRef: pika-conf-template
+      namespace: {{ .Release.Namespace }}
       volumeName: config
   scripts:
     - name: pika-script
       templateRef: pika-script-template
+      namespace: {{ .Release.Namespace }}
       volumeName: script
       defaultMode: 0555
   lifecycleActions: