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

🐛 Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14 #6513

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented May 13, 2022

What this PR does / why we need it:

  • Use Kubernetes 1.24 in quickstart and CAPD
  • Drops the non-ClusterClass based CAPD cluster template
  • Bumps kind to v0.14 for v1.24 support as kind management cluster and for self-build images >= v1.24
  • Migrates CI upgrade tests to use cluster class and version aware patches for cgroupDriver
  • Implement workaround for DockerMachinePools which are not supported by ClusterClass to use correct cgroupDriver on upgrade tests.
  • Enables cgroupDriver: systemd by removal of pinning to cgroupDriver: cgroupfs

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 #6509
Fixes #4621

Still WIP:

  • check which other tests need to get migrated to topology
  • get all tests green
  • cleanup code

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 13, 2022
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 13, 2022
@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch 3 times, most recently from 36bb445 to 6a5c02c Compare May 13, 2022 14:42
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-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
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-informing-ipv6-main
  • /test pull-cluster-api-e2e-informing-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-23-latest-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-informing-ipv6-main
  • pull-cluster-api-e2e-informing-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-test-main
  • pull-cluster-api-test-mink8s-main
  • pull-cluster-api-verify-main

In response to this:

/test help

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/test-infra repository.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@chrischdi
Copy link
Member Author

chrischdi commented May 16, 2022

pull-cluster-api-e2e-workload-upgrade-1-23-latest-main currently fails because it tries to pull the kind image kindest/node:v1.24.1-rc.0.10+8b1b4db3834ddf which does not exist.

{
  "ts": 1652511846453.4377,
  "caller": "controller/controller.go:317",
  "msg": "controller/dockermachine: Reconciler error",
  "reconciler group": "infrastructure.cluster.x-k8s.io",
  "reconciler kind": "DockerMachine",
  "name": "k8s-upgrade-and-conformance-x4acz0-control-plane-sls88-wf7s7",
  "namespace": "k8s-upgrade-and-conformance-suiysm",
  "err": "failed to create worker DockerMachine: failure pulling container image: invalid reference format",
  "errVerbose": "failure pulling container image: invalid reference format
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker.(*Machine).Create
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker/machine.go:224
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).reconcileNormal
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:236
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).Reconcile
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:159
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:114
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:311
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:266
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:227
  runtime.goexit
    runtime/asm_amd64.s:1581
  failed to create worker DockerMachine
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).reconcileNormal
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:237
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).Reconcile
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:159
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:114
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:311
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:266
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:227
  runtime.goexit
    runtime/asm_amd64.s:1581"
}

I'm curious if this worked before :-)

@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch from 460804a to c976856 Compare May 16, 2022 07:28
@chrischdi
Copy link
Member Author

chrischdi commented May 16, 2022

pull-cluster-api-e2e-workload-upgrade-1-23-latest-main currently fails because it tries to pull the kind image kindest/node:v1.24.1-rc.0.10+8b1b4db3834ddf which does not exist.

{
  "ts": 1652511846453.4377,
  "caller": "controller/controller.go:317",
  "msg": "controller/dockermachine: Reconciler error",
  "reconciler group": "infrastructure.cluster.x-k8s.io",
  "reconciler kind": "DockerMachine",
  "name": "k8s-upgrade-and-conformance-x4acz0-control-plane-sls88-wf7s7",
  "namespace": "k8s-upgrade-and-conformance-suiysm",
  "err": "failed to create worker DockerMachine: failure pulling container image: invalid reference format",
  "errVerbose": "failure pulling container image: invalid reference format
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker.(*Machine).Create
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker/machine.go:224
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).reconcileNormal
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:236
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).Reconcile
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:159
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:114
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:311
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:266
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:227
  runtime.goexit
    runtime/asm_amd64.s:1581
  failed to create worker DockerMachine
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).reconcileNormal
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:237
  sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers.(*DockerMachineReconciler).Reconcile
    sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/dockermachine_controller.go:159
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:114
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:311
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:266
  sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
    sigs.k8s.io/controller-runtime@v0.11.2/pkg/internal/controller/controller.go:227
  runtime.goexit
    runtime/asm_amd64.s:1581"
}

I'm curious if this worked before :-)

Reason: I switched to clusterClass which has a patch to always inject the kind image instead of just using the default one.

Adjusted the patch so it is only enabled on stable release version tags, not the ones which e.g. look like: v1.24.1-rc.0.10+8b1b4db3834ddf, by checking if a + is inside the version name

