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

🐛 capd: fix ignition to also set the kube-proxy configuration to skip setting sysctls #9894

Merged
merged 1 commit into from
Dec 18, 2023
Merged

🐛 capd: fix ignition to also set the kube-proxy configuration to skip setting sysctls #9894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions test/e2e/data/infrastructure-docker/main/cluster-template-ignition/ignition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ spec:
kubeletExtraArgs:
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
fail-swap-on: "false"
cgroup-root: "/kubelet"
runtime-cgroups: "/system.slice/containerd.service"
joinConfiguration:
nodeRegistration:
# We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
fail-swap-on: "false"
cgroup-root: "/kubelet"
runtime-cgroups: "/system.slice/containerd.service"
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
Expand All @@ -45,3 +49,5 @@ spec:
kubeletExtraArgs:
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
fail-swap-on: "false"
cgroup-root: "/kubelet"
runtime-cgroups: "/system.slice/containerd.service"
23 changes: 23 additions & 0 deletions test/infrastructure/docker/internal/provisioning/ignition/kindadapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ import (
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning"
)

const (
kubeproxyComponentConfig = `
---
apiVersion: kubeproxy.config.k8s.io/v1alpha1
kind: KubeProxyConfiguration
conntrack:
# Skip setting sysctl value "net.netfilter.nf_conntrack_max"
# It is a global variable that affects other namespaces
maxPerCore: 0
`
)

// RawIgnitionToProvisioningCommands converts an Ignition YAML document to a slice of commands.
func RawIgnitionToProvisioningCommands(config []byte) ([]provisioning.Cmd, error) {
// Ensure Ignition is a valid YAML document.
Expand Down Expand Up @@ -76,6 +88,10 @@ func getActions(userData []byte) ([]provisioning.Cmd, error) {
contents = hackKubeadmIgnoreErrors(contents)
}

if f.Path == "/etc/kubeadm.yml" {
contents = hackKubeProxySysctlWorkaround(contents)
}

commands = append(commands, []provisioning.Cmd{
// Idempotently create the directory.
{Cmd: "mkdir", Args: []string{"-p", filepath.Dir(f.Path)}},
Expand Down Expand Up @@ -118,6 +134,13 @@ func hackKubeadmIgnoreErrors(s string) string {
return strings.Join(lines, "\n")
}

// hackKubeProxySysctlWorkaround adds kube-proxy configuration for kubeadm so it
// to skips setting the sysctl value for "net.netfilter.nf_conntrack_max"
// which would fail on kind clusters because of the sysctls being read-only.
func hackKubeProxySysctlWorkaround(s string) string {
return s + kubeproxyComponentConfig
}

// decodeFileContents accepts a string representing the contents of a file encoded in Ignition
// format and returns a decoded version of the string.
func decodeFileContents(s string) (string, error) {
Expand Down