Skip to content

Commit 37a6618

Browse files
committed
helm: publish rolling staging version of OCI chart
For non-release builds, publish Helm chart with version 0.0.0-<branch-name> in the OCI repo.
1 parent 6fd099b commit 37a6618

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ JEKYLL_OPTS := -d '$(SITE_DESTDIR)' $(if $(SITE_BASEURL),-b '$(SITE_BASEURL)',)
3434
VERSION := $(shell git describe --tags --dirty --always --match "v*")
3535

3636
CHART_VERSION ?= $(shell echo $(VERSION) | cut -c2-)
37+
CHART_EXTRA_VERSIONS ?=
3738

3839
IMAGE_REGISTRY ?= registry.k8s.io/nfd
3940
IMAGE_TAG_NAME ?= $(VERSION)
@@ -182,8 +183,10 @@ helm-lint:
182183
helm lint --strict deployment/helm/node-feature-discovery/
183184

184185
helm-push:
185-
helm package deployment/helm/node-feature-discovery --version $(CHART_VERSION) --app-version $(IMAGE_TAG_NAME)
186-
helm push node-feature-discovery-$(CHART_VERSION).tgz oci://${IMAGE_REGISTRY}/charts
186+
for v in $(CHART_VERSION) $(CHART_EXTRA_VERSIONS); do \
187+
helm package deployment/helm/node-feature-discovery --version $$v --app-version $(IMAGE_TAG_NAME); \
188+
helm push node-feature-discovery-$$v.tgz oci://${IMAGE_REGISTRY}/charts; \
189+
done
187190
# Push artifacthub.io metadata
188191
# Ref: https://artifacthub.io/docs/topics/repositories/helm-charts/#oci-support
189192
oras push \

scripts/test-infra/push-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# ('vYYYYMMDD-') from _GIT_TAG in order to get a reproducible version and
55
# container image tag
66
if [ -z "$_GIT_TAG" ]; then
7-
MAKE_VARS="IMAGE_EXTRA_TAG_NAMES=${_PULL_BASE_REF}"
7+
MAKE_VARS="IMAGE_EXTRA_TAG_NAMES=${_PULL_BASE_REF} CHART_EXTRA_VERSIONS=0.0.0-${_PULL_BASE_REF}"
88
else
99
MAKE_VARS="VERSION=${_GIT_TAG:10}"
1010
fi

0 commit comments

Comments
 (0)