Bump CAPI to v1.6.0 #4182

mboersma · 2023-10-26T12:25:48Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.6.0 and all that entails.

Which issue(s) this PR fixes:

Fixes #4179

Special notes for your reviewer:

See the migration guide for information on the changes ~~still needed. I'll update this soon.~~ Edit: updated.

cherry-pick candidate

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Bump CAPI to v1.6.0

codecov · 2023-10-26T21:10:15Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f1020e4) 60.89% compared to head (703a98b) 60.88%.
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4182      +/-   ##
==========================================
- Coverage   60.89%   60.88%   -0.02%     
==========================================
  Files         190      190              
  Lines       18983    18983              
==========================================
- Hits        11559    11557       -2     
- Misses       6787     6789       +2     
  Partials      637      637

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

willie-yao · 2023-10-31T18:33:30Z

Can you add "Fixes #4179" to the PR description?

mboersma · 2023-11-01T17:33:45Z

/retitle [WIP] Bump CAPI to v1.6.0-beta.1

mboersma · 2023-11-02T21:32:18Z

/retest

main.go

mboersma · 2023-12-06T16:18:34Z

@CecileRobertMichon had pointed out:

We should resolve this TODO as part of the bump to 1.6: https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/4155/files#diff-d9eb31526af707f3d2dce573325c8fa31a1bd228821de366d45f88992a1d6a33R69

I made an attempt at fixing this with @willie-yao but didn't get it working. I can try again, or I can fix it in a separate PR.

mboersma · 2023-12-06T21:35:11Z

I can try again, or I can fix it in a separate PR.

I think I got it this time: a3d8384

mboersma · 2023-12-07T01:09:13Z

I think we should also bump cert-manager to v1.13.2 (in this PR or immediately afterward). See kubernetes-sigs/cluster-api@9ee475f

Edit: done.

CecileRobertMichon · 2023-12-07T23:20:30Z

Makefile

@@ -475,6 +475,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 		output:webhook:dir=$(WEBHOOK_ROOT) \
 		webhook
 	$(CONTROLLER_GEN) \
+		paths=./ \


why the added path here?

main.go now includes some kubebuilder annotations for RBAC related to the secure metrics endpoint changes in kubernetes-sigs/cluster-api#9264 so this probably should have been added before in #4248.

cluster-api-provider-azure/main.go

Lines 246 to 248 in 9e6361a

// Add RBAC for the authorized diagnostics endpoint.

// +kubebuilder:rbac:groups=authentication.k8s.io,resources=tokenreviews,verbs=create

// +kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create

CecileRobertMichon · 2023-12-07T23:23:50Z

