apecloud · shanshanying · Jul 21, 2025 · Jul 21, 2025 · Jul 21, 2025 · Jul 21, 2025
@@ -121,3 +121,8 @@ SHELLSPEC_INCLUDE_PATH := $(shell ./utils/get_shellspec_include_path.sh)
 .PHONY: scripts-test-kcov
 scripts-test-kcov: install-shellspec ##    Run shellspec unit test cases.
 	@shellspec --load-path $(SHELLSPEC_LOAD_PATH) --default-path $(SHELLSPEC_DEFAULT_PATH) --shell $(SHELLSPEC_DEFAULT_SHELL) --kcov --kcov-options "--include-path=$(SHELLSPEC_INCLUDE_PATH) --path-strip-level=1"
+
+CHART_FOLDER ?=
+.PHONY: test-charts
+test-charts: ##    Run helm template tests for all charts.
+	@./hack/test-charts.sh $(CHART_FOLDER)
@@ -115,7 +115,7 @@ raftGroup mode: max(replicas, 3)
           - ReadWriteOnce
         resources:
           requests:
-            storage: {{ .Values.etcd.local.resources.storage }}
+            storage: {{ print .Values.etcd.local.resources.storage "Gi" }}
 {{- end -}}
 
 {{- define "apecloud-mysql-cluster.schedulingPolicy" }}

@@ -0,0 +1 @@
+cpu: 0.6
@@ -0,0 +1 @@
+cpu: 65
@@ -0,0 +1 @@
+cpu: 0.1
@@ -0,0 +1,4 @@
+mode: raftGroup
+proxyEnabled: true
+etcd:
+  mode: invalid
@@ -0,0 +1,6 @@
+mode: raftGroup
+proxyEnabled: true
+etcd:
+  mode: local
+  local:
+    replicas: 4
@@ -0,0 +1,6 @@
+mode: raftGroup
+proxyEnabled: true
+etcd:
+  mode: local
+  local:
+    replicas: 0
@@ -0,0 +1 @@
+mode: invalid-mode
@@ -0,0 +1 @@
+memory: 1001
@@ -0,0 +1 @@
+memory: 0.1
@@ -0,0 +1,2 @@
+mode: raftGroup
+replicas: 7
@@ -0,0 +1,2 @@
+mode: raftGroup
+replicas: 0
@@ -0,0 +1 @@
+storage: 10001
@@ -0,0 +1 @@
+storage: 0.5
@@ -0,0 +1 @@
+# Test default values (mode: standalone)
@@ -0,0 +1,6 @@
+mode: raftGroup
+proxyEnabled: true
+etcd:
+  mode: local
+  local:
+    replicas: 3
@@ -0,0 +1,6 @@
+mode: raftGroup
+proxyEnabled: true
+etcd:
+  mode: local
+  local:
+    replicas: 1
@@ -0,0 +1,4 @@
+replicas: 5
+cpu: 64
+memory: 1000
+storage: 10000
@@ -0,0 +1,4 @@
+replicas: 1
+cpu: 0.5
+memory: 0.5
+storage: 1
@@ -0,0 +1,8 @@
+mode: raftGroup
+replicas: 3
+proxyEnabled: true
+etcd:
+  mode: serviceRef
+  serviceRef:
+    cluster:
+      name: my-etcd
@@ -0,0 +1,3 @@
+mode: raftGroup
+replicas: 3
+proxyEnabled: true
@@ -0,0 +1,2 @@
+mode: raftGroup
+replicas: 3
@@ -0,0 +1,2 @@
+mode: raftGroup
+replicas: 5
@@ -0,0 +1,16 @@
+cpu: 2
+memory: 4
+
+asserts:
+  - equal:
+      path: ".spec.componentSpecs[0].resources.limits.cpu"
+      value: "2"
+  - equal:
+      path: ".spec.componentSpecs[0].resources.limits.memory"
+      value: "4Gi"
+  - equal:
+      path: ".spec.componentSpecs[0].resources.requests.cpu"
+      value: "2"
+  - equal:
+      path: ".spec.componentSpecs[0].resources.requests.memory"
+      value: "4Gi"
@@ -0,0 +1,16 @@
+storageClassName: "my-storage-class"
+proxy:
+  storageClassName: "my-proxy-storage-class"
+mode: raftGroup
+proxyEnabled: true
+
+asserts:
+  - equal:
+      path: ".spec.componentSpecs[0].volumeClaimTemplates[0].spec.storageClassName"
+      value: "my-storage-class"
+  - equal:
+      path: ".spec.componentSpecs[1].volumeClaimTemplates[0].spec.storageClassName"
+      value: "my-proxy-storage-class"
+  - equal:
+      path: ".spec.componentSpecs[3].volumeClaimTemplates[0].spec.storageClassName"
+      value: "my-proxy-storage-class"
@@ -0,0 +1,3 @@
+cpu: "1.5"
+memory: "10"
+storage: "50"
@@ -36,6 +36,7 @@
       "default": 0.5,
       "minimum": 0.5,
       "maximum": 64,
