Skip to content

Commit 3914739

Browse files
authored
Merge pull request #1513 from vincepri/build-master-tag
⚠️ Build `master` tag on master instead of latest
2 parents 0b70358 + d3f450d commit 3914739

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ release-binary: $(RELEASE_DIR)
246246
release-staging: ## Builds and push container images to the staging bucket.
247247
REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag
248248

249-
RELEASE_ALIAS_TAG=$(shell if [ "$(PULL_BASE_REF)" = "master" ]; then echo "latest"; else echo "$(PULL_BASE_REF)"; fi)
249+
RELEASE_ALIAS_TAG=$(PULL_BASE_REF)
250250

251251
.PHONY: release-alias-tag
252252
release-alias-tag: # Adds the tag to the last build tag.

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
template:
88
spec:
99
containers:
10-
- image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:latest
10+
- image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:master
1111
name: manager

0 commit comments

Comments
 (0)