fix repository bug (#807)

Author: kannon92

Makefile

@@ -235,7 +235,7 @@ artifacts: kustomize helm
 	$(HELM) package --version $(GIT_TAG) --app-version $(GIT_TAG) charts/jobset -d artifacts/
 	mv artifacts/jobset-$(GIT_TAG).tgz artifacts/jobset-chart-$(GIT_TAG).tgz
 	# Revert the image changes
-	$(YQ)  e  '.image.repository = "$(IMAGE_REGISTRY)/$(IMAGE_NAME)" | del(.image.tag) | .image.pullPolicy = "Always"' -i charts/jobset/values.yaml
+	$(YQ)  e  '.image.repository = "$(IMAGE_REGISTRY)/$(IMAGE_NAME)" | .image.tag="main" | .image.pullPolicy = "Always"' -i charts/jobset/values.yaml
 
 GOLANGCI_LINT = $(PROJECT_DIR)/bin/golangci-lint
 .PHONY: golangci-lint

charts/jobset/README.md

@@ -60,11 +60,10 @@ See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall) for command docum
 | nameOverride | string | `""` | String to partially override release name. |
 | fullnameOverride | string | `""` | String to fully override release name. |
 | commonLabels | object | `{}` | Common labels to add to the jobset resources. |
-| image.registry | string | `"registry.k8s.io"` | Image registry. |
-| image.repository | string | `"jobset/jobset"` | Image repository. |
-| image.tag | string | If not set, the chart version will be used. | Image tag. |
-| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
+| image.repository | string | `"us-central1-docker.pkg.dev/k8s-staging-images/jobset/jobset"` | Image repository. |
+| image.pullPolicy | string | `"Always"` | Image pull policy. |
 | image.pullSecrets | list | `[]` | Image pull secrets for private image registry. |
+| image.tag | string | `"main"` |  |
 | controller.replicas | int | `1` | Replicas of the jobset controller deployment. |
 | controller.leaderElection.enable | bool | `true` | Whether to enable leader election for jobset controller. |
 | controller.clientConnection.qps | int | `500` | QPS is the number of queries per second allowed for K8S api server connection. |

charts/jobset/templates/_helpers.tpl

@@ -66,10 +66,3 @@ Selector labels of the jobset resources.
 app.kubernetes.io/name: {{ include "jobset.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of jobset image.
-*/}}
-{{- define "jobset.image" -}}
-{{ printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.tag | default .Chart.Version) }}
-{{- end -}}

charts/jobset/templates/controller/deployment.yaml

@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: controller
-        image: {{ include "jobset.controller.image" . }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         {{- with .Values.image.pullPolicy }}
         imagePullPolicy: {{ . }}
         {{- end }}

charts/jobset/values.yaml

@@ -22,16 +22,13 @@ fullnameOverride: ""
 # -- Common labels to add to the jobset resources.
 commonLabels: {}
 image:
-  # -- Image registry.
-  registry: registry.k8s.io
   # -- Image repository.
-  repository: us-central1-docker.pkg.dev/k8s-staging-images/jobset/
+  repository: us-central1-docker.pkg.dev/k8s-staging-images/jobset/jobset
   # -- Image pull policy.
   pullPolicy: Always
   # -- Image pull secrets for private image registry.
   pullSecrets: []
   # - name: <secret-name>
-
   tag: main
 controller:
   # -- Replicas of the jobset controller deployment.