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

✨refactor: update to use new community ami account #5133

Merged
merged 3 commits into from
Oct 23, 2024
Merged

✨refactor: update to use new community ami account #5133

merged 3 commits into from
Oct 23, 2024

Conversation

richardcase
Copy link
Member

@richardcase richardcase commented Oct 4, 2024 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:

Updates to the project to start using the new CNCF owned AWS account for publishing AMIs. The code has had the old VMWare account removed and the new account ID added. Additionally the docs have been updated including clarifying that the public AMIs should only be used for non-production usage.

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

Special notes for your reviewer:

A new GitHub Actions workflow (see #5138 ) can be invoked to publish new images. Also #5169 will be done as a follow-up.

Checklist:

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

Release note:

action required
A new community owned AWS account is now being used for publishing AMIs. The old account owner by a company is no longer accessible and the images are being automatically deleted by AWS. Support for ubuntu 18.04 & 20.04 has been dropped and ubuntu 24.04 is now the default OS if no OS is supplied.

@k8s-ci-robot k8s-ci-robot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 4, 2024
@richardcase richardcase changed the title ✨WIP: refactor: update to use new community ami account WIP: ✨refactor: update to use new community ami account Oct 4, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 4, 2024
@richardcase
Copy link
Member Author

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

nrb
nrb approved these changes Oct 4, 2024
View reviewed changes
Copy link
Contributor

@nrb nrb left a comment

Choose a reason for hiding this comment

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

/lgtm

Looks good, one question on supported versions but it's not a blocker by any means.

docs/book/src/development/amis.md Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2024
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024
@richardcase
Copy link
Member Author

Until #5138 merges and AMIs are published:

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 8, 2024
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 8, 2024
@richardcase richardcase changed the title WIP: ✨refactor: update to use new community ami account ✨refactor: update to use new community ami account Oct 8, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 8, 2024
@richardcase
Copy link
Member Author

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 14, 2024
@richardcase
Copy link
Member Author

/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-build-docker
  • /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-build-docker
  • 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-sigs/prow repository.

@richardcase
Copy link
Member Author

I'm hoping the e2e will pass now 🤞

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

@richardcase
Copy link
Member Author

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

@richardcase
Copy link
Member Author

Excellent, its using the new AMIs:

  �[1mSTEP:�[0m Searching for AMI: name=capa-ami-ubuntu-24.04-v1.29.9* �[38;5;243m@ 10/15/24 09:51:52.365�[0m
  �[1mSTEP:�[0m Using AMI: image-id=ami-052cf6cadd89abb96 �[38;5;243m@ 10/15/24 09:51:52.759�[0m

@richardcase
feat: update e2e test config and docs changes
29e991b 
This updates the kubernetes versions used in the e2e tests to use k8s
versions that we AMIs for. It also marks some of the old CSI tests as
pending and some upgrade tests as pending (which will be re-enabled
at a later time).

A few minor docs updates have been made as a result of review.

Signed-off-by: Richard Case <[email protected]>
@richardcase
Copy link
Member Author

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

3 similar comments
@richardcase
Copy link
Member Author

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

@richardcase
Copy link
Member Author

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

@richardcase
Copy link
Member Author

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

@richardcase
Copy link
Member Author

The e2e tests are passing 🎉 I have created 5169 to re-enable 3 tests that have been disabled.

damdo
damdo reviewed Oct 22, 2024
View reviewed changes
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Great work here @richardcase
Thanks for working hard on this!

/lgtm

/assign @AndiDog @dlipovetsky @Ankitasw @nrb
For approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 22, 2024
@richardcase
Copy link
Member Author

Also, should we cherry pick this so we can do a v2.6.2 release?

@damdo
Copy link
Member

damdo commented Oct 22, 2024

Yeah +1 for that

@richardcase
Copy link
Member Author

/cherrypick release-2.6

@k8s-infra-cherrypick-robot
Copy link

@richardcase: once the present PR merges, I will cherry-pick it on top of release-2.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.6

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-sigs/prow repository.

@damdo damdo mentioned this pull request Oct 23, 2024
Open
5 tasks
@damdo damdo requested a review from AndiDog October 23, 2024 07:41
@damdo
Copy link
Member

damdo commented Oct 23, 2024

@richardcase does this one also close #5161 ?
If so, should we mark this PR as fixes #5161 so it autocloses?

@richardcase
Copy link
Member Author

@richardcase does this one also close #5161 ? If so, should we mark this PR as fixes #5161 so it autocloses?

Yes it does, thanks @damdo for thinking of that. I have updated the description.

@nrb
Copy link
Contributor

nrb commented Oct 23, 2024

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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 Oct 23, 2024
@k8s-ci-robot k8s-ci-robot merged commit b25eef6 into kubernetes-sigs:main Oct 23, 2024
23 checks passed
@k8s-infra-cherrypick-robot
Copy link

@richardcase: #5133 failed to apply on top of branch "release-2.6":

Applying: refactor: update to use new community ami account
Applying: docs: updates the docs and e2e
Applying: feat: update e2e test config and docs changes
Using index info to reconstruct a base tree...
M	test/e2e/data/e2e_conf.yaml
M	test/e2e/suites/unmanaged/helpers_test.go
M	test/e2e/suites/unmanaged/unmanaged_functional_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/suites/unmanaged/unmanaged_functional_test.go
Auto-merging test/e2e/suites/unmanaged/helpers_test.go
Auto-merging test/e2e/data/e2e_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_conf.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0003 feat: update e2e test config and docs changes

In response to this:

/cherrypick release-2.6

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-sigs/prow repository.

This was referenced Oct 23, 2024
Closed
Closed
@richardcase richardcase mentioned this pull request Oct 23, 2024
Closed
5 tasks
@AndiDog AndiDog mentioned this pull request Nov 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damdo damdo damdo left review comments

@nrb nrb nrb approved these changes

@Ankitasw Ankitasw Awaiting requested review from Ankitasw

@killianmuldoon killianmuldoon Awaiting requested review from killianmuldoon

@AndiDog AndiDog Awaiting requested review from AndiDog

Assignees

@nrb nrb

@AndiDog AndiDog

@dlipovetsky dlipovetsky

@damdo damdo

@Ankitasw Ankitasw

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. 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.

Ensure e2e are passing before v2.7.0 release
8 participants
@richardcase @k8s-ci-robot @damdo @k8s-infra-cherrypick-robot @nrb @AndiDog @dlipovetsky @Ankitasw