Merge pull request #7 from BaizeAI/feat/update-image-format

feat: update image format

Author: yyzxw

.github/workflows/ci-release.yml

@@ -64,7 +64,7 @@ jobs:
           images: |
             ghcr.io/baizeai/snapshot-controller
           tags: |
-            type=semver,pattern={{version}}
+            type=semver,pattern={{raw}}
 
       - name: Build
         uses: docker/build-push-action@v4
@@ -102,7 +102,7 @@ jobs:
 
       - name: Tag helm chart image
         run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
+          image_tag=v${{ steps.get_version.outputs.VERSION }}
           chart_version=${{ steps.get_version.outputs.VERSION }}
           sed -i "s/latest/${image_tag}/g" $HELM_CHARTS_DIR/values.yaml
           chart_smever=${chart_version#"v"}

manifests/snapshot-pod/templates/_common.tpl

@@ -0,0 +1,20 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Return the proper image name
+{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
+*/}}
+{{- define "common.images.image" -}}
+{{- $registryName := .imageRoot.registry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $tag := .imageRoot.tag | toString -}}
+{{- if .global }}
+    {{- if .global.imageRegistry }}
+     {{- $registryName = .global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+{{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}

manifests/snapshot-pod/templates/_helpers.tpl

@@ -60,3 +60,8 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+
+{{- define "snapshot-pod.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
+{{- end -}}

manifests/snapshot-pod/templates/daemonset.yaml

@@ -38,7 +38,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ template "snapshot-pod.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --leader-elect=false

manifests/snapshot-pod/templates/deployment.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ template "snapshot-pod.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --leader-elect=true

manifests/snapshot-pod/values.yaml

@@ -2,10 +2,15 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+global:
+  ## @param global.imageRegistry Global image registry
+  imageRegistry: ""
+
 replicaCount: 1
 
 image:
-  repository: aiharbor.daocloud.io/baize/snapshot-pod-controller
+  registry: ghcr.io
+  repository: baizeai/snapshot-controller
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
@@ -28,15 +33,15 @@ serviceAccount:
 podAnnotations: {}
 
 podSecurityContext: {}
-  # fsGroup: 2000
+# fsGroup: 2000
 
 securityContext: {}
   # capabilities:
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
-  # runAsUser: 1000
+# runAsUser: 1000
 
 service:
   type: ClusterIP
@@ -45,7 +50,7 @@ resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
 
 nodeSelector: {}