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

update to Cluster api 1.7 #117

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Conversation

elmiko
Copy link
Contributor

@elmiko elmiko commented Sep 7, 2024

What this PR does / why we need it:

updates the provider to use 1.7 capi and 1.29 k8s.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged):
fixes #106

Special notes for your reviewer:

use make test-e2e to replicate

i tested this locally on an ubuntu 22.04 server and got the following output:

Tenant cluster is ready!

You can access tenant cluster with the above kubeconfig. (It also can be found in '/tmp/km.kubeconfig')

For CNI, you may apply calico with 'kubectl --kubeconfig /tmp/km.kubeconfig apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.1/manifests/calico.yaml'
make[1]: Leaving directory '/home/mike/cluster-api-provider-kubemark/hack/tests'
mike@kind:~/cluster-api-provider-kubemark$ kubectl get machines
NAME                              CLUSTER   NODENAME                          PROVIDERID                                   PHASE     AGE     VERSION
km-cp-control-plane-km6qm         km-cp     km-cp-control-plane-km6qm         docker:////km-cp-control-plane-km6qm         Running   2m17s   v1.29.8
km-wl-kubemark-md-0-wdxx6-4hsdt   km-cp     km-wl-kubemark-md-0-wdxx6-4hsdt   kubemark://km-wl-kubemark-md-0-wdxx6-4hsdt   Running   108s    v1.29.8
km-wl-kubemark-md-0-wdxx6-qz2vj   km-cp     km-wl-kubemark-md-0-wdxx6-qz2vj   kubemark://km-wl-kubemark-md-0-wdxx6-qz2vj   Running   108s    v1.29.8
km-wl-kubemark-md-0-wdxx6-wrpnn   km-cp     km-wl-kubemark-md-0-wdxx6-wrpnn   kubemark://km-wl-kubemark-md-0-wdxx6-wrpnn   Running   108s    v1.29.8
km-wl-kubemark-md-0-wdxx6-zkkw8   km-cp     km-wl-kubemark-md-0-wdxx6-zkkw8   kubemark://km-wl-kubemark-md-0-wdxx6-zkkw8   Running   108s    v1.29.8

Release notes:

The kubemark machine configuration secret is now created as the name of the kubemark machine resource with the suffix "kubemark-config" to the name of the secret. This is to avoid collision with cluster api secrets.

elmiko and others added 4 commits August 22, 2024 15:59
this change brings the provider into line with the cluster-api 1.7
release, and also with kubernetes 1.29
it appears that a change in the cluster-api kubeadm bootstrap provider
is causing secrets with the same name as a machine to be created in the
namespace with the machine object. this is causing the kubeconfig secret
created by the capk controller to be overwritten, which cascades into
kubemark not being able to start.

the fix is to add "kubemark-config" as a suffix to secret.
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 7, 2024
@nrb
Copy link

nrb commented Sep 13, 2024

/assign

@@ -5,7 +5,7 @@ jobs:
if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubemark')
strategy:
matrix:
go-version: [1.22.x]
go-version: [1.21.x]
Copy link

Choose a reason for hiding this comment

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

Why take the go version backwards?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i was mostly trying to sync all the versions so that everything was the same, my plan is to update to 1.22 with the cluster-api 1.8 update. so, mostly just trying to get a clean base to build on top of.

@nrb
Copy link

nrb commented Sep 16, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2024
@k8s-ci-robot k8s-ci-robot merged commit 1e5d99a into kubernetes-sigs:main Sep 16, 2024
5 checks passed
@elmiko elmiko deleted the cluster-api-1.7 branch September 18, 2024 16:50
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CAPI v1.7.0-beta.0 has been released and is ready for testing
3 participants