@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch 2 times, most recently from b27dab5 to ad92ec9 Compare May 16, 2022 07:33
@chrischdi
Copy link
Member Author

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch from ad92ec9 to 8f34f36 Compare May 16, 2022 08:20
@chrischdi
Copy link
Member Author

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch from 8f34f36 to 48999f1 Compare May 16, 2022 11:17
@chrischdi
Copy link
Member Author

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

Changed last commit to replace + in customImage by _ like the ci script does while preparing the images https://github.com/kubernetes-sigs/cluster-api/blob/main/scripts/ci-e2e-lib.sh#L219

@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@chrischdi chrischdi force-pushed the pr-cluster-class-v1-24-cgroupdriver branch 2 times, most recently from 828b14b to 8d5e398 Compare May 16, 2022 14:50
@chrischdi
Copy link
Member Author

After tests got green 🎉 : did some cleanup and squashed the commits

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main

@chrischdi
Copy link
Member Author

Check Markdown links / Broken Links (pull_request)

Seems to be a false-positive:

FILE: ./docs/proposals/20200804-windows-support.md
[✖] https://www.microsoft.com/en-us/licensing/product-licensing/windows-server

72 links checked.

ERROR: 1 dead links found!
[✖] https://www.microsoft.com/en-us/licensing/product-licensing/windows-server → Status: 0

@chrischdi chrischdi changed the title 🐛 [WIP] CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests 🐛 [WIP]CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests May 16, 2022
@chrischdi chrischdi changed the title 🐛 [WIP]CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests 🐛 [WIP] CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests May 16, 2022
@chrischdi chrischdi changed the title 🐛 [WIP] CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests 🐛 CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests May 16, 2022
@sbueringer
Copy link
Member

sbueringer commented May 24, 2022

Final tasks

  • Updated the user-facing templates based on our slack discussion
  • Reintroduced setting the MP dataSecretName to nil during upgrade as it's required to trigger a rollout of the new BootstrapConfig
  • let's wait for green tests

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@sbueringer sbueringer changed the title 🐛 CAPD: add version aware patch for cgroupDriver to support v1.24 and fix e2e tests 🐛 Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14 May 24, 2022
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

1 similar comment
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@sbueringer sbueringer force-pushed the pr-cluster-class-v1-24-cgroupdriver branch 2 times, most recently from 19e30dd to eb011ad Compare May 25, 2022 06:18
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@fabriziopandini Ready for review / merge in my opinion.
I think this PR is cherry-pickable as is for v1.24 support in v1.1.x

/cherry-pick release-1.1

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.1 in a new PR and assign it to you.

In response to this:

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@fabriziopandini Ready for review / merge in my opinion.
I think this PR is cherry-pickable as is for v1.24 support in v1.1.x

/cherry-pick release-1.1

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/test-infra repository.

* Use Kubernetes 1.24 in quickstart and CAPD
* Bumps kind to v0.14 for v1.24 support as kind management cluster
* Migrates CI upgrade tests to use cluster class and version aware patches for cgroupDriver
* Implement workaround for DockerMachinePools which are not supported by ClusterClass to use correct cgroupDriver on upgrade tests.

Co-authored-by: killianmuldoon <kmuldoon@vmware.com>
Co-authored-by: sbueringer <buringerst@vmware.com>
@sbueringer sbueringer force-pushed the pr-cluster-class-v1-24-cgroupdriver branch from eb011ad to bbfb5de Compare May 25, 2022 07:44
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@fabriziopandini
Copy link
Member

@chrischdi @sbueringer thanks for stepping up in fixing CAPD and our CI to adapt to recent changes in kind, really appreciated!
Let's make sure we got a green test grid before backporting.
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2022
@k8s-ci-robot k8s-ci-robot merged commit 27b8dfb into kubernetes-sigs:main May 26, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.2 milestone May 26, 2022
@k8s-infra-cherrypick-robot

@sbueringer: #6513 failed to apply on top of branch "release-1.1":

