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.

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

Fix the issue of patch repo in upgrade cmd #3220

Merged
merged 1 commit into from
May 31, 2024
Merged

Conversation

d8660091
Copy link
Member

@d8660091 d8660091 commented May 30, 2024

Issue #, if available:

Description of changes: codebuild aws-eks-anywhere-build-tooling-projects-upgrade is running without RELEASE_BRANCH environment variable, and it cannot run the patch-repo make target. This PR is trying to address the issue.

Test: test the code change with BASE_REPO_OWNER=d8660091, and make upgrade -C tools/version-tracker PROJECT=kubernetes-sigs/kind VERBOSITY=6 shows 2024-05-31T18:04:24.095Z V6 Pushing changes to remote [eks-distro-pr-bot]

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 30, 2024
Common.mk Outdated
@@ -132,7 +132,8 @@ else ifneq ($(IS_RELEASE_BRANCH_BUILD),)
RELEASE_TARGETS_OVERRIDE=release/release-branches/all

# avoid warnings when trying to read GIT_TAG file which wont exist when no release_branch is given
GIT_TAG=non-existent
# the GIT_TAG could be set during version-tracker's upgrade command, so no override
GIT_TAG?=non-existent
Copy link
Member

Choose a reason for hiding this comment

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

i dont see why this is needed since youve added this target to the above allowlist, it shouldnt even fall into here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried without this "?" mark, but the command make upgrade -C tools/version-tracker PROJECT=kubernetes-sigs/kind VERBOSITY=6 stuck at /usr/bin/bash -c make -C /home/ubuntu/eks-anywhere-build-tooling/tools/version-tracker/eks-anywhere-build-tooling/projects/kubernetes-sigs/kind patch-repo command, without output. I guess it's trying to wait for the non-exist tag

Copy link
Member Author

Choose a reason for hiding this comment

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

@d8660091 d8660091 force-pushed the main branch 2 times, most recently from a1b0d34 to a17952d Compare May 30, 2024 18:08
@d8660091
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: d8660091

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eks-distro-bot eks-distro-bot merged commit 55a0058 into aws:main May 31, 2024
89 checks passed
abhay-krishna pushed a commit to abhay-krishna/eks-anywhere-build-tooling that referenced this pull request Jun 25, 2024
abhay-krishna added a commit that referenced this pull request Jun 25, 2024
* Automate Bottlerocket release version updates (#2959)

* Automate Cilium and EKS Distro releases upgrade (#2973)

* Define Go version files for etcdadm bootstrap provider and controller (#2977)

* Extract only the Go binary from GitHub release tarball (#2978)

* Allow different tags for required images in Helm charts (#2983)

* Remove rolesanywhere-credential-helper project from upgrade buildspec (#2987)

* Attempt to apply patches and generate checksums/attribution if successful (#2992)

* Remove newlines from kubeVersion field (#3002)

* Fix checksums and attribution generation during upgrade (#3009)

* Fix condition for patches warning comment on upgrade PRs (#3038)

* Fix attribution and checksum generation for successful patch application (#3060)

* Fix Bottlerocket host container metadata files (#3075)

* Support upgrading release-branched projects (#3066)

* Filter out pre-release tags in upgrader flow (#3089)

* Handle cases where GitHub release does not exist for tag (#3116)

* Fix Go mod location for cluster-autoscaler (#3127)

* Allow upgrading projects tracked with commits (#3136)

* Fix pre-release detection logic when fetching latest GitHub revision (#3140)

* Fix cert-manager GitHub release tarball name (#3142)

* Handle patches application for release-branched projects (#3150)

* Allow projects to selectively upgrade to pre-release tags (#3164)

* Remove dependencies for EKS Distro version upgrade step (#3166)

* Refactor latest release logic for EKS Distro upgrades (#3174)

* Fix the issue of patch repo in upgrade cmd (#3220)

* Make image-builder upgrade flow non-release-branched (#3234)

* Use latest release branch by default if not defined, fall back to Github file for Go versions (#3244)

* Avoid printing directory name for Make command (#3249)

* Use go.mod file to retrieve cert-manager Go version (#3273)

* Exclude GitHub Helm chart release tags (#3320)

* Allow project upgrades on release branch (#3275)

* Use Go 1.22 to build version tracker binary (#3081)

---------

Co-authored-by: Xu Deng <xudeng@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants