[WIP] ✨ Bump to CR & CT main #10803

sbueringer · 2024-06-27T07:10:54Z

What this PR does / why we need it:
Testing kubernetes-sigs/controller-runtime#2799

Note: This PR (once finalized) will not be merged before CAPI v1.8

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 #

k8s-ci-robot · 2024-06-27T07:10:59Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from sbueringer. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

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

controllers/external/tracker_test.go

sbueringer · 2024-06-27T07:28:11Z

/test ?

k8s-ci-robot · 2024-06-27T07:28:13Z

@sbueringer: The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-blocking-main
pull-cluster-api-test-main
pull-cluster-api-verify-main

In response to this:

/test ?

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-sigs/prow repository.

sbueringer · 2024-06-27T07:38:45Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-07-01T11:04:39Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-07-01T11:17:42Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-07-11T12:09:18Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-07-11T12:10:01Z

We will need kubernetes-sigs/controller-tools#1000 to fix controller-gen, see:

/home/prow/go/pkg/mod/k8s.io/api@v0.31.0-alpha.3/core/v1/doc.go:21:1: missing argument "" (at <input>)
/home/prow/go/pkg/mod/k8s.io/api@v0.31.0-alpha.3/core/v1/doc.go:21:1: missing argument "" (at <input>)

(https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/10803/pull-cluster-api-verify-main/1811370326450245632)

sbueringer · 2024-07-11T12:11:05Z

cc @fabriziopandini @chrischdi ^^ I hope this PR is the only thing that is needed

Signed-off-by: Stefan Büringer buringerst@vmware.com

sbueringer · 2024-07-16T09:17:39Z

internal/controllers/clusterclass/clusterclass_controller_test.go

