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.

Sign up for GitHub

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

Jump to bottom

[release-1.4] 🌱 Set Kubelet args internally in CAPD #8929

Merged
merged 2 commits into from
Jun 29, 2023
Merged

[release-1.4] 🌱 Set Kubelet args internally in CAPD #8929

merged 2 commits into from
Jun 29, 2023

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Jun 28, 2023 •
edited

Manual cherry-pick of #8921 and #8881

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

@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jun 28, 2023
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jun 28, 2023
@killianmuldoon
Copy link
Contributor Author

/area provider/infrastructure-docker

@k8s-ci-robot k8s-ci-robot added the area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider label Jun 28, 2023
@killianmuldoon
Copy link
Contributor Author

/hold
/test ?
For e2e tests.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 28, 2023
@k8s-ci-robot
Copy link
Contributor

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

  • /test pull-cluster-api-build-release-1-4
  • /test pull-cluster-api-e2e-release-1-4
  • /test pull-cluster-api-test-mink8s-release-1-4
  • /test pull-cluster-api-test-release-1-4
  • /test pull-cluster-api-verify-release-1-4

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-release-1-4
  • /test pull-cluster-api-e2e-full-release-1-4
  • /test pull-cluster-api-e2e-informing-ipv6-release-1-4
  • /test pull-cluster-api-e2e-informing-release-1-4
  • /test pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-4

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

  • pull-cluster-api-apidiff-release-1-4
  • pull-cluster-api-build-release-1-4
  • pull-cluster-api-e2e-informing-ipv6-release-1-4
  • pull-cluster-api-e2e-informing-release-1-4
  • pull-cluster-api-e2e-release-1-4
  • pull-cluster-api-test-mink8s-release-1-4
  • pull-cluster-api-test-release-1-4
  • pull-cluster-api-verify-release-1-4

In response to this:

/hold
/test ?
For e2e tests.

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.

@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-release-1-4
/test pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-4

@killianmuldoon killianmuldoon changed the title 🌱 Drop cgroup-driver patch [release-1.4] 🌱 Drop cgroup-driver patch Jun 28, 2023
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-release-1-4
/test pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-4

@killianmuldoon killianmuldoon changed the title [release-1.4] 🌱 Drop cgroup-driver patch [release-1.4] 🌱 Set Kubelet args internally in CAPD Jun 28, 2023
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-release-1-4
/test pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-4

sbueringer
sbueringer reviewed Jun 28, 2023
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Diffed the PR against main. Almost everything as expected. One question about the ClusterClass

test/infrastructure/docker/templates/clusterclass-quick-start.yaml Show resolved Hide resolved
@fabriziopandini
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 5dda4fd757f1321268e27db49e52ff1f75bb9633

@fabriziopandini @killianmuldoon
drop cgroup-driver patch
ef7b6e6 
(cherry picked from commit 0b0695b)
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 29, 2023
@sbueringer
Copy link
Member

Thank you!

/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 Jun 29, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: a70b1b1e4de28d86696f1b8b5bfbea9deffcc431

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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 Jun 29, 2023
@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 29, 2023
@sbueringer
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 3e9f9ab into kubernetes-sigs:release-1.4 Jun 29, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider 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
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@killianmuldoon @k8s-ci-robot @fabriziopandini @sbueringer