Merge pull request #151 from carllhw/fix-image-tag-appversion

fix: image tag invalid reference format
jumpserver · Mar 4, 2024 · 182ce12 · 182ce12
2 parents d9b0b56 + fba2cfc
commit 182ce12
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 **/values-debug.yaml
 .idea/
+.vscode/
 .history/
+debug/
 deploy.sh
diff --git a/charts/jumpserver/templates/chen/deployment-chen.yaml b/charts/jumpserver/templates/chen/deployment-chen.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "chen" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml
@@ -11,7 +11,7 @@
 {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
 {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
 {{- $imageName := $.Values.xpack.enabled | ternary "core-ee" "core-ce" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/kael/deployment-kael.yaml b/charts/jumpserver/templates/kael/deployment-kael.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "kael" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "koko" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "lion" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -12,7 +12,7 @@
 {{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }}
 {{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }}
 {{- $imageName := "magnus" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/pre-install-initdb.yaml b/charts/jumpserver/templates/pre-install-initdb.yaml
@@ -4,7 +4,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := $.Values.xpack.enabled | ternary "core-ee" "core-ce" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: batch/v1

diff --git a/charts/jumpserver/templates/razor/deployment-razor.yaml b/charts/jumpserver/templates/razor/deployment-razor.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "razor" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/video/deployment-video.yaml b/charts/jumpserver/templates/video/deployment-video.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "video-worker" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/web/deployment-web.yaml b/charts/jumpserver/templates/web/deployment-web.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "web" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1

diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
@@ -5,7 +5,7 @@
 {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "xrdp" }}
-{{- $imageTag := "$.Chart.AppVersion" }}
+{{- $imageTag := $.Chart.AppVersion }}
 {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
 
 apiVersion: apps/v1