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

Jump to bottom

Bump golang to v1.20.5 and kpromo to v4.0.4 #4393

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Bump golang to v1.20.5 and kpromo to v4.0.4 #4393

merged 1 commit into from
Jul 24, 2023

Conversation

Ankitasw
Copy link
Member

@Ankitasw Ankitasw commented Jul 13, 2023 •
edited
Loading

What type of PR is this?
/kind support

What this PR does / why we need it:
This pr bumps golang to v1.20.5 and kpromo to v4.0.4, hence resolving issues faced while using make promote-images target.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

Bump golang to v1.20.5 and kpromo to v4.0.4

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. labels Jul 13, 2023
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 13, 2023
@Ankitasw Ankitasw removed the request for review from luthermonson July 13, 2023 06:30
@Ankitasw Ankitasw force-pushed the bump-golang branch 3 times, most recently from d73f212 to d62d0ae Compare July 13, 2023 06:45
@Ankitasw
Copy link
Member Author

/retest

@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e

@richardcase
Copy link
Member

/test ?

@k8s-ci-robot
Copy link
Contributor

@richardcase: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-aws-build
  • /test pull-cluster-api-provider-aws-test
  • /test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-aws-apidiff-main
  • /test pull-cluster-api-provider-aws-e2e
  • /test pull-cluster-api-provider-aws-e2e-blocking
  • /test pull-cluster-api-provider-aws-e2e-clusterclass
  • /test pull-cluster-api-provider-aws-e2e-conformance
  • /test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-aws-e2e-eks
  • /test pull-cluster-api-provider-aws-e2e-eks-gc
  • /test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-aws-apidiff-main
  • pull-cluster-api-provider-aws-build
  • pull-cluster-api-provider-aws-test
  • pull-cluster-api-provider-aws-verify

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e-eks

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2023
@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e

@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-eks

@Ankitasw
Copy link
Member Author

@AverageMarcus can I get 👀 on this?

AverageMarcus
AverageMarcus reviewed Jul 24, 2023
View reviewed changes
Copy link
Member

@AverageMarcus AverageMarcus left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 24, 2023
@Ankitasw
Copy link
Member Author

make promote-images target works fine with this change.

@Ankitasw
Copy link
Member Author

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2023
@k8s-ci-robot k8s-ci-robot merged commit aa4d6cb into kubernetes-sigs:main Jul 24, 2023
5 checks passed
@Ankitasw
Copy link
Member Author

/cherry-pick release-2.2

@k8s-infra-cherrypick-robot
Copy link

@Ankitasw: #4393 failed to apply on top of branch "release-2.2":

Applying: Bump golang to v1.20.5 and kpromo to v4.0.4
Using index info to reconstruct a base tree...
M	go.mod
M	hack/tools/go.mod
M	hack/tools/go.sum
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump golang to v1.20.5 and kpromo to v4.0.4
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Ankitasw Ankitasw deleted the bump-golang branch July 24, 2023 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AverageMarcus AverageMarcus AverageMarcus left review comments

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@AverageMarcus AverageMarcus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/support Categorizes issue or PR as a support question. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Ankitasw @richardcase @k8s-ci-robot @k8s-infra-cherrypick-robot @AverageMarcus