fix: fix tracing configmap template to handle initial installation (a…

…libaba#1191)
cr7258 · Aug 9, 2024 · 564f8c7 · 564f8c7
1 parent fec2e9d
commit 564f8c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/helm/core/templates/_helpers.tpl b/helm/core/templates/_helpers.tpl
@@ -97,7 +97,7 @@ higress: {{ include "controller.name" . }}
 {{- end }}
 
 {{- define "skywalking.enabled" -}}
-{{- if and .Values.tracing.enable (hasKey .Values.tracing "skywalking") .Values.tracing.skywalking.service }}
+{{- if and (hasKey .Values "tracing") .Values.tracing.enable (hasKey .Values.tracing "skywalking") .Values.tracing.skywalking.service }}
 true
 {{- end }}
 {{- end }}
diff --git a/helm/core/templates/configmap.yaml b/helm/core/templates/configmap.yaml
@@ -107,9 +107,12 @@ metadata:
 data:
   higress: |-
     {{- $existingConfig := lookup "v1" "ConfigMap" .Release.Namespace "higress-config" }}
-    {{- $existingData := index $existingConfig.data "higress" | default "{}" | fromYaml }}
+    {{- $existingData := dict }}
+    {{- if $existingConfig }}
+    {{- $existingData = index $existingConfig.data "higress" | default "{}" | fromYaml }}
+    {{- end }}
     {{- $newData := dict }}
-    {{- if .Values.tracing.enable }}
+    {{- if and (hasKey .Values "tracing") .Values.tracing.enable }}
     {{- $_ := set $newData "tracing" .Values.tracing }}
     {{- end }}
     {{- toYaml (merge $existingData $newData) | nindent 4 }}