Skip to content

Commit b454db1

Browse files
authored
Merge pull request #731 from justinsb/chore_push_helm_chart
chore: push helm chart alongside image
2 parents 563faea + ccf0f6d commit b454db1

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ publish-image: ko ## Publish the kro controller images to ghcr.io
214214
.PHONY: package-helm
215215
package-helm: ## Package Helm chart
216216
cp ./config/crd/bases/* helm/crds/
217-
@sed -i '' 's/tag: .*/tag: "$(RELEASE_VERSION)"/' helm/values.yaml
218-
@sed -i '' 's/version: .*/version: $(RELEASE_VERSION)/' helm/Chart.yaml
219-
@sed -i '' 's/appVersion: .*/appVersion: "$(RELEASE_VERSION)"/' helm/Chart.yaml
217+
sed -i 's/tag: .*/tag: "$(RELEASE_VERSION)"/' helm/values.yaml
218+
sed -i 's/version: .*/version: $(RELEASE_VERSION)/' helm/Chart.yaml
219+
sed -i 's/appVersion: .*/appVersion: "$(RELEASE_VERSION)"/' helm/Chart.yaml
220220
helm package helm
221221

222222
.PHONY: publish-helm

dev/tasks/push-images

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,19 @@ if [[ -z ${IMAGE_TAG:-} ]]; then
2020
fi
2121
echo "Using IMAGE_TAG=${IMAGE_TAG}"
2222

23+
if [[ -z ${HELM_IMAGE:-} ]]; then
24+
echo "HELM_IMAGE is not set"
25+
HELM_IMAGE=${IMAGE_PREFIX}charts
26+
fi
27+
echo "Using HELM_IMAGE=${HELM_IMAGE}"
28+
2329
# build first, technically this is not needed as publish does a build too
2430
RELEASE_VERSION=${IMAGE_TAG} OCI_REPO=${IMAGE_PREFIX%/} make build-image
2531

32+
# we are also pushing the helm chart, build it first
33+
RELEASE_VERSION=${IMAGE_TAG} HELM_IMAGE=${HELM_IMAGE} make package-helm
34+
35+
2636
# Do the actual publish
2737
RELEASE_VERSION=${IMAGE_TAG} OCI_REPO=${IMAGE_PREFIX%/} make publish-image
38+
RELEASE_VERSION=${IMAGE_TAG} HELM_IMAGE=${HELM_IMAGE} make publish-helm

0 commit comments

Comments
 (0)