+      "pattern": "^[0-9]+(\\.[0-9]+)?$",
       "multipleOf": 0.5
     },
     "memory": {
@@ -47,7 +48,8 @@
       ],
       "default": 0.5,
       "minimum": 0.5,
-      "maximum": 1000
+      "maximum": 1000,
+      "pattern": "^[0-9]+(\\.[0-9]+)?$"
     },
     "storage": {
       "title": "Storage(Gi)",
@@ -58,7 +60,8 @@
       ],
       "default": 20,
       "minimum": 1,
-      "maximum": 10000
+      "maximum": 10000,
+      "pattern": "^[0-9]+(\\.[0-9]+)?$"
     },
     "storageClassName": {
       "title": "Storage Class Name",
@@ -100,8 +103,14 @@
               "type": "object",
               "properties": {
                 "storage": {
-                  "type": "string",
-                  "default": "20Gi"
+                  "type": [
+                    "number",
+                    "string"
+                  ],
+                  "default": 20,
+                  "minimum": 1,
+                  "maximum": 10000,
+                  "pattern": "^[0-9]+(\\.[0-9]+)?$"
                 }
               }
             }

@@ -33,6 +33,9 @@ requests:
 ##
 storage: 20
 
+## @param storageClassName
+storageClassName: ""
+
 ## @param proxyEnabled if true, enable the proxy
 ## if mode is standalone, proxyEnabled is always false
 ## if mode is raftGroup, proxyEnabled can be true or false
@@ -60,7 +63,7 @@ etcd:
     etcdctlApi: "3" # the etcd tool etcdctl api version
     replicas: 3 # no support other num
     resources:
-      storage: 20Gi
+      storage: 20
   serviceRef:
     # -- Kubernetes namespace for etcd
     # @default default

@@ -100,7 +100,7 @@ Define clickhouse componentSpec with ComponentDefinition.
 - name: clickhouse
   componentDef: {{ include "clickhouse-cluster.cmpdName" . }}
   replicas: {{ $.Values.replicas | default 2 }}
-  disableExporter: {{ $.Values.disableExporter | default "false" }}
+  disableExporter: {{ $.Values.extra.disableExporter | default "false" }}
   serviceVersion: {{ $.Values.version }}
   services:
   - name: default
@@ -128,7 +128,7 @@ Define clickhouse keeper componentSpec with ComponentDefinition.
 - name: ch-keeper
   componentDef: {{ include "clickhouse-cluster.keeperCmpdName" . }}
   replicas: {{ .Values.keeper.replicas }}
-  disableExporter: {{ $.Values.disableExporter | default "false" }}
+  disableExporter: {{ $.Values.extra.disableExporter | default "false" }}
   serviceVersion: {{ $.Values.version }}
   {{- with .Values.keeper.tolerations }}
   tolerations: {{ .| toYaml | nindent 4 }}
@@ -177,9 +177,9 @@ Define clickhouse shardingComponentSpec with ComponentDefinition.
     env:
     - name: "INIT_CLUSTER_NAME"
       value: "{{ .Values.clickhouse.initClusterName }}"
-    replicas: {{ $.Values.replicas | default 2 }}
-    disableExporter: {{ $.Values.disableExporter | default "false" }}
-    serviceVersion: {{ $.Values.version }}
+    replicas: {{ .Values.replicas | default 2 }}
+    disableExporter: {{ .Values.extra.disableExporter | default "false" }}
+    serviceVersion: {{ .Values.version }}
     services:
     - name: default
       serviceType: {{ .Values.service.type | default "NodePort" }}
