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

Update ControlPlaneKubeletLocalMode test for the feature gate being disabled and fix setup-external-ca in kinder #3157

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Update ControlPlaneKubeletLocalMode test for the feature gate being disabled and fix setup-external-ca in kinder #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8df532
Update ControlPlaneKubeletLocalMode test for the feature gate being d…
chrischdi Jan 20, 2025
e9f1704
kinder: fix setup-external-ca to still generate valid worker kubeconfigs
chrischdi Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions ...ci/tools/update-workflows/templates/workflows/control-plane-local-kubelet-mode-tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
summary: |
This workflow implements a sequence of tasks used test the proper functioning
of the ControlPlaneKubeletLocalMode feature gate.
of having the ControlPlaneKubeletLocalMode feature gate set to false.
vars:
# vars defines default values for variable used by tasks in this workflow;
# those values might be overridden when importing this files.
Expand Down Expand Up @@ -59,19 +59,19 @@ tasks:
- --name={{ .vars.clusterName }}
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
- --kubeadm-feature-gate="ControlPlaneKubeletLocalMode=true"
- --kubeadm-feature-gate="ControlPlaneKubeletLocalMode=false"
- --copy-certs=auto
timeout: 5m
- name: post-init
description: |
Run commands after kubeadm init is called on a primary CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to load balanced apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-1"

# Ensure kubelet.conf points to the local IP.
Expand All @@ -95,22 +95,23 @@ tasks:
- name: post-join
description: |
Run commands after kubeadm join is called on all joined CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to the remote apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"

CMD="docker exec {{ .vars.clusterName }}-control-plane-2"

# Ensure kubelet.conf points to the local IP.
# Ensure kubelet.conf points to the remote IP.
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"

# Ensure kubelet.conf points to the local IP.
# Ensure kubelet.conf points to the remote IP.
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

# Ensure exit status of 0
Expand All @@ -119,23 +120,24 @@ tasks:
- name: pre-upgrade
description: |
Run commands before kubeadm upgrade is called on all joined CP node to replace
the server in the kubelet's kubeconfig to point to the load balancer.
the server in the kubelet's kubeconfig to point to the control-plane IP.
cmd: /bin/bash
args:
- -c
- |
set -x

LOAD_BALANCER_IP_ADDRESS=$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-1"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-2"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

# Ensure exit status of 0
exit 0
Expand All @@ -155,22 +157,21 @@ tasks:
- name: post-upgrade
description: |
Run commands after kubeadm upgrade is called on all joined CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to the remote apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"

Copy link
Member

Choose a reason for hiding this comment

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

++ docker inspect '--format={{ .NetworkSettings.IPAddress }}' kinder-control-plane-local-kubelet-mode-lb
+ IP_ADDRESS=172.17.0.7
+ CMD='docker exec kinder-control-plane-local-kubelet-mode-control-plane-1'
+ docker exec kinder-control-plane-local-kubelet-mode-control-plane-1 grep 'server: https://172.17.0.7:6443' /etc/kubernetes/kubelet.conf
+ exit 1

Failed here.

Copy link
Member Author

Choose a reason for hiding this comment

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

That's expected, it needs a commit from kubernetes/kubernetes#129956 to succeed.

Copy link
Member

Choose a reason for hiding this comment

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

Got it.

CMD="docker exec {{ .vars.clusterName }}-control-plane-1"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-2"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

Expand Down
4 changes: 2 additions & 2 deletions kinder/ci/tools/update-workflows/templates/workflows/control-plane-local-kubelet-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 1
summary: |
This workflow tests the proper functioning of the {{ .KubernetesVersion }} version of both kubeadm and Kubernetes using
the ControlPlaneKubeletLocalMode feature gate.
This workflow tests the proper functioning of the {{ .KubernetesVersion }} version of both kubeadm and Kubernetes having
the ControlPlaneKubeletLocalMode feature gate set to false.
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-control-plane-local-kubelet-mode{{ dashVer .KubernetesVersion }}
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/{{ .TargetFile }}
vars:
Expand Down
4 changes: 2 additions & 2 deletions kinder/ci/workflows/control-plane-local-kubelet-mode-latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of the latest version of both kubeadm and Kubernetes using
the ControlPlaneKubeletLocalMode feature gate.
This workflow tests the proper functioning of the latest version of both kubeadm and Kubernetes having
the ControlPlaneKubeletLocalMode feature gate set to false.
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-control-plane-local-kubelet-modelatest
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-control-plane-local-kubelet-mode.yaml
vars:
Expand Down
39 changes: 20 additions & 19 deletions kinder/ci/workflows/control-plane-local-kubelet-mode-tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 1
summary: |
This workflow implements a sequence of tasks used test the proper functioning
of the ControlPlaneKubeletLocalMode feature gate.
of having the ControlPlaneKubeletLocalMode feature gate set to false.
vars:
# vars defines default values for variable used by tasks in this workflow;
# those values might be overridden when importing this files.
Expand Down Expand Up @@ -60,19 +60,19 @@ tasks:
- --name={{ .vars.clusterName }}
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
- --kubeadm-feature-gate="ControlPlaneKubeletLocalMode=true"
- --kubeadm-feature-gate="ControlPlaneKubeletLocalMode=false"
- --copy-certs=auto
timeout: 5m
- name: post-init
description: |
Run commands after kubeadm init is called on a primary CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to load balanced apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-1"

