Skip to content

Commit 770d430

Browse files
committed
Update kubelet golden test fixtures
Regenerate the featuregates and warmpool tasks-*.yaml golden files so DAEMON_ARGS no longer contains the migrated flags and kubelet.conf now carries the equivalent values (cgroupDriver, clusterDNS, clusterDomain, authentication.x509.clientCAFile, evictionHard map, etc.). Generated via hack/update-expected.sh.
1 parent f120a88 commit 770d430

2 files changed

Lines changed: 51 additions & 6 deletions

File tree

nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests
33
type: directory
44
---
55
contents: |
6-
DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin"
6+
DAEMON_ARGS="--cloud-provider=external --kubeconfig=/var/lib/kubelet/kubeconfig --register-schedulable=true --runtime-request-timeout=15m0s --v=2 --cloud-config=/etc/kubernetes/in-tree-cloud.config --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin"
77
HOME="/root"
88
path: /etc/sysconfig/kubelet
99
type: file
@@ -16,15 +16,33 @@ contents: |
1616
anonymous: {}
1717
webhook:
1818
cacheTTL: 0s
19-
x509: {}
19+
enabled: true
20+
x509:
21+
clientCAFile: /srv/kubernetes/ca.crt
2022
authorization:
23+
mode: Webhook
2124
webhook:
2225
cacheAuthorizedTTL: 0s
2326
cacheUnauthorizedTTL: 0s
24-
containerRuntimeEndpoint: ""
27+
cgroupDriver: systemd
28+
cgroupRoot: /
29+
clusterDNS:
30+
- 100.64.0.10
31+
clusterDomain: cluster.local
32+
containerRuntimeEndpoint: unix:///run/containerd/containerd.sock
2533
cpuManagerReconcilePeriod: 0s
2634
crashLoopBackOff: {}
35+
enableDebuggingHandlers: true
36+
evictionHard:
37+
imagefs.available: 10%
38+
imagefs.inodesFree: 5%
39+
memory.available: 100Mi
40+
nodefs.available: 10%
41+
nodefs.inodesFree: 5%
2742
evictionPressureTransitionPeriod: 0s
43+
featureGates:
44+
AllowExtTrafficLocalEndpoints: false
45+
ExperimentalCriticalPodAnnotation: true
2846
fileCheckFrequency: 0s
2947
httpCheckFrequency: 0s
3048
imageMaximumGCAge: 0s
@@ -41,11 +59,17 @@ contents: |
4159
memorySwap: {}
4260
nodeStatusReportFrequency: 0s
4361
nodeStatusUpdateFrequency: 0s
62+
protectKernelDefaults: true
63+
resolvConf: /run/systemd/resolve/resolv.conf
4464
runtimeRequestTimeout: 0s
4565
shutdownGracePeriod: 30s
4666
shutdownGracePeriodCriticalPods: 10s
67+
staticPodPath: /etc/kubernetes/manifests
4768
streamingConnectionIdleTimeout: 0s
4869
syncFrequency: 0s
70+
tlsCertFile: /srv/kubernetes/kubelet-server.crt
71+
tlsPrivateKeyFile: /srv/kubernetes/kubelet-server.key
72+
volumePluginDir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/
4973
volumeStatsAggPeriod: 0s
5074
path: /var/lib/kubelet/kubelet.conf
5175
type: file

nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests
33
type: directory
44
---
55
contents: |
6-
DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --kubeconfig=/var/lib/kubelet/kubeconfig --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin"
6+
DAEMON_ARGS="--cloud-provider=external --kubeconfig=/var/lib/kubelet/kubeconfig --register-schedulable=true --runtime-request-timeout=15m0s --v=2 --cloud-config=/etc/kubernetes/in-tree-cloud.config --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin"
77
HOME="/root"
88
path: /etc/sysconfig/kubelet
99
type: file
@@ -16,14 +16,29 @@ contents: |
1616
anonymous: {}
1717
webhook:
1818
cacheTTL: 0s
19-
x509: {}
19+
enabled: true
20+
x509:
21+
clientCAFile: /srv/kubernetes/ca.crt
2022
authorization:
23+
mode: Webhook
2124
webhook:
2225
cacheAuthorizedTTL: 0s
2326
cacheUnauthorizedTTL: 0s
24-
containerRuntimeEndpoint: ""
27+
cgroupDriver: systemd
28+
cgroupRoot: /
29+
clusterDNS:
30+
- 100.64.0.10
31+
clusterDomain: cluster.local
32+
containerRuntimeEndpoint: unix:///run/containerd/containerd.sock
2533
cpuManagerReconcilePeriod: 0s
2634
crashLoopBackOff: {}
35+
enableDebuggingHandlers: true
36+
evictionHard:
37+
imagefs.available: 10%
38+
imagefs.inodesFree: 5%
39+
memory.available: 100Mi
40+
nodefs.available: 10%
41+
nodefs.inodesFree: 5%
2742
evictionPressureTransitionPeriod: 0s
2843
fileCheckFrequency: 0s
2944
httpCheckFrequency: 0s
@@ -41,11 +56,17 @@ contents: |
4156
memorySwap: {}
4257
nodeStatusReportFrequency: 0s
4358
nodeStatusUpdateFrequency: 0s
59+
protectKernelDefaults: true
60+
resolvConf: /run/systemd/resolve/resolv.conf
4461
runtimeRequestTimeout: 0s
4562
shutdownGracePeriod: 30s
4663
shutdownGracePeriodCriticalPods: 10s
64+
staticPodPath: /etc/kubernetes/manifests
4765
streamingConnectionIdleTimeout: 0s
4866
syncFrequency: 0s
67+
tlsCertFile: /srv/kubernetes/kubelet-server.crt
68+
tlsPrivateKeyFile: /srv/kubernetes/kubelet-server.key
69+
volumePluginDir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/
4970
volumeStatsAggPeriod: 0s
5071
path: /var/lib/kubelet/kubelet.conf
5172
type: file

0 commit comments

Comments
 (0)