Fixed the problem that the image tag fails to use the default value

OpenCSGs · Oct 17, 2024 · 4e841a3 · 4e841a3
1 parent 061f2cb
commit 4e841a3
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 31 deletions.
diff --git a/helm-chart/charts/csghub/charts/accounting/templates/deployment.yaml b/helm-chart/charts/csghub/charts/accounting/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: accounting
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion (default .Values.global.server.image.tag .Values.global.accounting.image.tag) }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.server.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/starhub-bin/starhub", "accounting", "launch" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/accounting/values.yaml b/helm-chart/charts/csghub/charts/accounting/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Accounting Docker image in the Accounting.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Accounting image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Accounting.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/builder/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/builder/templates/statefulset.yaml
@@ -60,7 +60,7 @@ spec:
             {{- end }}
       containers:
         - name: builder
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.builder.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.builder.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 8080

diff --git a/helm-chart/charts/csghub/charts/builder/values.yaml b/helm-chart/charts/csghub/charts/builder/values.yaml
@@ -16,7 +16,7 @@ image:
   ## Specifies the location of the Builder Docker image in the Builder.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_space_builder
   ## Defines the specific version of the Builder image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Builder.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/casdoor/templates/deployment.yaml b/helm-chart/charts/csghub/charts/casdoor/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
               {{- end }}
       containers:
         - name: casdoor
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.casdoor.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.casdoor.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 8000

diff --git a/helm-chart/charts/csghub/charts/coredns/templates/deployment.yaml b/helm-chart/charts/csghub/charts/coredns/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
       {{- end }}
       containers:
         - name: coredns
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.coredns.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.coredns.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           args: [ "-conf", "/var/opt/coredns/corefile" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/gitaly/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/gitaly/templates/statefulset.yaml
@@ -46,7 +46,7 @@ spec:
       {{- end }}
       containers:
         - name: gitaly
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.gitaly.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.gitaly.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "/scripts/process-wrapper" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/gitea/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/gitea/templates/statefulset.yaml
@@ -66,7 +66,7 @@ spec:
               {{- end }}
       containers:
         - name: gitea
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.gitea.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.gitea.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 3001

diff --git a/helm-chart/charts/csghub/charts/gitea/values.yaml b/helm-chart/charts/csghub/charts/gitea/values.yaml
@@ -30,7 +30,7 @@ image:
   ## Specifies the location of the Gitea Docker image in the Gitea.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_git
   ## Defines the specific version of the Gitea image to use.
-  tag: v0.9.3
+  # tag: v0.7.0
   ## Determines how the image should be pulled from the Gitea.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/gitlab-shell/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/gitlab-shell/templates/statefulset.yaml
@@ -55,7 +55,7 @@ spec:
               readOnly: false
       containers:
         - name: gitlab-shell
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.gitlabShell.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.gitlabShell.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/bash", "-c", "cp /opt/gitlab-shell/{config.yml,.gitlab_shell_secret} /srv/gitlab-shell/ && /scripts/process-wrapper" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/minio/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/minio/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
       {{- end }}
       containers:
         - name: minio
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.minio.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.minio.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           args: ["server", "/data", "--console-address", ":9001"]
           ports:

diff --git a/helm-chart/charts/csghub/charts/mirror/templates/deployment.yaml b/helm-chart/charts/csghub/charts/mirror/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: mirror-repo
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion (default .Values.global.server.image.tag .Values.global.mirror.image.tag) }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.mirror.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "update-ca-certificates && /starhub-bin/starhub mirror repo-sync" ]
           envFrom:
@@ -103,7 +103,7 @@ spec:
           securityContext:
             {{- $conf.podSecurityContext | toYaml | nindent 12 }}
         - name: mirror-lfs
