Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Update promote-images to filter by image and sort by tag #6452

Merged
merged 1 commit into from
Apr 29, 2022
Merged

🌱 Update promote-images to filter by image and sort by tag #6452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ GO_APIDIFF_BIN := go-apidiff
GO_APIDIFF := $(abspath $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER))
GO_APIDIFF_PKG := github.com/joelanford/go-apidiff

KPROMO_VER := v3.3.0-beta.3
KPROMO_VER := v3.4.1
KPROMO_BIN := kpromo
KPROMO := $(abspath $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER))
KPROMO_PKG := sigs.k8s.io/promo-tools/v3/cmd/kpromo
Expand Down Expand Up @@ -655,7 +655,7 @@ release-notes: $(RELEASE_NOTES_DIR) $(RELEASE_NOTES)

.PHONY: promote-images
promote-images: $(KPROMO)
$(KPROMO) pr --project cluster-api --tag $(RELEASE_TAG) --reviewers "$(IMAGE_REVIEWERS)" --fork $(USER_FORK)
$(KPROMO) pr --project cluster-api --tag $(RELEASE_TAG) --reviewers "$(IMAGE_REVIEWERS)" --fork $(USER_FORK) --image cluster-api-controller --image kubeadm-control-plane-controller --image kubeadm-bootstrap-controller --digests ""
sbueringer marked this conversation as resolved.
Show resolved Hide resolved

## --------------------------------------
## Docker
Expand Down
2 changes: 1 addition & 1 deletion scripts/go_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ fi
rm "${GOBIN}/${2}"* || true

# install the golang module specified as the first argument
go install -tags tools "${1}@${3}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why this was needed, pretty sure it was there at the time we had fake go.mod but is no longer needed. I removed it because it was causing errors due to a conflict with a new imported package in kpromo:

../../../pkg/mod/github.com/google/[email protected]/tools.go:20:2: import "github.com/fullstorydev/grpcurl/cmd/grpcurl" is a program, not an importable package

because the above has tag // +build tools

Copy link
Member

@sbueringer sbueringer Apr 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, probably we probably copied the command from there

go install "${1}@${3}"
mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}"
ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"