🌱 Drop cgroup-driver patch for CAPD

[fabriziopandini]

What this PR does / why we need it:
This PR is a follow up of #8881 automatic generation of another kubeletExtraArg and dropping corresponding code from templates all around.

The PS also includes the cleanup of the kubeletExtraArgs from the cmd/clusterctl/client/cluster/assets folder, which I forgot in the previous PR

/cc @sbueringer @killianmuldoon

[fabriziopandini]

/test pull-cluster-api-e2e-full-main
/hold
for CI

[sbueringer]

I would wait with merging until tomorrow. Just to avoid interfering with a clean signal for the release today.

I would cherry-pick this into 1.4. So that we don't have two different ways of handling this that we have to maintain / potentially debug in the future (1.3 will basically go away with the 1.5 release)

[killianmuldoon]

This is an awesome cleanup!

/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 47ed699a2c2974aaea833200f622f509c05a56e7

[killianmuldoon]

/hold

[sbueringer]

I would wait with merging until tomorrow. Just to avoid interfering with a clean signal for the release today.

I would cherry-pick this into 1.4. So that we don't have two different ways of handling this that we have to maintain / potentially debug in the future (1.3 will basically go away with the 1.5 release)

Just more context on that. The test which is affected by this change cannot be run on a PR. That's why I would defer to tomorrow to not break periodics today (+ my open comment)

[sbueringer]

Change looks good

/lgtm
/approve

(+/- squash)

Would probably still wait until after the release with hold cancel, but up to you

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 4b4da667825e2099e22a9b06e9e2a1d90f9bf36c

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon, sbueringer

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 [killianmuldoon,sbueringer]

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

[killianmuldoon]

/lgtm

Agreed that we should hold this until after todays release, given the unforseen issues we've had with some of the changes to CAPD in the last couple of weeks.

[fabriziopandini]

squashed, ok to wait

[sbueringer]

/hold cancel

[sbueringer]

Should we cherry-pick?

[killianmuldoon]

/cherry-pick release-1.4

[k8s-infra-cherrypick-robot]

@killianmuldoon: #8921 failed to apply on top of branch "release-1.4":

Applying: drop cgroup-driver patch
Using index info to reconstruct a base tree...
M	Makefile
M	test/e2e/cluster_upgrade_test.go
M	test/e2e/config/docker.yaml
M	test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml
M	test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml
M	test/framework/machinepool_helpers.go
M	test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go
M	test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go
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
Auto-merging test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go
CONFLICT (content): Merge conflict in test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go
Auto-merging test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go
CONFLICT (content): Merge conflict in test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go
Auto-merging test/framework/machinepool_helpers.go
Auto-merging test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml
CONFLICT (content): Merge conflict in test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml
Removing test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-default-cgroupfs.yaml
CONFLICT (modify/delete): test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml deleted in drop cgroup-driver patch and modified in HEAD. Version HEAD of test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml left in tree.
Removing test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/kustomization.yaml
Auto-merging test/e2e/config/docker.yaml
Auto-merging test/e2e/cluster_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/cluster_upgrade_test.go
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drop cgroup-driver patch
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:

/cherry-pick release-1.4

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.