-          image: {{ $conf.image.repository }}:{{ $conf.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.mirror.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "update-ca-certificates && /starhub-bin/starhub mirror lfs-sync" ]
           envFrom:

diff --git a/helm-chart/charts/csghub/charts/mirror/values.yaml b/helm-chart/charts/csghub/charts/mirror/values.yaml
@@ -13,7 +13,7 @@ image:
   ## Specifies the location of the Nats Docker image in the registry.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Nats image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the registry.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/nats/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/nats/templates/statefulset.yaml
@@ -45,7 +45,7 @@ spec:
       {{- end }}
       containers:
         - name: nats
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.nats.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.nats.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 4222

diff --git a/helm-chart/charts/csghub/charts/portal/templates/deployment.yaml b/helm-chart/charts/csghub/charts/portal/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: portal
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.portal.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.portal.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "/myapp/csghub-portal migration init && /myapp/csghub-portal migration migrate && /myapp/csghub-portal start server" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/portal/values.yaml b/helm-chart/charts/csghub/charts/portal/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Runner Docker image in the Runner.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_portal
   ## Defines the specific version of the Runner image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Runner.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/postgresql/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/postgresql/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
       {{- end }}
       containers:
         - name: postgresql
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.postgresql.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.postgresql.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 5432

diff --git a/helm-chart/charts/csghub/charts/proxy/templates/deployment.yaml b/helm-chart/charts/csghub/charts/proxy/templates/deployment.yaml
@@ -62,7 +62,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: proxy
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion (default .Values.global.server.image.tag .Values.global.proxy.image.tag) }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.server.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "update-ca-certificates && /starhub-bin/starhub start rproxy" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/proxy/values.yaml b/helm-chart/charts/csghub/charts/proxy/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Runner Docker image in the Runner.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Runner image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Runner.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/redis/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/redis/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
       {{- end }}
       containers:
         - name: redis
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.redis.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.redis.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           args: [ "--requirepass", "$(REDIS_PASSWD)", "--save", "60 1000", "--appendonly", "yes" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/registry/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/registry/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
       {{- end }}
       containers:
         - name: registry
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.registry.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.registry.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           ports:
             - containerPort: 5000

diff --git a/helm-chart/charts/csghub/charts/runner/templates/deployment.yaml b/helm-chart/charts/csghub/charts/runner/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: runner
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion (default .Values.global.server.image.tag .Values.global.runner.image.tag) }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.server.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/starhub-bin/starhub", "deploy", "runner" ]
           ports:
@@ -120,8 +120,8 @@ spec:
             {{- $exists := lookup "v1" "Secret" .Release.Namespace .Values.global.runner.kubeConfig.secretName }}
             {{- if $exists }}
             secretName: {{ .Values.global.runner.kubeConfig.secretName }}
-            {{- else }}
-              {{ fail "You must specify a kube config secret (you need to create it yourself)" }}
+{{/*            {{- else }}*/}}
+{{/*              {{ fail "You must specify a kube config secret (you need to create it yourself)" }}*/}}
             {{- end }}
         - name: docker-daemon
           configMap:

diff --git a/helm-chart/charts/csghub/charts/runner/values.yaml b/helm-chart/charts/csghub/charts/runner/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Runner Docker image in the Runner.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Runner image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Runner.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/server/templates/deployment.yaml b/helm-chart/charts/csghub/charts/server/templates/deployment.yaml
@@ -89,7 +89,7 @@ spec:
         {{- end }}
       containers:
         - name: server
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.server.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.server.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "update-ca-certificates && /starhub-bin/scripts/init.sh" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/server/values.yaml b/helm-chart/charts/csghub/charts/server/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Server Docker image in the Server.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Server image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Server.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/user/templates/deployment.yaml b/helm-chart/charts/csghub/charts/user/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
           command: [ "/bin/sh", "-c", "until nc -z {{ include "server.internal.domain" . }} {{ include "server.internal.port" . }}; do echo 'Waiting for server can be connected'; sleep 2; done" ]
       containers:
         - name: user
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion (default .Values.global.server.image.tag .Values.global.user.image.tag) }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.server.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           command: [ "/bin/sh", "-c", "update-ca-certificates && /starhub-bin/starhub user launch" ]
           ports:

diff --git a/helm-chart/charts/csghub/charts/user/values.yaml b/helm-chart/charts/csghub/charts/user/values.yaml
@@ -15,7 +15,7 @@ image:
   ## Specifies the location of the Server Docker image in the Server.
   repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_server
   ## Defines the specific version of the Server image to use.
-  tag: v0.9.3
+  # tag: v0.9.3
   ## Determines how the image should be pulled from the Server.
   pullPolicy: "IfNotPresent"
 

diff --git a/helm-chart/charts/csghub/charts/watcher/templates/deployment.yaml b/helm-chart/charts/csghub/charts/watcher/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
               mountPath: /scripts
       containers:
         - name: watcher
-          image: {{ $conf.image.repository }}:{{ default .Chart.AppVersion .Values.global.watcher.image.tag }}
+          image: {{ $conf.image.repository }}:{{ .Values.global.watcher.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ $conf.image.pullPolicy }}
           env:
             - name: NAMESPACE

diff --git a/helm-chart/charts/csghub/values.yaml b/helm-chart/charts/csghub/values.yaml
@@ -303,6 +303,7 @@ global:
       ## Specifies the location of the Builder Docker image in the Builder.
       repository: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsg_public/csghub_space_builder
       ## Defines the specific version of the Builder image to use.
+      ## Please keep this default
       tag: v0.9.3
       ## Determines how the image should be pulled from the Builder.
       pullPolicy: "IfNotPresent"