refine pika cluster yaml

Y-Rookie · Feb 21, 2024 · 238d46e · 238d46e
1 parent 78c2c6e
commit 238d46e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/tools/kubeblocks_helm/pika-cluster/templates/_helpers.tpl b/tools/kubeblocks_helm/pika-cluster/templates/_helpers.tpl
@@ -59,38 +59,4 @@ Create the name of the service account to use
 */}}
 {{- define "pika-cluster.serviceAccountName" -}}
 {{- default (printf "kb-%s" (include "clustername" .)) .Values.serviceAccount.name }}
-{{- end }}
-
-{{/*
-Define pika group with shardingSpec
-*/}}
-{{- define "pika-group.shardingSpec" }}
-- name: group
-  shards: {{ .Values.groupCount }}
-  template:
-    name: pika
-    componentDef: pika-group
-    replicas: {{ add (int $.Values.slaveCount) 1 | default 2 }}
-    {{- with  $.Values.resources.pikaGroup }}
-    resources:
-      limits:
-        cpu: {{ .limits.cpu | quote }}
-        memory: {{ .limits.memory | quote }}
-      requests:
-        cpu: {{ .requests.cpu | quote }}
-        memory: {{ .requests.memory | quote }}
-    {{- end }}
-    {{- if $.Values.persistence.enabled }}
-    volumeClaimTemplates:
-      {{- with  $.Values.persistence.pikaData }}
-      - name: data
-        spec:
-          storageClassName: {{ .storageClassName }}
-          accessModes:
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: {{ .size }}
-      {{- end }}
-    {{- end }}
 {{- end }}
diff --git a/tools/kubeblocks_helm/pika-cluster/templates/cluster.yaml b/tools/kubeblocks_helm/pika-cluster/templates/cluster.yaml
@@ -14,9 +14,37 @@ spec:
   {{- with $.Values.tolerations }}
   tolerations: {{ . | toYaml | nindent 4 }}
   {{- end }}
+  ## define pika group with shardingSpecs API which is supported in KubeBlocks v0.8.2
   {{- if not .Values.useLegacyCompDef }}
   shardingSpecs:
-  {{- include "pika-group.shardingSpec" . | indent 6 }}
+  - name: group
+    shards: {{ .Values.groupCount }}
+    template:
+      name: pika
+      componentDef: pika-group
+      replicas: {{ add (int $.Values.slaveCount) 1 | default 2 }}
+      {{- with  $.Values.resources.pikaGroup }}
+      resources:
+        limits:
+          cpu: {{ .limits.cpu | quote }}
+          memory: {{ .limits.memory | quote }}
+        requests:
+          cpu: {{ .requests.cpu | quote }}
+          memory: {{ .requests.memory | quote }}
+      {{- end }}
+      {{- if $.Values.persistence.enabled }}
+      volumeClaimTemplates:
+        {{- with  $.Values.persistence.pikaData }}
+        - name: data
+          spec:
+            storageClassName: {{ .storageClassName }}
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: {{ .size }}
+        {{- end }}
+      {{- end }}
   {{- end }}
   componentSpecs:
     {{- if .Values.useLegacyCompDef }}