github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-07-28 18:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chore: avoid Helm <3.9 template crash in cluster-gateway caBundle guard GWCP-106309 (#7256)

Browse Source 
* fix: avoid Helm <3.9 template crash in cluster-gateway caBundle guard

Signed-off-by: anaswara-suresh <anaswarasuresh2212@gmail.com>

* fix: pin Helm installation to specific version to catch template regressions

Signed-off-by: Vishal Kumar <vishal210893@gmail.com>

* formatting

Signed-off-by: Vishal Kumar <vishal210893@gmail.com>

---------

Signed-off-by: anaswara-suresh <anaswarasuresh2212@gmail.com>
Signed-off-by: Vishal Kumar <vishal210893@gmail.com>
This commit is contained in:
Anasawara Suresh M K
2026-07-28 20:45:44 +05:30
committed by GitHub
parent f47468ecb0
commit 410c2a8321
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/env-setup/action.yaml vendored
View File

@@ -57,8 +57,10 @@ runs:
chmod +x kubectl
sudo mv kubectl /usr/local/bin/
# Install helm using the official script
# Install helm using the official script, pinned so CI catches
# Helm-version-specific template regressions
echo "Installing Helm using official script..."
export DESIRED_VERSION=v3.6.3
curl -fsSL --retry 3 -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
chmod 700 get_helm.sh
./get_helm.sh

12
charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml
View File

@@ -162,13 +162,19 @@ spec:
versionPriority: 10
insecureSkipTLSVerify: {{ not .Values.multicluster.clusterGateway.secureTLS.enabled }}
{{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
{{- /* Preserve an already-valid caBundle on upgrade so we don't reset it to the
{{- /* Preserve an already-valid caBundle on upgrade so we don't reset it to the
Cg== placeholder before the patch Job re-runs
$apiSvc is the existing APIService looked up above; fall back to the
placeholder only on fresh install or when it still holds the placeholder. */}}
{{- $caBundle := "Cg==" }}
{{- if and $apiSvc $apiSvc.spec (hasKey $apiSvc.spec "caBundle") (ne $apiSvc.spec.caBundle "Cg==") }}
{{- $caBundle = $apiSvc.spec.caBundle }}
{{- if $apiSvc }}
{{- if $apiSvc.spec }}
{{- if hasKey $apiSvc.spec "caBundle" }}
{{- if ne $apiSvc.spec.caBundle "Cg==" }}
{{- $caBundle = $apiSvc.spec.caBundle }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
caBundle: {{ $caBundle }}
{{ end }}