@@ -191,7 +191,7 @@ Define clickhouse shardingComponentSpec with ComponentDefinition.
         numSymbols: 0
         letterCase: MixedCases
         seed: {{ include "kblib.clusterName" . }}
-    {{- with $.Values.tolerations }}
+    {{- with .Values.tolerations }}
     tolerations: {{ .| toYaml | nindent 6 }}
     {{- end }}
     {{- include "kblib.componentResources" . | indent 4 }}
@@ -211,16 +211,16 @@ Define clickhouse componentSpec with compatible ComponentDefinition API
 - name: {{ $name }}
   env:
   - name: "INIT_CLUSTER_NAME"
-    value: "{{ .Values.clickhouse.initClusterName }}"
-  componentDef: {{ include "clickhouse-cluster.cmpdName" . }}
+    value: "{{ $.Values.clickhouse.initClusterName }}"
+  componentDef: {{ include "clickhouse-cluster.cmpdName" $ }}
   replicas: {{ $.Values.replicas | default 2 }}
-  disableExporter: {{ $.Values.disableExporter | default "false" }}
+  disableExporter: {{ $.Values.extra.disableExporter | default "false" }}
   serviceVersion: {{ $.Values.version }}
   {{- with $.Values.tolerations }}
   tolerations: {{ .| toYaml | nindent 4 }}
   services:
   - name: default
-    serviceType: {{ .Values.service.type | default "NodePort" }}
+    serviceType: {{ $.Values.service.type | default "NodePort" }}
   {{- end }}
   {{- include "kblib.componentResources" $ | indent 2 }}
   {{- include "kblib.componentStorages" $ | indent 2 }}

@@ -0,0 +1 @@
+cpu: 65
@@ -0,0 +1 @@
+cpu: 0.1
@@ -0,0 +1 @@
+mode: invalid
@@ -0,0 +1,2 @@
+service:
+  type: InvalidType
@@ -0,0 +1,3 @@
+tls:
+  enabled: true
+  issuer: InvalidIssuer
@@ -0,0 +1,2 @@
+keeper:
+  cpu: 65
@@ -0,0 +1,2 @@
+keeper:
+  cpu: 0.05
@@ -0,0 +1,2 @@
+keeper:
+  memory: 1001
@@ -0,0 +1,2 @@
+keeper:
+  memory: 0.1
@@ -0,0 +1,2 @@
+keeper:
+  replicas: 2
@@ -0,0 +1,2 @@
+keeper:
+  storage: 10001
@@ -0,0 +1,2 @@
+keeper:
+  storage: 0
@@ -0,0 +1 @@
+memory: 1001
@@ -0,0 +1 @@
+memory: 0.1
@@ -0,0 +1 @@
+replicas: 0
@@ -0,0 +1 @@
+shards: 0
@@ -0,0 +1 @@
+storage: 10001
@@ -0,0 +1 @@
+storage: 0
@@ -0,0 +1 @@
+# Test default values (mode: cluster, sharding: true)
@@ -0,0 +1,2 @@
+keeper:
+  replicas: 3
@@ -0,0 +1,2 @@
+keeper:
+  replicas: 5
@@ -0,0 +1,9 @@
+replicas: 10
+cpu: 64
+memory: 1000
+storage: 10000
+keeper:
+  replicas: 5
+  cpu: 64
+  memory: 1000
+  storage: 10000
@@ -0,0 +1,2 @@
+mode: cluster
+sharding: false
@@ -0,0 +1,2 @@
+service:
+  type: ExternalName
@@ -0,0 +1,2 @@
+service:
+  type: LoadBalancer
@@ -0,0 +1,2 @@
+service:
+  type: NodePort
@@ -0,0 +1,2 @@
+sharding: false
+shards: 2
@@ -0,0 +1 @@
+sharding: false
@@ -0,0 +1 @@
+shards: 3
@@ -0,0 +1 @@
+mode: standalone
@@ -0,0 +1,2 @@
+tls:
+  enabled: true
@@ -0,0 +1,3 @@
+tls:
+  enabled: true
+  issuer: KubeBlocks
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Test default values (mode: cluster, sharding: true)