Skip to content

Commit 1470291

Browse files
committed
hack/update-expected.sh
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
1 parent 75ca33a commit 1470291

425 files changed

Lines changed: 426 additions & 502 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

nodeup/pkg/model/tests/containerdbuilder/complex/tasks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ contents: |
2626
[plugins]
2727
2828
[plugins."io.containerd.grpc.v1.cri"]
29-
sandbox_image = "registry.k8s.io/pause:3.9"
29+
sandbox_image = "registry.k8s.io/pause:3.10.1"
3030
3131
[plugins."io.containerd.grpc.v1.cri".cni]
3232
conf_template = "/etc/containerd/config-cni.template"

nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ contents: |
2626
[plugins]
2727
2828
[plugins."io.containerd.grpc.v1.cri"]
29-
sandbox_image = "registry.k8s.io/pause:3.9"
29+
sandbox_image = "registry.k8s.io/pause:3.10.1"
3030
3131
[plugins."io.containerd.grpc.v1.cri".cni]
3232
conf_template = "/etc/containerd/config-cni.template"

nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ contents: |
2626
[plugins]
2727
2828
[plugins."io.containerd.grpc.v1.cri"]
29-
sandbox_image = "registry.k8s.io/pause:3.9"
29+
sandbox_image = "registry.k8s.io/pause:3.10.1"
3030
3131
[plugins."io.containerd.grpc.v1.cri".cni]
3232
conf_template = "/etc/containerd/config-cni.template"

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

Lines changed: 1 addition & 1 deletion
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,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --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="--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,InTreePluginAWSUnregister=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"
77
HOME="/root"
88
path: /etc/sysconfig/kubelet
99
type: file

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

Lines changed: 1 addition & 1 deletion
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=InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --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="--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=InTreePluginAWSUnregister=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"
77
HOME="/root"
88
path: /etc/sysconfig/kubelet
99
type: file

tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ClusterName: additionalobjects.example.com
126126
ConfigBase: memfs://tests/additionalobjects.example.com
127127
InstanceGroupName: master-us-test-1a
128128
InstanceGroupRole: ControlPlane
129-
NodeupConfigHash: g+QHBp1D/MxT/Z0S3z7blr63E0j87FIIaxBh1+cvv7Q=
129+
NodeupConfigHash: HFcbUhodGFe2ycfdrkkY/I+39/NVx8sxesy6hAo3L9c=
130130
131131
__EOF_KUBE_ENV
132132

tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ConfigServer:
149149
- https://kops-controller.internal.additionalobjects.example.com:3988/
150150
InstanceGroupName: nodes
151151
InstanceGroupRole: Node
152-
NodeupConfigHash: aBwfUIsJ9yxEnd4525307LnhqJgtSA6tWv9hu1G4v4o=
152+
NodeupConfigHash: frzkIIzqS2PcpaWfYzaoJxHGCavEgihuJrcd95nJTTM=
153153
154154
__EOF_KUBE_ENV
155155

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ spec:
2828
logLevel: info
2929
runc:
3030
version: 1.3.0
31+
sandboxImage: registry.k8s.io/pause:3.10.1
3132
version: 2.1.4
3233
dnsZone: Z1AFAKE1ZON3YO
3334
etcdClusters:
@@ -151,7 +152,6 @@ spec:
151152
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
152153
kubeconfigPath: /var/lib/kubelet/kubeconfig
153154
logLevel: 2
154-
podInfraContainerImage: registry.k8s.io/pause:3.9
155155
podManifestPath: /etc/kubernetes/manifests
156156
protectKernelDefaults: true
157157
shutdownGracePeriod: 30s
@@ -173,7 +173,6 @@ spec:
173173
ImageVolume: "true"
174174
kubeconfigPath: /var/lib/kubelet/kubeconfig
175175
logLevel: 2
176-
podInfraContainerImage: registry.k8s.io/pause:3.9
177176
podManifestPath: /etc/kubernetes/manifests
178177
protectKernelDefaults: true
179178
shutdownGracePeriod: 30s

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ KubeletConfig:
294294
kops.k8s.io/kops-controller-pki: ""
295295
node-role.kubernetes.io/control-plane: ""
296296
node.kubernetes.io/exclude-from-external-load-balancers: ""
297-
podInfraContainerImage: registry.k8s.io/pause:3.9
298297
podManifestPath: /etc/kubernetes/manifests
299298
protectKernelDefaults: true
300299
shutdownGracePeriod: 30s
@@ -315,6 +314,7 @@ containerdConfig:
315314
logLevel: info
316315
runc:
317316
version: 1.3.0
317+
sandboxImage: registry.k8s.io/pause:3.10.1
318318
version: 2.1.4
319319
etcdManifests:
320320
- memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ KubeletConfig:
4040
nodeLabels:
4141
kops.k8s.io/instancegroup: nodes-us-test-1a
4242
node-role.kubernetes.io/node: ""
43-
podInfraContainerImage: registry.k8s.io/pause:3.9
4443
podManifestPath: /etc/kubernetes/manifests
4544
protectKernelDefaults: true
4645
shutdownGracePeriod: 30s
@@ -54,6 +53,7 @@ containerdConfig:
5453
logLevel: info
5554
runc:
5655
version: 1.3.0
56+
sandboxImage: registry.k8s.io/pause:3.10.1
5757
version: 2.1.4
5858
usesLegacyGossip: false
5959
usesNoneDNS: false

0 commit comments

Comments
 (0)