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

Kubelet configuration Machine annotations #1135

Merged
merged 2 commits into from
Dec 19, 2021
Merged

Kubelet configuration Machine annotations #1135

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
eea575e
New v1.kubelet-config.machine-controller.kubermatic.io annotation
kron4eg Dec 16, 2021
5de6fe4
Update fixtures
kron4eg Dec 16, 2021
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
33 changes: 27 additions & 6 deletions pkg/apis/cluster/common/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,17 @@ const (
ExternalCloudProviderKubeletFlag KubeletFlags = "ExternalCloudProvider"
)

const (
SystemReservedKubeletConfig = "SystemReserved"
KubeReservedKubeletConfig = "KubeReserved"
EvictionHardKubeletConfig = "EvictionHard"
)

const (
// Annotation prefixes, used on Machine objects to indicate the parameters that been used to create those Machines
KubeletFeatureGatesAnnotationPrefixV1 = "v1.kubelet-featuregates.machine-controller.kubermatic.io"
KubeletFlagsGroupAnnotationPrefixV1 = "v1.kubelet-flags.machine-controller.kubermatic.io"
KubeletConfigAnnotationPrefixV1 = "v1.kubelet-config.machine-controller.kubermatic.io"
)

// SetKubeletFeatureGates marshal and save featureGates into metaobject annotations with
Expand Down Expand Up @@ -165,11 +172,25 @@ func SetKubeletFlags(metaobj metav1.Object, flags map[KubeletFlags]string) {
metaobj.SetAnnotations(annts)
}

func GetKubeletFeatureGates(metaobj metav1.Object) map[string]bool {
func GetKubeletConfigs(annotations map[string]string) map[string]string {
configs := map[string]string{}
for name, value := range annotations {
if strings.HasPrefix(name, KubeletConfigAnnotationPrefixV1) {
nameConfigValue := strings.SplitN(name, "/", 2)
if len(nameConfigValue) != 2 {
continue
}
configs[nameConfigValue[1]] = value
}
}
return configs
}

func GetKubeletFeatureGates(annotations map[string]string) map[string]bool {
result := map[string]bool{}
for name, value := range metaobj.GetAnnotations() {
for name, value := range annotations {
if strings.HasPrefix(name, KubeletFeatureGatesAnnotationPrefixV1) {
nameGateValue := strings.Split(name, "/")
nameGateValue := strings.SplitN(name, "/", 2)
if len(nameGateValue) != 2 {
continue
}
Expand All @@ -180,11 +201,11 @@ func GetKubeletFeatureGates(metaobj metav1.Object) map[string]bool {
return result
}

func GetKubeletFlags(metaobj metav1.Object) map[KubeletFlags]string {
func GetKubeletFlags(annotations map[string]string) map[KubeletFlags]string {
result := map[KubeletFlags]string{}
for name, value := range metaobj.GetAnnotations() {
for name, value := range annotations {
if strings.HasPrefix(name, KubeletFlagsGroupAnnotationPrefixV1) {
nameFlagValue := strings.Split(name, "/")
nameFlagValue := strings.SplitN(name, "/", 2)
if len(nameFlagValue) != 2 {
continue
}
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/plugin/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type UserDataRequest struct {
NoProxy string
PauseImage string
KubeletFeatureGates map[string]bool
KubeletConfigs map[string]string
ContainerRuntime containerruntime.Config
PodCIDR string
NodePortRange string
Expand Down
6 changes: 4 additions & 2 deletions pkg/controller/machine/machine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,14 +705,15 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
}

// grab kubelet featureGates from the annotations
kubeletFeatureGates := common.GetKubeletFeatureGates(machine)
kubeletFeatureGates := common.GetKubeletFeatureGates(machine.GetAnnotations())
if len(kubeletFeatureGates) == 0 {
// fallback to command-line input
kubeletFeatureGates = r.nodeSettings.KubeletFeatureGates
}

// grab kubelet general options from the annotations
kubeletFlags := common.GetKubeletFlags(machine)
kubeletFlags := common.GetKubeletFlags(machine.GetAnnotations())
KubeletConfigs := common.GetKubeletConfigs(machine.GetAnnotations())

// look up for ExternalCloudProvider feature, with fallback to command-line input
externalCloudProvider := r.nodeSettings.ExternalCloudProvider
Expand All @@ -729,6 +730,7 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
DNSIPs: r.nodeSettings.ClusterDNSIPs,
PauseImage: r.nodeSettings.PauseImage,
KubeletFeatureGates: kubeletFeatureGates,
KubeletConfigs: KubeletConfigs,
NoProxy: r.nodeSettings.NoProxy,
HTTPProxy: r.nodeSettings.HTTPProxy,
ContainerRuntime: r.nodeSettings.ContainerRuntime,
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/amzn2/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ write_files:

- path: "/etc/kubernetes/kubelet.conf"
content: |
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates | indent 4 }}
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates .KubeletConfigs | indent 4 }}

- path: "/etc/kubernetes/pki/ca.crt"
content: |
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/containerd-kubelet-v1.20-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.19-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.20-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.21-aws-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.21-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere-mirrors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/amzn2/testdata/kubelet-v1.22-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/centos/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ write_files:

- path: "/etc/kubernetes/kubelet.conf"
content: |
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates | indent 4 }}
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates .KubeletConfigs | indent 4 }}

- path: "/etc/kubernetes/pki/ca.crt"
content: |
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-containerd-v1.20-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.19-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.20-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.21-aws-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.21-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.21-vsphere-mirrors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.21-vsphere-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.21-vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ write_files:
cgroupDriver: systemd
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
4 changes: 2 additions & 2 deletions pkg/userdata/flatcar/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ storage:
mode: 0644
contents:
inline: |
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates | indent 10 }}
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates .KubeletConfigs | indent 10 }}

- path: /opt/load-kernel-modules.sh
filesystem: root
Expand Down Expand Up @@ -551,7 +551,7 @@ write_files:
- path: "/etc/kubernetes/kubelet.conf"
permissions: "0644"
content: |
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates | indent 4 }}
{{ kubeletConfiguration "cluster.local" .DNSIPs .KubeletFeatureGates .KubeletConfigs | indent 4 }}

- path: /opt/load-kernel-modules.sh
permissions: "0755"
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/flatcar/testdata/cloud-init_v1.19.15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ write_files:
- 10.10.10.10
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/flatcar/testdata/cloud-init_v1.20.11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ write_files:
- 10.10.10.10
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/flatcar/testdata/cloud-init_v1.21.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ write_files:
- 10.10.10.10
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
5 changes: 5 additions & 0 deletions pkg/userdata/flatcar/testdata/cloud-init_v1.22.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ write_files:
- 10.10.10.10
clusterDomain: cluster.local
cpuManagerReconcilePeriod: 0s
evictionHard:
imagefs.available: 15%
memory.available: 100Mi
nodefs.available: 10%
nodefs.inodesFree: 5%
evictionPressureTransitionPeriod: 0s
featureGates:
RotateKubeletServerCertificate: true
Expand Down
Loading