# Ensure kubelet.conf points to the local IP.
Expand All @@ -96,22 +96,23 @@ tasks:
- name: post-join
description: |
Run commands after kubeadm join is called on all joined CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to the remote apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"

CMD="docker exec {{ .vars.clusterName }}-control-plane-2"

# Ensure kubelet.conf points to the local IP.
# Ensure kubelet.conf points to the remote IP.
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"

# Ensure kubelet.conf points to the local IP.
# Ensure kubelet.conf points to the remote IP.
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

# Ensure exit status of 0
Expand All @@ -120,23 +121,24 @@ tasks:
- name: pre-upgrade
description: |
Run commands before kubeadm upgrade is called on all joined CP node to replace
the server in the kubelet's kubeconfig to point to the load balancer.
the server in the kubelet's kubeconfig to point to the control-plane IP.
cmd: /bin/bash
args:
- -c
- |
set -x

LOAD_BALANCER_IP_ADDRESS=$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-1"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-2"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"
${CMD} sed -i 's@server: https://.*:6443@server: https://'${LOAD_BALANCER_IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1
${CMD} sed -i 's@server: https://.*:6443@server: https://'${IP_ADDRESS}':6443@g' /etc/kubernetes/kubelet.conf || exit 1

# Ensure exit status of 0
exit 0
Expand All @@ -156,22 +158,21 @@ tasks:
- name: post-upgrade
description: |
Run commands after kubeadm upgrade is called on all joined CP node to checks if
the kubelet's kubeconfig file points to the local apiserver.
the kubelet's kubeconfig file points to the remote apiserver.
cmd: /bin/bash
args:
- -c
- |
set -x

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-1)"
IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-lb)"

CMD="docker exec {{ .vars.clusterName }}-control-plane-1"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-2)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-2"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

IP_ADDRESS="$(docker inspect --format='{{ "{{" }} .NetworkSettings.IPAddress {{ "}}" }}' {{ .vars.clusterName }}-control-plane-3)"
CMD="docker exec {{ .vars.clusterName }}-control-plane-3"
${CMD} grep "server: https://${IP_ADDRESS}:6443" /etc/kubernetes/kubelet.conf || exit 1

Expand Down
14 changes: 13 additions & 1 deletion kinder/pkg/cluster/manager/actions/setup-external-ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ func SetupExternalCA(c *status.Cluster, vLevel int) error {
return nil
}

generateKubeletConfWorker := func(n *status.Node) error {
if err := n.Command(
"/bin/sh", "-c",
fmt.Sprintf("kubeadm init phase kubeconfig kubelet --control-plane-endpoint=%s --apiserver-advertise-address=%s --v=%d",
Copy link
Member

Choose a reason for hiding this comment

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

i guess that's one way of working around without post processing with sed or something else. nice.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, first wanted to do sed but noticed this works too and does not require an additional command :-)

loadBalancerIP, loadBalancerIP,
vLevel),
).RunWithEcho(); err != nil {
return errors.Wrapf(err, "could not generate a kubelet.conf on node: %s", n.Name())
}
return nil
}

// iterate secondary CP nodes
for _, n := range c.SecondaryControlPlanes() {
// copy the shared kubeconfig files
Expand Down Expand Up @@ -108,7 +120,7 @@ func SetupExternalCA(c *status.Cluster, vLevel int) error {
}

// generate kubelet.conf
if err := generateKubeletConf(n); err != nil {
if err := generateKubeletConfWorker(n); err != nil {
return err
}
}
Expand Down