test/e2e/aks_clusterclass.go

 	Eventually(func(g Gomega) {
 		err = mgmtClient.Get(ctx, types.NamespacedName{
-			Namespace: input.Cluster.Namespace,
-			Name:      input.Cluster.Name + "-pool0",
+			Namespace: clusterClass.Spec.Workers.MachinePools[0].Template.Infrastructure.Ref.Namespace,


could we range over the MachinePools and use the index instead of hardcoding to 0 here?

nojnhuh

/lgtm

k8s-ci-robot · 2023-12-08T17:45:07Z

LGTM label has been added.

Git tree hash: c3cb6a57a693b1add1bb1068c3fe46e57f64f3e2

mboersma · 2023-12-08T22:51:56Z

/retest

nojnhuh · 2023-12-11T21:14:30Z

@mboersma Was your last push just a rebase with no (or trivial) merge conflicts?

mboersma · 2023-12-11T21:15:45Z

Was your last push just a rebase?

Yes, just to resolve a conflict in go.sum that probably arose because of dependabot PRs.

CecileRobertMichon

/lgtm
/approve

k8s-ci-robot · 2023-12-11T21:17:58Z

LGTM label has been added.

Git tree hash: 082999cd2a3c34ded239d42debf2f21efdb08797

k8s-ci-robot · 2023-12-11T21:17:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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~~ [CecileRobertMichon]

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

nojnhuh · 2023-12-12T00:46:10Z

/retest

k8s-ci-robot requested review from sonasingh46 and willie-yao October 26, 2023 12:25

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 26, 2023

mboersma added this to the v1.12 milestone Oct 26, 2023

mboersma added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Oct 26, 2023

mboersma force-pushed the capi-1.6-incoming branch from 78afca0 to a9cbcb8 Compare October 26, 2023 20:40

mboersma force-pushed the capi-1.6-incoming branch 2 times, most recently from a095a41 to c5d9373 Compare October 31, 2023 22:34

nojnhuh mentioned this pull request Nov 1, 2023

handle clusterctl block-move annotation #4213

Merged

4 tasks

mboersma force-pushed the capi-1.6-incoming branch from c5d9373 to 2b33064 Compare November 1, 2023 17:32

k8s-ci-robot changed the title ~~[WIP] Bump CAPI to v1.6.0-beta.0~~ [WIP] Bump CAPI to v1.6.0-beta.1 Nov 1, 2023

mboersma mentioned this pull request Nov 2, 2023

CAPI v1.6.0-beta.0 has been released and is ready for testing kubernetes-sigs/cluster-api-provider-openstack#1734

Closed

mboersma self-assigned this Nov 2, 2023

mboersma force-pushed the capi-1.6-incoming branch from eca83ec to 7bae2ad Compare November 2, 2023 16:51

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

EmilienM reviewed Nov 6, 2023

View reviewed changes

main.go Outdated Show resolved Hide resolved

mboersma mentioned this pull request Nov 6, 2023

dependabot(deps): bump sigs.k8s.io/cloud-provider-azure from 1.27.7 to 1.28.3 #4234

Closed

mboersma force-pushed the capi-1.6-incoming branch 2 times, most recently from bf3d257 to 7b0159f Compare November 6, 2023 21:06

mboersma removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2023

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

mboersma force-pushed the capi-1.6-incoming branch from 7b0159f to 8356d57 Compare November 8, 2023 16:44

mboersma force-pushed the capi-1.6-incoming branch from a3d8384 to 235be85 Compare December 6, 2023 21:36

mboersma force-pushed the capi-1.6-incoming branch from 235be85 to b62607e Compare December 7, 2023 01:17

mboersma mentioned this pull request Dec 7, 2023

[release-1.12] Bump CAPI to v1.5.4 #4344

Merged

3 tasks

CecileRobertMichon reviewed Dec 7, 2023

View reviewed changes

mboersma force-pushed the capi-1.6-incoming branch from b62607e to b545730 Compare December 8, 2023 17:32

nojnhuh reviewed Dec 8, 2023

View reviewed changes

k8s-ci-robot assigned nojnhuh Dec 8, 2023

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

mboersma mentioned this pull request Dec 11, 2023

dependabot(deps): bump sigs.k8s.io/cluster-api/test from 1.5.3 to 1.6.0 #4356

Closed

Bump CAPI to v1.6.0

703a98b

mboersma force-pushed the capi-1.6-incoming branch from b545730 to 703a98b Compare December 11, 2023 21:10

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

k8s-ci-robot requested a review from nojnhuh December 11, 2023 21:10

CecileRobertMichon reviewed Dec 11, 2023

View reviewed changes

k8s-ci-robot assigned CecileRobertMichon Dec 11, 2023

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

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

k8s-ci-robot merged commit f382ce2 into kubernetes-sigs:main Dec 12, 2023
29 checks passed

mboersma deleted the capi-1.6-incoming branch December 12, 2023 14:54

mboersma mentioned this pull request Jan 17, 2024

Update metrics address flag in Tilt #4466

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump CAPI to v1.6.0 #4182

Bump CAPI to v1.6.0 #4182

mboersma commented Oct 26, 2023 •

edited

Loading

codecov bot commented Oct 26, 2023 •

edited

Loading

willie-yao commented Oct 31, 2023

mboersma commented Nov 1, 2023

mboersma commented Nov 2, 2023

mboersma commented Dec 6, 2023

mboersma commented Dec 6, 2023

mboersma commented Dec 7, 2023 •

edited

Loading

CecileRobertMichon Dec 7, 2023

nojnhuh Dec 7, 2023

CecileRobertMichon Dec 7, 2023

nojnhuh left a comment

k8s-ci-robot commented Dec 8, 2023

mboersma commented Dec 8, 2023

nojnhuh commented Dec 11, 2023

mboersma commented Dec 11, 2023

CecileRobertMichon left a comment

k8s-ci-robot commented Dec 11, 2023

k8s-ci-robot commented Dec 11, 2023

nojnhuh commented Dec 12, 2023

	// Add RBAC for the authorized diagnostics endpoint.
	// +kubebuilder:rbac:groups=authentication.k8s.io,resources=tokenreviews,verbs=create
	// +kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create

Bump CAPI to v1.6.0 #4182

Bump CAPI to v1.6.0 #4182

Conversation

mboersma commented Oct 26, 2023 • edited Loading

codecov bot commented Oct 26, 2023 • edited Loading

Codecov Report

willie-yao commented Oct 31, 2023

mboersma commented Nov 1, 2023

mboersma commented Nov 2, 2023

mboersma commented Dec 6, 2023

mboersma commented Dec 6, 2023

mboersma commented Dec 7, 2023 • edited Loading

CecileRobertMichon Dec 7, 2023

Choose a reason for hiding this comment

nojnhuh Dec 7, 2023

Choose a reason for hiding this comment

CecileRobertMichon Dec 7, 2023

Choose a reason for hiding this comment

nojnhuh left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Dec 8, 2023

mboersma commented Dec 8, 2023

nojnhuh commented Dec 11, 2023

mboersma commented Dec 11, 2023

CecileRobertMichon left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Dec 11, 2023

k8s-ci-robot commented Dec 11, 2023

nojnhuh commented Dec 12, 2023

mboersma commented Oct 26, 2023 •

edited

Loading

codecov bot commented Oct 26, 2023 •

edited

Loading

mboersma commented Dec 7, 2023 •

edited

Loading