@@ -1146,8 +1146,8 @@ func TestReconciler_reconcileVariables(t *testing.T) {
 							OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 								Type: "string",
 								XValidations: []clusterv1.ValidationRule{{


Note to myself: this should be fixed in a way that we don't have to bump these tests on every k/k minor release (cf with how k/k is solving it)

sbueringer · 2024-07-16T09:23:59Z

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition


We should audit our APIs for multi-line TODOs and make them single line, see: kubernetes-sigs/controller-tools#877 (PR description)

Atm we still end up with half the TODO in the CRD, which is not great :)

sbueringer · 2024-07-16T09:27:02Z

Reviewed CRD diff as of now, and all changes are expected

sbueringer · 2024-07-16T09:27:31Z

/test ?

k8s-ci-robot · 2024-07-16T09:27:33Z

@sbueringer: The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-blocking-main
pull-cluster-api-test-main
pull-cluster-api-verify-main

In response to this:

/test ?

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-sigs/prow repository.

sbueringer · 2024-07-16T09:28:04Z

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

k8s-ci-robot · 2024-07-16T11:10:52Z

@sbueringer: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-apidiff-main	`20ec2bf`	link	false	`/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-mink8s-main	`20ec2bf`	link	true	`/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-test-main	`20ec2bf`	link	true	`/test pull-cluster-api-test-main`
pull-cluster-api-e2e-main	`20ec2bf`	link	true	`/test pull-cluster-api-e2e-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 27, 2024

k8s-ci-robot requested a review from elmiko June 27, 2024 07:10

k8s-ci-robot requested a review from g-gaston June 27, 2024 07:10

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2024

sbueringer commented Jun 27, 2024

View reviewed changes

controllers/external/tracker_test.go Outdated Show resolved Hide resolved

sbueringer changed the title ~~[WIP] Bump to CR main~~ [WIP] ✨ Bump to CR main Jun 27, 2024

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

sbueringer force-pushed the pr-cr-main branch from ca9e07d to 4379939 Compare July 1, 2024 11:03

sbueringer mentioned this pull request Jul 1, 2024

⚠️ Add TypedReconciler kubernetes-sigs/controller-runtime#2799

Merged

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 Jul 1, 2024

sbueringer added this to the v1.9 milestone Jul 10, 2024

sbueringer force-pushed the pr-cr-main branch from 3b35a02 to ed3aa66 Compare July 11, 2024 12:01

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 11, 2024

sbueringer added the area/dependency Issues or PRs related to dependency changes label Jul 11, 2024

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/needs-area PR is missing an area label labels Jul 11, 2024

sbueringer added 8 commits July 16, 2024 10:59

Adjust utilfeature.SetFeatureGateDuringTest calls

a9182cf

Signed-off-by: Stefan Büringer buringerst@vmware.com

Adjust to deprecations

9b7b99e

Signed-off-by: Stefan Büringer buringerst@vmware.com

Regenerate

756fbda

Signed-off-by: Stefan Büringer buringerst@vmware.com

Adjust to TypedReconciler PR

8d9fdd8

Signed-off-by: Stefan Büringer buringerst@vmware.com

fix CC CEL tests

486c858

Bump controller-runtime

f2ae1b1

Signed-off-by: Stefan Büringer buringerst@vmware.com

fix compile errors

e49373c

Bump controller-tools

b7ce518

Signed-off-by: Stefan Büringer buringerst@vmware.com

sbueringer force-pushed the pr-cr-main branch from 34933f8 to e0ed3a4 Compare July 16, 2024 09:14

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

sbueringer mentioned this pull request Jul 16, 2024

🌱 [wip] bump controller-gen and regenerate manifests to optimize RBAC #10612

Open

sbueringer added 2 commits July 16, 2024 11:26

Fix old condition types

b06f470

Signed-off-by: Stefan Büringer buringerst@vmware.com

Regenerate

20ec2bf

Signed-off-by: Stefan Büringer buringerst@vmware.com

sbueringer force-pushed the pr-cr-main branch from e0ed3a4 to 20ec2bf Compare July 16, 2024 09:26

sbueringer commented Jul 16, 2024

View reviewed changes

sbueringer changed the title ~~[WIP] ✨ Bump to CR main~~ [WIP] ✨ Bump to CR & CT main Jul 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] ✨ Bump to CR & CT main #10803

[WIP] ✨ Bump to CR & CT main #10803

sbueringer commented Jun 27, 2024 •

edited

Loading

k8s-ci-robot commented Jun 27, 2024

sbueringer commented Jun 27, 2024

k8s-ci-robot commented Jun 27, 2024

sbueringer commented Jun 27, 2024

sbueringer commented Jul 1, 2024

sbueringer commented Jul 1, 2024

sbueringer commented Jul 11, 2024

sbueringer commented Jul 11, 2024

sbueringer commented Jul 11, 2024 •

edited

Loading

sbueringer Jul 16, 2024

sbueringer Jul 16, 2024

sbueringer commented Jul 16, 2024

sbueringer commented Jul 16, 2024

k8s-ci-robot commented Jul 16, 2024

sbueringer commented Jul 16, 2024

k8s-ci-robot commented Jul 16, 2024

		@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
		kind: CustomResourceDefinition

[WIP] ✨ Bump to CR & CT main #10803

Are you sure you want to change the base?

[WIP] ✨ Bump to CR & CT main #10803

Conversation

sbueringer commented Jun 27, 2024 • edited Loading

k8s-ci-robot commented Jun 27, 2024

sbueringer commented Jun 27, 2024

k8s-ci-robot commented Jun 27, 2024

sbueringer commented Jun 27, 2024

sbueringer commented Jul 1, 2024

sbueringer commented Jul 1, 2024

sbueringer commented Jul 11, 2024

sbueringer commented Jul 11, 2024

sbueringer commented Jul 11, 2024 • edited Loading

sbueringer Jul 16, 2024

Choose a reason for hiding this comment

sbueringer Jul 16, 2024

Choose a reason for hiding this comment

sbueringer commented Jul 16, 2024

sbueringer commented Jul 16, 2024

k8s-ci-robot commented Jul 16, 2024

sbueringer commented Jul 16, 2024

k8s-ci-robot commented Jul 16, 2024

sbueringer commented Jun 27, 2024 •

edited

Loading

sbueringer commented Jul 11, 2024 •

edited

Loading