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

kinder: remove the handling of 1.25 and older versions of k8s #2966

Merged
merged 1 commit into from
Dec 13, 2023
Merged

kinder: remove the handling of 1.25 and older versions of k8s #2966

merged 1 commit into from
Dec 13, 2023

Conversation

neolit123
Copy link
Member

  • Remove the repository replace from k8s.gcr.io -> registry.k8s.io
  • Remove "kubelet-config-x.yy" handling, use "kubelet-config"
  • Stop untainting "master" taints, only untaint control-plane taints
  • Stop handling --experimental-patches, use --patches

xref #2910

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kinder Issues to track work in the kinder tool labels Nov 22, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 22, 2023
@neolit123 neolit123 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 22, 2023
@neolit123 neolit123 added this to the v1.29 milestone Nov 22, 2023
@neolit123 neolit123 mentioned this pull request Nov 22, 2023
Closed
6 tasks
@neolit123 neolit123 modified the milestones: v1.29, v1.30 Nov 23, 2023
@neolit123 neolit123 force-pushed the 1.29-remove-kinder-1.25-todos branch from f9d6cfe to cbc6567 Compare November 29, 2023 17:53
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 29, 2023
@neolit123
Copy link
Member Author

will hold this until 1.29 is released.

@pacoxu
Copy link
Member

pacoxu commented Nov 30, 2023

will hold this until 1.29 is released.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2023
chendave
chendave reviewed Dec 7, 2023
View reviewed changes
Copy link
Member

@chendave chendave left a comment

Choose a reason for hiding this comment

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

/lgtm

nice cleanup!

kinder/pkg/cluster/manager/actions/kubeadm-init.go Outdated Show resolved Hide resolved
kinder/pkg/cluster/manager/actions/kubeadm-join.go Show resolved Hide resolved
@neolit123 neolit123 force-pushed the 1.29-remove-kinder-1.25-todos branch from cbc6567 to c6bbec1 Compare December 11, 2023 15:03
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2023
@neolit123
kinder: remove the handling of 1.25 and older versions of k8s
6213a3e 
- Remove the repository replace from k8s.gcr.io -> registry.k8s.io
- Remove "kubelet-config-x.yy" handling, use "kubelet-config"
- Stop untainting "master" taints, only untaint control-plane taints
- Stop handling --experimental-patches, use --patches
@neolit123 neolit123 force-pushed the 1.29-remove-kinder-1.25-todos branch from c6bbec1 to 6213a3e Compare December 11, 2023 15:06
@neolit123 neolit123 requested review from chendave and pacoxu and removed request for SataQiu December 11, 2023 15:07
@pacoxu
Copy link
Member

pacoxu commented Dec 12, 2023

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chendave, neolit123, pacoxu

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

@neolit123
Copy link
Member Author

/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 Dec 13, 2023
@k8s-ci-robot k8s-ci-robot merged commit bd6c701 into kubernetes:main Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chendave chendave Awaiting requested review from chendave

@pacoxu pacoxu Awaiting requested review from pacoxu

Assignees

@pacoxu pacoxu

@chendave chendave

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kinder Issues to track work in the kinder tool 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
Milestone
v1.30
Development

Successfully merging this pull request may close these issues.
4 participants
@neolit123 @pacoxu @k8s-ci-robot @chendave