✨Bump CAPI to v1.6.0-rc.1 #308

furkatgofurov7 · 2023-10-31T09:36:00Z

What this PR does / why we need it:
Bumps CAPI to v1.6.0-rc.1 in main branch following https://main.cluster-api.sigs.k8s.io/developer/providers/migrations/v1.5-to-v1.6 migration guide

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 #299

/hold

Danil-Grigorev · 2023-11-28T15:04:56Z

@furkatgofurov7 Can you please update it to the latest CAPI version?

furkatgofurov7 · 2023-11-28T16:36:53Z

@Danil-Grigorev @alexander-demicev @Fedosin
I updated the PR to rc.0 (rc.1 should be out today, I'll probably bump to that version), however, it still needs some work in enabling secure diagnostics, I should be able to complete it by EOD and ping you here once it is ready

furkatgofurov7 · 2023-11-28T16:39:32Z

internal/envtest/environment.go

@@ -137,7 +145,7 @@ func New(uncachedObjs ...client.Object) *Environment {
 	}

 	// Set minNodeStartupTimeout for Test, so it does not need to be at least 30s
-	clusterv1.SetMinNodeStartupTimeout(metav1.Duration{Duration: 1 * time.Millisecond})


this is commented out now, because SetMinNodeStartupTimeout has been moved to internal package and I am not sure if we should have something similar in operator code or we can just drop it

furkatgofurov7 · 2023-11-29T11:08:37Z

/test pull-cluster-api-operator-e2e-main

furkatgofurov7 · 2023-11-29T17:55:48Z

/hold cancel

@alexander-demicev @Fedosin @Danil-Grigorev it should be ready for review now

Danil-Grigorev · 2023-11-29T21:45:46Z

/lgtm

k8s-ci-robot · 2023-11-29T21:45:53Z

LGTM label has been added.

Git tree hash: 3a79ea1dddad2f0ec784d8f4477e0495f76974d7

Fedosin · 2023-11-29T21:58:26Z

internal/controller/component_customizer.go

@@ -190,10 +190,6 @@ func customizeManagerContainer(mSpec *operatorv1.ManagerSpec, c *corev1.Containe
 		c.Args = leaderElectionArgs(mSpec.LeaderElection, c.Args)
 	}

-	if mSpec.Metrics.BindAddress != "" {


This option is used by CAPI providers:

CAPA: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/main.go#L452

CAPZ: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/main.go#L591

If we delete this, users won't be able to configure metrics anymore. Plus, it's a breaking change in our API, so we have to release v1alpha3 to accept this.

Have you checked kubernetes-sigs/cluster-api#9264 upstream in CAPI? Both above providers are still using it, yes , but that is because they have not yet bumped to CAPI v1.6 AFAIK and 9264 suggests to remove --metrics-bind-addr and use --diagnostics-address=<addr> instead which should have same behaviour

We want to maintain support for installing older versions too... In other words, we want to allow CAPI operator to install CAPI providers with versions less than 1.6 without introducing breaking changes. With this change, if I have current versions of CAPA or CAPZ installed with modified metrics bind address, it works with CAPI operator v0.7.0, but won't work with v0.8.0.
IMO, we need to keep support of metrics-bind-addr (at least for several releases, before we introduce v1beta1), but also add diagnostics-address to our API. Potentially, we can implement a webhook conversion: metrics-bind-addr -> diagnostics-address.

Interesting, but then how about other providers removing it without any conversions (I saw a couple of them: CAPO, CAPZ)?

Can we keep both and mark metrics-bind-addr as deprecated? I can see this is what is done in CAPI https://github.com/kubernetes-sigs/cluster-api/blob/main/util/flags/diagnostics.go#L45

As this is just a configuration value, it could be left in place, with the validation webhook preventing simultaneous use of both.

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

…values Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

alexander-demicev

/approve

k8s-ci-robot · 2023-12-05T09:58:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexander-demicev

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~~ [alexander-demicev]

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

Fedosin

/lgtm

k8s-ci-robot · 2023-12-05T11:03:42Z

LGTM label has been added.

Git tree hash: d368ca0c0a8066c1b9f5f854352dbc5b8af5b9ea

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 31, 2023

k8s-ci-robot requested review from Fedosin and JoelSpeed October 31, 2023 09:36

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 31, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 6fa8833 to 027652d Compare October 31, 2023 09:48

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 1, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 027652d to 0ee9d8b Compare November 2, 2023 08:35

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 2, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 0ee9d8b to 6a77079 Compare November 28, 2023 15:32

furkatgofurov7 changed the title ~~✨Bump CAPI to v1.6.0-beta.0~~ ✨Bump CAPI to v1.6.0-rc.0 Nov 28, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 6a77079 to 80feab8 Compare November 28, 2023 15:37

furkatgofurov7 closed this Nov 28, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 80feab8 to d0f318d Compare November 28, 2023 15:38

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 28, 2023

furkatgofurov7 reopened this Nov 28, 2023

k8s-ci-robot 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 Nov 28, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 259e4ae to c9d8701 Compare November 28, 2023 16:09

furkatgofurov7 commented Nov 28, 2023

View reviewed changes

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2023

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch 3 times, most recently from 2368beb to 407d091 Compare November 29, 2023 10:25

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 407d091 to ebc5c58 Compare November 29, 2023 12:20

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch 6 times, most recently from 81d7bcc to 5412f2b Compare November 29, 2023 17:19

furkatgofurov7 changed the title ~~✨Bump CAPI to v1.6.0-rc.0~~ ✨Bump CAPI to v1.6.0-rc.1 Nov 29, 2023

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 29, 2023

k8s-ci-robot assigned Danil-Grigorev Nov 29, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2023

Fedosin reviewed Nov 29, 2023

View reviewed changes

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 5412f2b to 35977d1 Compare November 30, 2023 10:51

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2023

k8s-ci-robot requested a review from Danil-Grigorev November 30, 2023 10:51

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from b35911f to 0ce9d97 Compare December 1, 2023 09:27

furkatgofurov7 added 2 commits December 1, 2023 17:29

Bump CAPI to v1.6.0-rc.1

f83b1ad

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

Expose diagnosticsAddress and insecureDiagnostics through helm chart …

91b7103

…values Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

furkatgofurov7 force-pushed the bump-beta-capi-1-6 branch from 0ce9d97 to 91b7103 Compare December 1, 2023 15:45

alexander-demicev approved these changes Dec 5, 2023

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2023

Fedosin approved these changes Dec 5, 2023

View reviewed changes

k8s-ci-robot assigned Fedosin Dec 5, 2023

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

k8s-ci-robot merged commit 55b2c9c into kubernetes-sigs:main Dec 5, 2023
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨Bump CAPI to v1.6.0-rc.1 #308

✨Bump CAPI to v1.6.0-rc.1 #308

furkatgofurov7 commented Oct 31, 2023 •

edited

Loading

Danil-Grigorev commented Nov 28, 2023

furkatgofurov7 commented Nov 28, 2023

furkatgofurov7 Nov 28, 2023

furkatgofurov7 commented Nov 29, 2023

furkatgofurov7 commented Nov 29, 2023

Danil-Grigorev commented Nov 29, 2023

k8s-ci-robot commented Nov 29, 2023

Fedosin Nov 29, 2023

furkatgofurov7 Nov 30, 2023

Fedosin Nov 30, 2023

furkatgofurov7 Nov 30, 2023

alexander-demicev Nov 30, 2023

Danil-Grigorev Dec 1, 2023

alexander-demicev left a comment

k8s-ci-robot commented Dec 5, 2023

Fedosin left a comment

k8s-ci-robot commented Dec 5, 2023

✨Bump CAPI to v1.6.0-rc.1 #308

✨Bump CAPI to v1.6.0-rc.1 #308

Conversation

furkatgofurov7 commented Oct 31, 2023 • edited Loading

Danil-Grigorev commented Nov 28, 2023

furkatgofurov7 commented Nov 28, 2023

furkatgofurov7 Nov 28, 2023

Choose a reason for hiding this comment

furkatgofurov7 commented Nov 29, 2023

furkatgofurov7 commented Nov 29, 2023

Danil-Grigorev commented Nov 29, 2023

k8s-ci-robot commented Nov 29, 2023

Fedosin Nov 29, 2023

Choose a reason for hiding this comment

furkatgofurov7 Nov 30, 2023

Choose a reason for hiding this comment

Fedosin Nov 30, 2023

Choose a reason for hiding this comment

furkatgofurov7 Nov 30, 2023

Choose a reason for hiding this comment

alexander-demicev Nov 30, 2023

Choose a reason for hiding this comment

Danil-Grigorev Dec 1, 2023

Choose a reason for hiding this comment

alexander-demicev left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Dec 5, 2023

Fedosin left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Dec 5, 2023

furkatgofurov7 commented Oct 31, 2023 •

edited

Loading