Merge pull request #46 from z1cheng/fix_helm

fix: image tag error in Helm
KusionStack · Jul 31, 2024 · acaa214 · acaa214
2 parents 4f90df1 + cbb87ad
commit acaa214
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/charts/karpor/Chart.yaml b/charts/karpor/Chart.yaml
@@ -3,7 +3,7 @@
 apiVersion: v2
 name: karpor
 # The Chart Version
-version: 0.5.5
+version: 0.5.6
 type: application
 # The Application Version in the Chart
 appVersion: 0.4.5

diff --git a/charts/karpor/README.md b/charts/karpor/README.md
@@ -1,6 +1,6 @@
 # Karpor Chart
 
-![Version: 0.5.5](https://img.shields.io/badge/Version-0.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.5](https://img.shields.io/badge/AppVersion-0.4.5-informational?style=flat-square)
+![Version: 0.5.6](https://img.shields.io/badge/Version-0.5.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.5](https://img.shields.io/badge/AppVersion-0.4.5-informational?style=flat-square)
 
 A Helm chart for Karpor, a modern kubernetes visualization tool.
 

diff --git a/charts/karpor/templates/_common.tpl b/charts/karpor/templates/_common.tpl
@@ -31,6 +31,6 @@ Real image.
 */}}
 {{- define "karpor.realImage" -}}
 {{- trimPrefix "/" (list (trimAll "/" .context.Values.registryProxy)
-.repo | join "/") }}:{{ if .hasV }}v{{ end }}{{ default .context.Chart.AppVersion .tag }}
+.repo | join "/") }}:{{ if .needV }}v{{ end }}{{ default .context.Chart.AppVersion .tag }}
 {{- end -}}
 
diff --git a/charts/karpor/templates/karpor-server.yml b/charts/karpor/templates/karpor-server.yml
@@ -35,7 +35,7 @@ spec:
             - --client-ca-file=/etc/karpor/ca.crt
           command:
             - /karpor
-          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.server.image.repo "tag" .Values.server.image.tag "hasV" true) }}
+          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.server.image.repo "tag" .Values.server.image.tag "needV" (not (hasPrefix "v" .Values.server.image.tag))) }}
           imagePullPolicy: {{ .Values.global.image.imagePullPolicy }} 
           name: karpor-server
           ports:

diff --git a/charts/karpor/templates/karpor-syncer.yml b/charts/karpor/templates/karpor-syncer.yml
@@ -24,7 +24,7 @@ spec:
           env:
             - name: KUBECONFIG
               value: /etc/karpor/config
-          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.syncer.image.repo "tag" .Values.syncer.image.tag "hasV" true) }}
+          image: {{ include "karpor.realImage" (dict "context" . "repo" .Values.syncer.image.repo "tag" .Values.syncer.image.tag "needV" (not (hasPrefix "v" .Values.syncer.image.tag))) }}
           imagePullPolicy: {{ .Values.global.image.imagePullPolicy }} 
           name: karpor-syncer
           ports: