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

🌱 Import CAPI v1.6.0 #1731

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Conversation

EmilienM
Copy link
Contributor

@EmilienM EmilienM commented Oct 20, 2023

What this PR does / why we need it:

  • Vendoring:

    • Import CAPI v1.6.0
    • controller-runtime v0.16.3
    • kubernetes v1.28.3
    • other deps bumps
  • Code updates:

    • Makefile: use the new CAPI
    • main: convert deprecated metrics binding server to diagnostics arguments, like requested by CAPI. I followed the exact same pattern as CAPZ who also followed what is recommended in CAPI
    • main: update RBAC for diagnostics
    • main: update cache and clients fields for new CAPI API
    • config manager: use the new diagnostics args
    • update e2e manifests for using new CAPI

Fixes #1734

TODOs:

  • squashed commits - we don't squash since it involves vendoring.
  • if necessary:
    • includes documentation - no doc update is needed.
    • adds unit tests - no test updates are needed.

@netlify
Copy link

netlify bot commented Oct 20, 2023

Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name Link
🔨 Latest commit 6a792da
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/6571cc5212c1890008503d7a
😎 Deploy Preview https://deploy-preview-1731--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 20, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 20, 2023
@EmilienM EmilienM changed the title Bump controller-runtime to v0.16.2 🌱 Bump controller-runtime to v0.16.2 Oct 20, 2023
@EmilienM
Copy link
Contributor Author

/assign mdbooth

@EmilienM EmilienM changed the title 🌱 Bump controller-runtime to v0.16.2 🌱 Bump controller-runtime to v0.16.2 and deps Oct 20, 2023
main.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@EmilienM
Copy link
Contributor Author

/hold
I'll come back to it once we have a new CAPI release.

@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 23, 2023
@EmilienM EmilienM closed this Oct 23, 2023
@EmilienM EmilienM reopened this Oct 23, 2023
go.mod Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2023
@EmilienM EmilienM changed the title 🌱 Bump controller-runtime to v0.16.2 and deps 🌱 Import CAPI v1.6.0-beta.0 Nov 1, 2023
@EmilienM
Copy link
Contributor Author

EmilienM commented Nov 1, 2023

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

@EmilienM
Copy link
Contributor Author

EmilienM commented Nov 3, 2023

I'm trying to bump Golang into a separate PR if possible, so we separate problems and fix them one by one: #1740

@EmilienM EmilienM force-pushed the cr-bump branch 2 times, most recently from 88b7516 to b605574 Compare November 3, 2023 15:13
@EmilienM
Copy link
Contributor Author

EmilienM commented Nov 6, 2023

This is working, cool. We are now waiting for the final CAPI 1.6.0 release (end of November), then I'll update the vendoring but the other commit should be an easy update.

Copy link
Contributor

@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.

Looks great!
Waiting with LGTM until the release is finalized

main.go Show resolved Hide resolved
@EmilienM
Copy link
Contributor Author

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

@mdbooth mdbooth force-pushed the cr-bump branch 2 times, most recently from 004ae65 to 1a76ab7 Compare December 7, 2023 12:00
@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

@EmilienM FYI I bumped this to the release version.

I'm not 100% sure about the removal of --metrics-bind-addr. This feels like a significant breaking change. We should examine it carefully and if it's definitely necessary we need to document it.

I see controller-runtime now supports secure metrics with kubernetes-sigs/controller-runtime#2407. I'm guessing we probably need to continue to support insecure metrics, though. In fact, would we need to add support for secure metrics by passing in a cert to use?

Comment on lines 34 to 36
- containerPort: 8443
name: metrics
protocol: TCP
Copy link
Contributor

Choose a reason for hiding this comment

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

Hah, we were never exposing port 8080 anyway!

Comment on lines 25 to 26
- "--diagnostics-address=${CAPO_DIAGNOSTICS_ADDRESS:=:8443}"
- "--insecure-diagnostics=${CAPO_INSECURE_DIAGNOSTICS:=false}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Until we've sorted out how we want to expose secure metrics, please can we put this back to the old, insecure. Also I'd prefer not to add new cluster api variables for substitution in this change. Lets do that separately and deliberately when we understand this feature.

For now we could either:

  • Leave it as it is. --metrics-bind-addr is deprecated but still works and has the same behaviour as before.
  • Change it to --diagnostics-address=localhost:8080 --insecure-diagnostics=true, which keeps the same behaviour but without using the deprecated flag.

My feeling is that the prudent option is to entire revert the change to this file, leaving it exactly as it was before, and open an issue to track adding support for secure metrics.

@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

Given that --metrics-bind-addr is still supported I think this doesn't have to be a breaking change. However, we're changing the default behaviour in the templates which is a breaking change. We should revert that part of the change.

I think if we revert the change to config/manager/manager.yaml this is no longer breaking change.

I pre-emptively opened an issue to track adding it properly: #1777

@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

Lets re-run the tests with the command line arguments change reverted...

@EmilienM EmilienM changed the title 🌱 Import CAPI v1.6.0-beta.0 🌱 Import CAPI v1.6.0 Dec 7, 2023
@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, mdbooth

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 Dec 7, 2023
@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

/hold cancel

@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 Dec 7, 2023
@mdbooth
Copy link
Contributor

mdbooth commented Dec 7, 2023

/cherry-pick release-0.9

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-0.9

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.

@k8s-ci-robot k8s-ci-robot merged commit 7961f21 into kubernetes-sigs:main Dec 7, 2023
9 checks passed
@k8s-infra-cherrypick-robot

@mdbooth: new pull request created: #1780

In response to this:

/cherry-pick release-0.9

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CAPI v1.6.0-beta.0 has been released and is ready for testing
8 participants