Applying: Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14
Using index info to reconstruct a base tree...
A	docs/book/src/developer/providers/v1.1-to-v1.2.md
M	docs/book/src/user/quick-start.md
M	hack/ensure-kind.sh
M	hack/tools/go.sum
M	test/e2e/Makefile
M	test/e2e/config/docker.yaml
M	test/e2e/data/infrastructure-docker/v1alpha3/bases/cluster-with-kcp.yaml
M	test/e2e/data/infrastructure-docker/v1alpha3/bases/md.yaml
M	test/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml
M	test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml
M	test/e2e/data/infrastructure-docker/v1alpha4/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
M	test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-kcp.yaml
M	test/e2e/data/infrastructure-docker/v1beta1/bases/md.yaml
M	test/e2e/data/infrastructure-docker/v1beta1/bases/mp.yaml
M	test/e2e/data/infrastructure-docker/v1beta1/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
M	test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
M	test/framework/bootstrap/kind_provider.go
M	test/framework/machinepool_helpers.go.git/rebase-apply/patch:82: trailing whitespace.
The Docker provider requires the `ClusterTopology` feature to deploy ClusterClass-based clusters. We are 
.git/rebase-apply/patch:83: trailing whitespace.
only supporting ClusterClass-based cluster-templates in this quickstart as ClusterClass makes it possible to 
.git/rebase-apply/patch:84: trailing whitespace.
adapt configuration based on Kubernetes version. This is required to install Kubernetes clusters < v1.24 and 
warning: 3 lines add whitespace errors.

M	test/go.mod
M	test/go.sum
M	test/infrastructure/container/docker.go
M	test/infrastructure/docker/examples/machine-pool.yaml
M	test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
M	test/infrastructure/docker/examples/simple-cluster.yaml
M	test/infrastructure/docker/internal/docker/machine.go
M	test/infrastructure/docker/templates/cluster-template-development-topology.yaml
M	test/infrastructure/docker/templates/cluster-template-development.yaml
M	test/infrastructure/docker/templates/clusterclass-quick-start.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/docker/templates/clusterclass-quick-start.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/templates/clusterclass-quick-start.yaml
Auto-merging test/infrastructure/docker/templates/cluster-template-development.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/templates/cluster-template-development.yaml
CONFLICT (modify/delete): test/infrastructure/docker/templates/cluster-template-development-topology.yaml deleted in Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14 and modified in HEAD. Version HEAD of test/infrastructure/docker/templates/cluster-template-development-topology.yaml left in tree.
Auto-merging test/infrastructure/docker/internal/docker/machine.go
Auto-merging test/infrastructure/docker/examples/simple-cluster.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/simple-cluster.yaml
Auto-merging test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
Auto-merging test/infrastructure/docker/examples/machine-pool.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/machine-pool.yaml
Auto-merging test/infrastructure/container/docker.go
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging test/framework/machinepool_helpers.go
CONFLICT (content): Merge conflict in test/framework/machinepool_helpers.go
Auto-merging test/framework/bootstrap/kind_provider.go
CONFLICT (content): Merge conflict in test/framework/bootstrap/kind_provider.go
Auto-merging test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
CONFLICT (content): Merge conflict in test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
Removing test/e2e/data/infrastructure-docker/v1beta1/cluster-template-kcp-scale-in/cluster-with-kcp.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1beta1/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1beta1/bases/mp.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1beta1/bases/md.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-kcp.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1alpha4/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1alpha3/bases/md.yaml
Auto-merging test/e2e/data/infrastructure-docker/v1alpha3/bases/cluster-with-kcp.yaml
Auto-merging test/e2e/config/docker.yaml
CONFLICT (content): Merge conflict in test/e2e/config/docker.yaml
Auto-merging test/e2e/Makefile
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/ensure-kind.sh
CONFLICT (content): Merge conflict in hack/ensure-kind.sh
Auto-merging docs/book/src/user/quick-start.md
CONFLICT (modify/delete): docs/book/src/developer/providers/v1.1-to-v1.2.md deleted in HEAD and modified in Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14. Version Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14 of docs/book/src/developer/providers/v1.1-to-v1.2.md left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use Kubernetes 1.24 in quickstart and CAPD, bump to kind v0.14
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/test pull-cluster-api-e2e-workload-upgrade-1-23-latest-main
/test pull-cluster-api-e2e-full-main

@fabriziopandini Ready for review / merge in my opinion.
I think this PR is cherry-pickable as is for v1.24 support in v1.1.x

/cherry-pick release-1.1

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/test-infra repository.

@sbueringer
Copy link
Member

sbueringer commented May 27, 2022

@chrischdi @sbueringer thanks for stepping up in fixing CAPD and our CI to adapt to recent changes in kind, really appreciated! Let's make sure we got a green test grid before backporting. /lgtm /approve

Thx! the majority of the work was done by @chrischdi and @killianmuldoon, thx folks!!

I'll check testgrid etc. ... .

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix CAPD quick-start and E2E to adapt with changes in Kind v0.13 Use systemd cgroupDriver in CAPD
7 participants