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 CAPI to v1.5.0 #1079

Merged
merged 1 commit into from
Aug 16, 2023
Merged

⚠️ Bump CAPI to v1.5.0 #1079

merged 1 commit into from
Aug 16, 2023

Conversation

Sunnatillo
Copy link
Member

@Sunnatillo Sunnatillo commented Jul 6, 2023 •
edited
Loading

🌱 This PR uplifts:

  1. CAPI to v1.5.0
  2. CR to v0.15.1
  3. Controller-tools to v0.12.0

Also:

  • Uplifts IPAM to main branch (temporarily, until next release of IPAM)
  • Adds WithStatusSubresource to fake client, due to status handling changes in CR v0.15.0
  • Adds finalizers to objects with deletionTimeStamp due to changes in CR v0.15.0
  • Adjusts webhooks to support warnings due to change in CR v0.15.0
  • Introduces CAPI_CONFIG_FOLDER variable since CAPI started following XDG standard

@metal3-io-bot metal3-io-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 6, 2023
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 126ee36 to 3d4482e Compare July 13, 2023 11:30
@metal3-io-bot metal3-io-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 13, 2023
@metal3-io-bot metal3-io-bot added the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2023
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 3d4482e to 0bf3c79 Compare August 1, 2023 15:16
@metal3-io-bot metal3-io-bot removed the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Aug 1, 2023
@Sunnatillo Sunnatillo changed the title WIP: Test capi v1.5.0-beta.1 WIP: Bump capi v1.5.0 Aug 1, 2023
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 0bf3c79 to 4655ce1 Compare August 1, 2023 19:29
@Sunnatillo Sunnatillo changed the title WIP: Bump capi v1.5.0 Bump capi v1.5.0 Aug 1, 2023
@metal3-io-bot metal3-io-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 1, 2023
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main
/test-ubuntu-e2e-integration-main
/test-ubuntu-integration-main
/test-centos-integration-main
/test-centos-e2e-feature-main

@Sunnatillo Sunnatillo changed the title Bump capi v1.5.0 Bump capi v1.5.0, CR v0.15.0 Aug 1, 2023
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch 5 times, most recently from 7d705e5 to 554223c Compare August 7, 2023 06:57
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

@Sunnatillo
Copy link
Member Author

/test-ubuntu-integration-main

@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 554223c to 523bd56 Compare August 7, 2023 12:57
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

@Sunnatillo
Copy link
Member Author

/test-ubuntu-e2e-integration-main
/test-centos-integration-main
/test-centos-e2e-feature-main
/test-e2e-upgrade-main-from-release-1-4
/test-e2e-1-26-1-27-upgrade-main

@Sunnatillo
Copy link
Member Author

/test-centos-e2e-feature-main

1 similar comment
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-feature-main

@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 523bd56 to edfd136 Compare August 7, 2023 20:36
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-feature-main

@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from edfd136 to aabd933 Compare August 10, 2023 09:16
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main
/test-ubuntu-e2e-integration-main
/test-ubuntu-integration-main
/test-centos-integration-main
/test-e2e-upgrade-main-from-release-1-4
/test-e2e-1-26-1-27-upgrade-main

furkatgofurov7
furkatgofurov7 reviewed Aug 15, 2023
View reviewed changes
api/go.mod Outdated Show resolved Hide resolved
api/go.mod Show resolved Hide resolved
api/v1beta1/metal3datatemplate_webhook_test.go Show resolved Hide resolved
@furkatgofurov7
Copy link
Member

/retitle ⚠️ Bump CAPI to v1.5.0

omitting CR bump in the PR title due to it is a dependency of CAPI and comes with it automatically

@metal3-io-bot metal3-io-bot changed the title Bump capi v1.5.0, CR v0.15.0 ⚠️ Bump CAPI to v1.5.0 Aug 15, 2023
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch 3 times, most recently from 7b5506b to 49308b0 Compare August 15, 2023 13:33
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main

furkatgofurov7
furkatgofurov7 reviewed Aug 15, 2023
View reviewed changes
Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Thanks, this is almost there to be ready, except below missing parts:

@furkatgofurov7 furkatgofurov7 mentioned this pull request Aug 15, 2023
Closed
@Sunnatillo Sunnatillo force-pushed the test-capi-release-1.5.0-beta/sunnat branch from 49308b0 to e1a97f4 Compare August 15, 2023 14:30
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-integration-main
/test-ubuntu-e2e-integration-main

@Sunnatillo
Copy link
Member Author

/test-ubuntu-integration-main
/test-centos-integration-main
/test-centos-e2e-feature-main
/test-e2e-upgrade-main-from-release-1-4
/test-e2e-1-26-1-27-upgrade-main

@Sunnatillo
Copy link
Member Author

Thanks, this is almost there to be ready, except below missing parts:

Thank you for explaining. Now I got the way how we do it.

@Sunnatillo
Copy link
Member Author

/test-ubuntu-integration-main
/test-centos-integration-main
/test-centos-e2e-feature-main
/test-e2e-upgrade-main-from-release-1-4
/test-e2e-1-26-1-27-upgrade-main

@Sunnatillo
Copy link
Member Author

/test-centos-e2e-feature-main

1 similar comment
@Sunnatillo
Copy link
Member Author

/test-centos-e2e-feature-main

@kashifest
Copy link
Member

/approve

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2023
@adilGhaffarDev
Copy link
Member

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2023
@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furkatgofurov7, kashifest

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:
  • OWNERS [furkatgofurov7,kashifest]

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

@metal3-io-bot metal3-io-bot merged commit 80164d7 into metal3-io:main Aug 16, 2023
30 checks passed
@Sunnatillo Sunnatillo deleted the test-capi-release-1.5.0-beta/sunnat branch August 16, 2023 12:48
@Sunnatillo Sunnatillo mentioned this pull request Aug 17, 2023
Closed
furkatgofurov7
furkatgofurov7 reviewed Aug 17, 2023
View reviewed changes
scripts/ci-e2e.sh
Comment on lines +32 to +33
M3_DEV_ENV_REPO="https://github.com/Nordix/metal3-dev-env.git"
M3_DEV_ENV_BRANCH=bump-capi-v1.5
Copy link
Member

Choose a reason for hiding this comment

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

We forgot to revert this, and we need to fix it

cc @Sunnatillo

@Sunnatillo Sunnatillo mentioned this pull request Aug 17, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@furkatgofurov7 furkatgofurov7 furkatgofurov7 approved these changes

@kashifest kashifest kashifest approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. 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.

None yet
5 participants
@Sunnatillo @kashifest @furkatgofurov7 @adilGhaffarDev @metal3-io-bot