Merge pull request #90 from xueli181114/HYPERFLEET-794

HYPERFLEET-794 - chore: standardize appVersion and image.tag handling

Author: openshift-merge-bot[bot]

Makefile

@@ -259,13 +259,15 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm lint charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]'
 	@echo ""
 	@echo "Testing template rendering with default values..."
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' > /dev/null
 	@echo "Default values template OK"
@@ -274,6 +276,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set database.postgresql.enabled=false \
@@ -285,6 +288,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set autoscaling.enabled=true \
@@ -296,6 +300,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set podDisruptionBudget.enabled=true \
@@ -306,6 +311,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set serviceMonitor.enabled=true \
@@ -316,6 +322,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set auth.enableJwt=false \
@@ -335,6 +342,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set 'adapters.cluster=["validation"]' \
 		--set 'adapters.nodepool=["validation"]' \
 		--set database.pgbouncer.enabled=true > /dev/null
@@ -344,6 +352,7 @@ test-helm: ## Test Helm charts (lint, template, validate)
 	helm template test-release charts/ \
 		--set image.registry=quay.io \
 		--set image.repository=openshift-hyperfleet/hyperfleet-api \
+		--set image.tag=test \
 		--set-json 'adapters.cluster=["validation","dns","pullsecret","hypershift"]' \
 		--set-json 'adapters.nodepool=["validation","hypershift"]' > /dev/null
 	@echo "Full adapter config template OK"

charts/Chart.yaml

@@ -3,7 +3,7 @@ name: hyperfleet-api
 description: HyperFleet API - Cluster Lifecycle Management Service
 type: application
 version: 1.0.0
-appVersion: "1.0.0"
+appVersion: "0.0.0-dev"
 maintainers:
   - name: HyperFleet Team
     email: hyperfleet-team@redhat.com

charts/templates/_helpers.tpl

@@ -36,9 +36,7 @@ Common labels
 {{- define "hyperfleet-api.labels" -}}
 helm.sh/chart: {{ include "hyperfleet-api.chart" . }}
 {{ include "hyperfleet-api.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
+app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
@@ -66,12 +64,17 @@ Create the name of the service account to use
 Validate required values that must not remain as placeholders.
 */}}
 {{- define "hyperfleet-api.validateValues" -}}
-{{- if eq .Values.image.registry "CHANGE_ME" -}}
+{{- $registry := trim (toString .Values.image.registry) -}}
+{{- if or (not $registry) (eq $registry "CHANGE_ME") -}}
 {{- fail "image.registry must be set to actual container registry via --set image.registry=XXX. See docs/deployment.md for examples" -}}
 {{- end -}}
-{{- if eq .Values.image.repository "CHANGE_ME" -}}
+{{- $repository := trim (toString .Values.image.repository) -}}
+{{- if or (not $repository) (eq $repository "CHANGE_ME") -}}
 {{- fail "image.repository must be set (e.g. --set image.repository=openshift-hyperfleet/hyperfleet-api). See docs/deployment.md for examples" -}}
 {{- end -}}
+{{- if not (trim (toString .Values.image.tag)) -}}
+{{- fail "image.tag must be set (e.g. --set image.tag=abc1234)" -}}
+{{- end -}}
 {{- end }}
 
 {{/*

charts/templates/deployment.yaml

@@ -47,7 +47,7 @@ spec:
         command: ['sh', '-c', 'until nc -z {{ include "hyperfleet-api.fullname" . }}-postgresql {{ .Values.database.postgresql.port }}; do echo waiting for postgresql; sleep 2; done']
       {{- end }}
       - name: db-migrate
-        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command: ["/app/hyperfleet-api", "migrate"]
         env:
@@ -65,7 +65,7 @@ spec:
       - name: {{ .Chart.Name }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
-        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         workingDir: /app
         # Simple command - configuration via ConfigMap and environment variables

charts/values.yaml

@@ -7,7 +7,7 @@ image:
   registry: CHANGE_ME  # Set to your actual container registry (e.g. quay.io)
   repository: CHANGE_ME # e.g. openshift-hyperfleet/hyperfleet-api
   pullPolicy: Always
-  tag: ""
+  tag: ""  # Required — no default. Set via --set image.tag=<version>
 
 imagePullSecrets: []
 nameOverride: ""