Skip to content

✨ Bump cluster-api to v1.6.0 #1341

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
Merged
metal3-io-bot merged 1 commit into from
Dec 11, 2023
Merged

✨ Bump cluster-api to v1.6.0 #1341

metal3-io-bot merged 1 commit into from
Dec 11, 2023

Conversation

@kashifest
Copy link
Member

@kashifest kashifest commented Nov 24, 2023 •
edited
Loading

As the title says. It follows the kubernetes-sigs/cluster-api#9264 PR as suggested by CAPI book here https://main.cluster-api.sigs.k8s.io/developer/providers/migrations/v1.5-to-v1.6#suggested-changes-for-providers

Copying from CAPI PR Description:

Changes to flags

deprecate --metrics-bind-addr flag
add new flag --diagnostics-address (default: :8443)
add new flag --insecure-diagnostics (default: false)

With the following behavior

  • If --metrics-bind-addr=<addr> is set:

    • metrics are served on http without authentication/authorization (as today)

  • If --diagnostics-address=<addr> --insecure-diagnostics is set

    • same behavior as --metrics-bind-addr

  • If --diagnostics-address is set

    • metrics are served on https with authentication/authorization
    • in addition pprof endpoints and an endpoint to change the log level are served (also protected)

Default behavior:

  • controller binary:

    • without any flags set: secure serving on :8443
    • with --metrics-bind-addr set: insecure serving on the specified address (as before)

  • published component YAMLs:

    • without any env vars set: secure serving on :8443
    • with CAPM3_DIAGNOSTICS_ADDRESS=localhost:8080 & CAPM3_INSECURE_DIAGNOSTICS=true: insecure serving on localhost:8080

@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. needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 24, 2023
@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 694b0b8 to f955b14 Compare November 24, 2023 08:19
@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 Nov 24, 2023
@kashifest
Copy link
Member Author

kashifest commented Nov 24, 2023

/test-centos-e2e-integration-main

@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 Nov 24, 2023
@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from f955b14 to 1d06f65 Compare November 27, 2023 15:07
@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 Nov 27, 2023
@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 1d06f65 to 75e703f Compare November 28, 2023 10:35
@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 Nov 28, 2023
@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 75e703f to f6d8b52 Compare November 28, 2023 10:40
@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 Nov 28, 2023
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

1 similar comment
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-ubuntu-e2e-feature-main

1 similar comment
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-ubuntu-e2e-feature-main

@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

3 similar comments
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from ffafad9 to 245b921 Compare November 28, 2023 16:57
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

1 similar comment
@kashifest
Copy link
Member Author

kashifest commented Nov 28, 2023

/test-centos-e2e-integration-main

@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 245b921 to 6e806ae Compare November 28, 2023 17:19
@kashifest
Copy link
Member Author

kashifest commented Nov 29, 2023

/keep-test-centos-e2e-integration-main

1 similar comment
@kashifest
Copy link
Member Author

kashifest commented Nov 29, 2023

/keep-test-centos-e2e-integration-main

@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch 2 times, most recently from ea71dcc to 7f1366b Compare November 29, 2023 08:50
@kashifest
Copy link
Member Author

kashifest commented Nov 29, 2023

/keep-test-centos-e2e-integration-main

smoshiur1237
smoshiur1237 previously approved these changes Dec 5, 2023
View reviewed changes
Copy link
Member

@smoshiur1237 smoshiur1237 left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2023
lentzi90
lentzi90 reviewed Dec 5, 2023
View reviewed changes
Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/approve

@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 3ab1905 to 7078ce5 Compare December 5, 2023 11:39
@metal3-io-bot metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2023
@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from 7078ce5 to ba0dbfc Compare December 7, 2023 14:00
@kashifest
Copy link
Member Author

kashifest commented Dec 7, 2023

/test-ubuntu-integration-main

@Sunnatillo
Copy link
Member

Sunnatillo commented Dec 8, 2023

/test-centos-e2e-integration-main

Rozzii
Rozzii previously approved these changes Dec 8, 2023
View reviewed changes
Copy link
Member

@Rozzii Rozzii left a comment

Choose a reason for hiding this comment

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

/lgtm

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

metal3-io-bot commented Dec 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furkatgofurov7, lentzi90, Rozzii, smoshiur1237

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,lentzi90]

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 added the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Dec 10, 2023
@furkatgofurov7
Copy link
Member

furkatgofurov7 commented Dec 11, 2023

@kashifest can you rebase the PR?

@kashifest kashifest force-pushed the prepare/capi-v1.6-kashif branch from ba0dbfc to f067b5b Compare December 11, 2023 09:31
@metal3-io-bot metal3-io-bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 11, 2023
Sunnatillo
Sunnatillo reviewed Dec 11, 2023
View reviewed changes
Copy link
Member

@Sunnatillo Sunnatillo left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2023
@kashifest kashifest mentioned this pull request Dec 11, 2023
Merged
@kashifest
Copy link
Member Author

kashifest commented Dec 11, 2023

/hold cancel

@metal3-io-bot metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 11, 2023
@kashifest kashifest changed the title ✨ Prepare CAPM3 main branch for CAPI v1.6 ✨ Bump cluster-api to v1.6.0 Dec 11, 2023
@kashifest
Copy link
Member Author

kashifest commented Dec 11, 2023

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

1 similar comment
@kashifest
Copy link
Member Author

kashifest commented Dec 11, 2023

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

@metal3-io-bot metal3-io-bot merged commit aaf4dcc into metal3-io:main Dec 11, 2023
@metal3-io-bot metal3-io-bot deleted the prepare/capi-v1.6-kashif branch December 11, 2023 14:18
@tuminoid tuminoid mentioned this pull request Jan 24, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tuminoid tuminoid tuminoid left review comments

@Sunnatillo Sunnatillo Sunnatillo left review comments

@Rozzii Rozzii Rozzii left review comments

@smoshiur1237 smoshiur1237 smoshiur1237 left review comments

+2 more reviewers

@lentzi90 lentzi90 lentzi90 left review comments

@furkatgofurov7 furkatgofurov7 furkatgofurov7 approved these changes

Reviewers whose approvals may not affect merge requirements

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.

8 participants

@kashifest @Sunnatillo @metal3-io-bot @furkatgofurov7 @tuminoid @lentzi90 @Rozzii @smoshiur1237