Skip to content

Pin calico/base to release tags #9867

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.

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

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Conversation

hjiawei
Copy link
Contributor

@hjiawei hjiawei commented Feb 18, 2025

Description

This change pins calico/base version to a particular tag instead of latest. It resolves issues during a (hash) release when non-amd64 components accidentally pull in amd64 bases.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@marvin-tigera marvin-tigera added this to the Calico v3.30.0 milestone Feb 18, 2025
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 18, 2025
@@ -204,7 +204,7 @@ endif
python:3 \
bash -c '/usr/local/bin/python release/get-contributors.py >> /code/AUTHORS.md'

update-pins: update-go-build-pin
update-pins: update-go-build-pin update-calico-base-pin
Copy link
Contributor Author

@hjiawei hjiawei Feb 19, 2025

Choose a reason for hiding this comment

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

Normally, we update calico/base together with calico/go-build before each release. This update-pins target will be triggered once we have a new calico/go-build release. Both calico/go-build and calico/base versions will be updated to the latest.

@@ -199,7 +199,7 @@ ifeq ($(BUILDARCH),amd64)
# *-amd64 tagged images for etcd are not available until v3.5.0
ETCD_IMAGE = quay.io/coreos/etcd:$(ETCD_VERSION)
endif
UBI_IMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:$(UBI_VERSION)
UBI_IMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:latest
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We do microdnf upgrade when building the container image. It essentially moves the tag to latest. We are not really pinning to the UBI_VERSION defined in metadata.mk.

@hjiawei hjiawei closed this Feb 19, 2025
@marvin-tigera marvin-tigera removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 19, 2025
@hjiawei hjiawei reopened this Feb 19, 2025
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 19, 2025
@hjiawei hjiawei added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact and removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 19, 2025
@hjiawei hjiawei mentioned this pull request Feb 19, 2025
3 tasks
@hjiawei hjiawei marked this pull request as ready for review February 19, 2025 16:38
@hjiawei hjiawei requested a review from a team as a code owner February 19, 2025 16:38
@echo "latest CALICO_BASE_VER=$(new_ver)"

bash -c '\
if [[ "$(new_ver)" > "$(old_ver)" ]]; then \
Copy link
Member

Choose a reason for hiding this comment

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

today I learned that this "just works" for strings

@hjiawei
Copy link
Contributor Author

hjiawei commented Feb 19, 2025

calico/base release tags are pushed in projectcalico/go-build#652.

This change pins calico/base version to a particular tag instead of `latest`.
It resolves issues during a (hash) release when non-amd64 components
accidentally pull in amd64 bases.
@hjiawei hjiawei merged commit 0286a80 into projectcalico:master Feb 20, 2025
3 checks passed
@hjiawei hjiawei deleted the pin-calico-base branch February 20, 2025 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants