chore: fix helm invalid null values (#8020)

(cherry picked from commit f8b783e)
apecloud · Aug 26, 2024 · 199dacf · 199dacf
1 parent 2510d3a
commit 199dacf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/deploy/helm/templates/applications/apecloud-otel-collector-addon.yaml b/deploy/helm/templates/applications/apecloud-otel-collector-addon.yaml
@@ -25,11 +25,8 @@ spec:
           key: values-kubeblocks-override.yaml
 
     valuesMapping:
-      valueMap:
-
       jsonMap:
         tolerations: tolerations
-
       resources:
         cpu:
           requests: resources.requests.cpu

diff --git a/deploy/helm/templates/applications/csi-driver-nfs-addon.yaml b/deploy/helm/templates/applications/csi-driver-nfs-addon.yaml
@@ -19,20 +19,21 @@ spec:
     {{- include "kubeblocks.addonChartsImage" . | indent 4 }}
     {{- include "kubeblocks.addonHelmInstallOptions" (dict "version" "4.5.0" "values" .Values) | indent 4 }}
 
+    {{- $cloudProvider := (include "kubeblocks.cloudProvider" .) }}
+    {{- if eq $cloudProvider "huaweiCloud" }}
     installValues:
-      {{- $cloudProvider := (include "kubeblocks.cloudProvider" .) }}
-      {{- if eq $cloudProvider "huaweiCloud" }}
       setValues:
         - kubeletDir=/mnt/paas/kubernetes/kubelet
-      {{- else if eq $cloudProvider "gcp" }}
+    {{- else if eq $cloudProvider "gcp" }}
       # In GKE, the system-node-critical and system-cluster-critical priority classes
       # can't be used for non-system pods, but csi-driver-nfs uses "system-cluster-critical"
       # by default, so override them here.
+    installValues:
       setValues:
         - controller.priorityClassName=""
         - node.priorityClassName=""
         - externalSnapshotter.priorityClassName=""
-      {{- end }}
+     {{- end }}
 
     valuesMapping:
       valueMap:

diff --git a/deploy/helm/templates/applications/grafana-addon.yaml b/deploy/helm/templates/applications/grafana-addon.yaml
@@ -44,7 +44,6 @@ spec:
 
   defaultInstallValues:
     - replicas: 1
-      storageClass:
       resources:
         requests:
           storage: 1Gi

diff --git a/deploy/helm/templates/applications/loki-addon.yaml b/deploy/helm/templates/applications/loki-addon.yaml
@@ -38,7 +38,6 @@ spec:
 
   defaultInstallValues:
     - replicas: 1
-      storageClass:
       resources:
         requests:
           storage: 8Gi