🌱 Bump Cluster API to v1.5.0-rc.0 #186

Fedosin · 2023-07-10T17:10:20Z

What this PR does / why we need it:
This PR update CAPI operator to the latest Cluster API version.

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

Fedosin · 2023-07-10T17:11:17Z

/hold

waiting for the new version to be released.

furkatgofurov7

@Fedosin thanks for the PR, overall looks good to me, only one missing update I noticed based on the migration doc https://main.cluster-api.sigs.k8s.io/developer/providers/migrations/v1.4-to-v1.5.html#go-version and few more suggestions inline:

we need to bump CT in https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/hack/tools/go.mod#L11 to v0.12.x

/retitle 🌱 Bump Cluster API to v1.5.0-beta.1

go.mod

internal/webhook/bootstrapprovider_webhook.go

furkatgofurov7 · 2023-07-11T08:28:11Z

internal/controller/client_proxy.go

-		{
-			GroupVersion: "cert-manager.io/v1",
-			APIResources: []metav1.APIResource{
-				{Kind: "Certificate", Namespaced: true},
-				{Kind: "Issuer", Namespaced: true},
-			},
-		},


why are we removing this?

There are 2 reasons for that:

In clusterctl they explicitly declare that this function should not return cert-manager objects. It's better to keep things consistent with cluster-api.

After upgrading to controller-runtime v0.15.0 some tests fail because they need cert-manager CRDs installed (I still don't understand why it works in the previous versions). I don't want to add cert-manager to the operator dependencies, so I just decided to remove the section.

api/v1alpha1/provider_types.go

Fedosin · 2023-07-12T23:34:28Z

I updated container images for e2e tests to make them work with golang 1.20: kubernetes/test-infra#30077

Dockerfile

Makefile

cmd/main.go

hack/ensure-go.sh

furkatgofurov7 · 2023-07-13T11:03:49Z

/retest

furkatgofurov7 · 2023-07-13T11:13:23Z

waiting for the new version to be released.

We can always merge the rc bump and give the CI time to run longer with it to see if there are problems, so that whenever actual 1.5.0 comes out, it is just a matter of updating go.mod, nothing more.

furkatgofurov7 · 2023-07-13T11:17:03Z

/retitle 🌱 Bump Cluster API to v1.5.0-rc.0

Fedosin · 2023-07-13T12:25:09Z

@furkatgofurov7 I'm okay to merge #187 first and then I'll update my PR.

furkatgofurov7 · 2023-07-13T13:33:45Z

@furkatgofurov7 I'm okay to merge #187 first and then I'll update my PR.

@Fedosin sure, it should be ready to merge now, PTAL

furkatgofurov7 · 2023-07-13T18:49:46Z

@Fedosin #187 is merged, please rebase when you get a time, thanks!

furkatgofurov7

Thanks for working on this @Fedosin!

/approve

k8s-ci-robot · 2023-07-14T16:04:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furkatgofurov7

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]

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

alexander-demicev

/lgtm

k8s-ci-robot · 2023-07-21T12:45:52Z

LGTM label has been added.

Git tree hash: d2fdc8b097eec310ad623578af7077072fa9544c

furkatgofurov7 · 2023-07-21T12:55:22Z

/hold cancel

We will bump to v1.5 CAPI once out (fairly straightforward then this one), this we can take in now.

k8s-ci-robot requested review from alexander-demicev and justinsb July 10, 2023 17:10

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 10, 2023

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

Fedosin force-pushed the capi15 branch 4 times, most recently from e05ea81 to 8b612ab Compare July 10, 2023 22:37

furkatgofurov7 reviewed Jul 11, 2023

View reviewed changes

k8s-ci-robot changed the title ~~🌱 Bump Cluster API to v1.5~~ 🌱 Bump Cluster API to v1.5.0-beta.1 Jul 11, 2023

Fedosin force-pushed the capi15 branch from 8b612ab to 582d376 Compare July 12, 2023 23:11

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 12, 2023

Fedosin force-pushed the capi15 branch from 582d376 to 1abd587 Compare July 12, 2023 23:35

furkatgofurov7 mentioned this pull request Jul 13, 2023

✨Bump go version to v1.20.4 #187

Merged

furkatgofurov7 reviewed Jul 13, 2023

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

Makefile Outdated Show resolved Hide resolved

cmd/main.go Outdated Show resolved Hide resolved

hack/ensure-go.sh Outdated Show resolved Hide resolved

k8s-ci-robot changed the title ~~🌱 Bump Cluster API to v1.5.0-beta.1~~ 🌱 Bump Cluster API to v1.5.0-rc.0 Jul 13, 2023

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

chore: bump Cluster API to v1.5

24b693d

Fedosin force-pushed the capi15 branch from 1abd587 to 24b693d Compare July 14, 2023 12:57

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

furkatgofurov7 approved these changes Jul 14, 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 Jul 14, 2023

alexander-demicev approved these changes Jul 21, 2023

View reviewed changes

k8s-ci-robot assigned alexander-demicev Jul 21, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 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 Jul 21, 2023

k8s-ci-robot merged commit 1b9007d into kubernetes-sigs:main Jul 21, 2023
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Bump Cluster API to v1.5.0-rc.0 #186

🌱 Bump Cluster API to v1.5.0-rc.0 #186

Fedosin commented Jul 10, 2023

Fedosin commented Jul 10, 2023

furkatgofurov7 left a comment

furkatgofurov7 Jul 11, 2023

Fedosin Jul 12, 2023

Fedosin commented Jul 12, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023 •

edited

Loading

furkatgofurov7 commented Jul 13, 2023

Fedosin commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 left a comment

k8s-ci-robot commented Jul 14, 2023

alexander-demicev left a comment

k8s-ci-robot commented Jul 21, 2023

furkatgofurov7 commented Jul 21, 2023

🌱 Bump Cluster API to v1.5.0-rc.0 #186

🌱 Bump Cluster API to v1.5.0-rc.0 #186

Conversation

Fedosin commented Jul 10, 2023

Fedosin commented Jul 10, 2023

furkatgofurov7 left a comment

Choose a reason for hiding this comment

furkatgofurov7 Jul 11, 2023

Choose a reason for hiding this comment

Fedosin Jul 12, 2023

Choose a reason for hiding this comment

Fedosin commented Jul 12, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023 • edited Loading

furkatgofurov7 commented Jul 13, 2023

Fedosin commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 commented Jul 13, 2023

furkatgofurov7 left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Jul 14, 2023

alexander-demicev left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Jul 21, 2023

furkatgofurov7 commented Jul 21, 2023

furkatgofurov7 commented Jul 13, 2023 •

edited

Loading