Skip to content

Commit cdcae95

Browse files
hakmanhakman
committed
hack/update-expected.sh
1 parent 1fab35b commit cdcae95

File tree

415 files changed

+5299
-10803
lines changed

Some content is hidden

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

415 files changed

+5299
-10803
lines changed

‎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
@@ -130,7 +130,7 @@ ClusterName: additionalobjects.example.com
130130
ConfigBase: memfs://tests/additionalobjects.example.com
131131
InstanceGroupName: master-us-test-1a
132132
InstanceGroupRole: ControlPlane
133-
NodeupConfigHash: c3CHP3c8XcaeIefdPZnbAXbsB7goMOnl2Nm/OwOAq7E=
133+
NodeupConfigHash: 46MIwXcmIa2xqaL/9Ukl2iHjKA1PHJaKh2lyTzbAq5Y=
134134
135135
__EOF_KUBE_ENV
136136

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ spec:
180180
enableDebuggingHandlers: true
181181
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
182182
featureGates:
183+
ImageVolume: "true"
183184
InTreePluginAWSUnregister: "true"
184185
kubeconfigPath: /var/lib/kubelet/kubeconfig
185186
logLevel: 2

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ KubeletConfig:
297297
enableDebuggingHandlers: true
298298
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
299299
featureGates:
300+
ImageVolume: "true"
300301
InTreePluginAWSUnregister: "true"
301302
kubeconfigPath: /var/lib/kubelet/kubeconfig
302303
logLevel: 2

‎tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ClusterName: minimal.example.com
130130
ConfigBase: memfs://clusters.example.com/minimal.example.com
131131
InstanceGroupName: master-us-test-1a
132132
InstanceGroupRole: ControlPlane
133-
NodeupConfigHash: Dp/TXKLZQ3ou94i7mEfLod0oOBAJuvH+k+rYAEIzDYQ=
133+
NodeupConfigHash: NTDhk+543GKf5mHx6WFgcema56YGu2oIQZK7/iQScWw=
134134
135135
__EOF_KUBE_ENV
136136

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ spec:
172172
enableDebuggingHandlers: true
173173
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
174174
featureGates:
175+
ImageVolume: "true"
175176
InTreePluginAWSUnregister: "true"
176177
kubeconfigPath: /var/lib/kubelet/kubeconfig
177178
logLevel: 2

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ KubeletConfig:
295295
enableDebuggingHandlers: true
296296
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
297297
featureGates:
298+
ImageVolume: "true"
298299
InTreePluginAWSUnregister: "true"
299300
kubeconfigPath: /var/lib/kubelet/kubeconfig
300301
logLevel: 2

‎tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ClusterName: minimal.example.com
130130
ConfigBase: memfs://clusters.example.com/minimal.example.com
131131
InstanceGroupName: master-us-test-1a
132132
InstanceGroupRole: ControlPlane
133-
NodeupConfigHash: HL8s6tqIg5RtYVVVCqX0o8VB5xeUHMraOpenvvW+gIM=
133+
NodeupConfigHash: OnPXbD6Mu057jDZnlPv2F+8ZM3H6xJMcJ+d2pTtwQFk=
134134
135135
__EOF_KUBE_ENV
136136

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ spec:
168168
clusterDomain: cluster.local
169169
enableDebuggingHandlers: true
170170
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
171+
featureGates:
172+
ImageVolume: "true"
171173
kubeconfigPath: /var/lib/kubelet/kubeconfig
172174
logLevel: 2
173175
podInfraContainerImage: registry.k8s.io/pause:3.9

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

Lines changed: 32 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -38,80 +38,34 @@ spec:
3838
name: pki
3939
- mountPath: /opt
4040
name: opt
41+
- mountPath: /opt/etcd-v3.4.13
42+
name: etcd-v3-4-13
43+
- mountPath: /opt/etcd-v3.4.3
44+
name: etcd-v3-4-13
45+
- mountPath: /opt/etcd-v3.5.0
46+
name: etcd-v3-5-21
47+
- mountPath: /opt/etcd-v3.5.1
48+
name: etcd-v3-5-21
49+
- mountPath: /opt/etcd-v3.5.13
50+
name: etcd-v3-5-21
51+
- mountPath: /opt/etcd-v3.5.17
52+
name: etcd-v3-5-21
53+
- mountPath: /opt/etcd-v3.5.21
54+
name: etcd-v3-5-21
55+
- mountPath: /opt/etcd-v3.5.3
56+
name: etcd-v3-5-21
57+
- mountPath: /opt/etcd-v3.5.4
58+
name: etcd-v3-5-21
59+
- mountPath: /opt/etcd-v3.5.6
60+
name: etcd-v3-5-21
61+
- mountPath: /opt/etcd-v3.5.7
62+
name: etcd-v3-5-21
63+
- mountPath: /opt/etcd-v3.5.9
64+
name: etcd-v3-5-21
4165
- mountPath: /var/log/etcd.log
4266
name: varlogetcd
4367
hostNetwork: true
4468
hostPID: true
45-
initContainers:
46-
- args:
47-
- --target-dir=/opt/kops-utils/
48-
- --src=/ko-app/kops-utils-cp
49-
command:
50-
- /ko-app/kops-utils-cp
51-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
52-
name: kops-utils-cp
53-
resources: {}
54-
volumeMounts:
55-
- mountPath: /opt
56-
name: opt
57-
- args:
58-
- --target-dir=/opt/etcd-v3.4.13
59-
- --src=/usr/local/bin/etcd
60-
- --src=/usr/local/bin/etcdctl
61-
command:
62-
- /opt/kops-utils/kops-utils-cp
63-
image: registry.k8s.io/etcd:v3.4.13
64-
name: init-etcd-3-4-13
65-
resources: {}
66-
volumeMounts:
67-
- mountPath: /opt
68-
name: opt
69-
- args:
70-
- --target-dir=/opt/etcd-v3.5.21
71-
- --src=/usr/local/bin/etcd
72-
- --src=/usr/local/bin/etcdctl
73-
command:
74-
- /opt/kops-utils/kops-utils-cp
75-
image: registry.k8s.io/etcd:v3.5.21
76-
name: init-etcd-3-5-21
77-
resources: {}
78-
volumeMounts:
79-
- mountPath: /opt
80-
name: opt
81-
- args:
82-
- --symlink
83-
- --target-dir=/opt/etcd-v3.4.3
84-
- --src=/opt/etcd-v3.4.13/etcd
85-
- --src=/opt/etcd-v3.4.13/etcdctl
86-
command:
87-
- /opt/kops-utils/kops-utils-cp
88-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
89-
name: init-etcd-symlinks-3-4-13
90-
resources: {}
91-
volumeMounts:
92-
- mountPath: /opt
93-
name: opt
94-
- args:
95-
- --symlink
96-
- --target-dir=/opt/etcd-v3.5.0
97-
- --target-dir=/opt/etcd-v3.5.1
98-
- --target-dir=/opt/etcd-v3.5.13
99-
- --target-dir=/opt/etcd-v3.5.17
100-
- --target-dir=/opt/etcd-v3.5.3
101-
- --target-dir=/opt/etcd-v3.5.4
102-
- --target-dir=/opt/etcd-v3.5.6
103-
- --target-dir=/opt/etcd-v3.5.7
104-
- --target-dir=/opt/etcd-v3.5.9
105-
- --src=/opt/etcd-v3.5.21/etcd
106-
- --src=/opt/etcd-v3.5.21/etcdctl
107-
command:
108-
- /opt/kops-utils/kops-utils-cp
109-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
110-
name: init-etcd-symlinks-3-5-21
111-
resources: {}
112-
volumeMounts:
113-
- mountPath: /opt
114-
name: opt
11569
priorityClassName: system-cluster-critical
11670
tolerations:
11771
- key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
13185
name: pki
13286
- emptyDir: {}
13387
name: opt
88+
- image:
89+
pullPolicy: IfNotPresent
90+
reference: registry.k8s.io/etcd:v3.4.13
91+
name: etcd-v3-4-13
92+
- image:
93+
pullPolicy: IfNotPresent
94+
reference: registry.k8s.io/etcd:v3.5.21
95+
name: etcd-v3-5-21
13496
- hostPath:
13597
path: /var/log/etcd-events.log
13698
type: FileOrCreate

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

Lines changed: 32 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -38,80 +38,34 @@ spec:
3838
name: pki
3939
- mountPath: /opt
4040
name: opt
41+
- mountPath: /opt/etcd-v3.4.13
42+
name: etcd-v3-4-13
43+
- mountPath: /opt/etcd-v3.4.3
44+
name: etcd-v3-4-13
45+
- mountPath: /opt/etcd-v3.5.0
46+
name: etcd-v3-5-21
47+
- mountPath: /opt/etcd-v3.5.1
48+
name: etcd-v3-5-21
49+
- mountPath: /opt/etcd-v3.5.13
50+
name: etcd-v3-5-21
51+
- mountPath: /opt/etcd-v3.5.17
52+
name: etcd-v3-5-21
53+
- mountPath: /opt/etcd-v3.5.21
54+
name: etcd-v3-5-21
55+
- mountPath: /opt/etcd-v3.5.3
56+
name: etcd-v3-5-21
57+
- mountPath: /opt/etcd-v3.5.4
58+
name: etcd-v3-5-21
59+
- mountPath: /opt/etcd-v3.5.6
60+
name: etcd-v3-5-21
61+
- mountPath: /opt/etcd-v3.5.7
62+
name: etcd-v3-5-21
63+
- mountPath: /opt/etcd-v3.5.9
64+
name: etcd-v3-5-21
4165
- mountPath: /var/log/etcd.log
4266
name: varlogetcd
4367
hostNetwork: true
4468
hostPID: true
45-
initContainers:
46-
- args:
47-
- --target-dir=/opt/kops-utils/
48-
- --src=/ko-app/kops-utils-cp
49-
command:
50-
- /ko-app/kops-utils-cp
51-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
52-
name: kops-utils-cp
53-
resources: {}
54-
volumeMounts:
55-
- mountPath: /opt
56-
name: opt
57-
- args:
58-
- --target-dir=/opt/etcd-v3.4.13
59-
- --src=/usr/local/bin/etcd
60-
- --src=/usr/local/bin/etcdctl
61-
command:
62-
- /opt/kops-utils/kops-utils-cp
63-
image: registry.k8s.io/etcd:v3.4.13
64-
name: init-etcd-3-4-13
65-
resources: {}
66-
volumeMounts:
67-
- mountPath: /opt
68-
name: opt
69-
- args:
70-
- --target-dir=/opt/etcd-v3.5.21
71-
- --src=/usr/local/bin/etcd
72-
- --src=/usr/local/bin/etcdctl
73-
command:
74-
- /opt/kops-utils/kops-utils-cp
75-
image: registry.k8s.io/etcd:v3.5.21
76-
name: init-etcd-3-5-21
77-
resources: {}
78-
volumeMounts:
79-
- mountPath: /opt
80-
name: opt
81-
- args:
82-
- --symlink
83-
- --target-dir=/opt/etcd-v3.4.3
84-
- --src=/opt/etcd-v3.4.13/etcd
85-
- --src=/opt/etcd-v3.4.13/etcdctl
86-
command:
87-
- /opt/kops-utils/kops-utils-cp
88-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
89-
name: init-etcd-symlinks-3-4-13
90-
resources: {}
91-
volumeMounts:
92-
- mountPath: /opt
93-
name: opt
94-
- args:
95-
- --symlink
96-
- --target-dir=/opt/etcd-v3.5.0
97-
- --target-dir=/opt/etcd-v3.5.1
98-
- --target-dir=/opt/etcd-v3.5.13
99-
- --target-dir=/opt/etcd-v3.5.17
100-
- --target-dir=/opt/etcd-v3.5.3
101-
- --target-dir=/opt/etcd-v3.5.4
102-
- --target-dir=/opt/etcd-v3.5.6
103-
- --target-dir=/opt/etcd-v3.5.7
104-
- --target-dir=/opt/etcd-v3.5.9
105-
- --src=/opt/etcd-v3.5.21/etcd
106-
- --src=/opt/etcd-v3.5.21/etcdctl
107-
command:
108-
- /opt/kops-utils/kops-utils-cp
109-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
110-
name: init-etcd-symlinks-3-5-21
111-
resources: {}
112-
volumeMounts:
113-
- mountPath: /opt
114-
name: opt
11569
priorityClassName: system-cluster-critical
11670
tolerations:
11771
- key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
13185
name: pki
13286
- emptyDir: {}
13387
name: opt
88+
- image:
89+
pullPolicy: IfNotPresent
90+
reference: registry.k8s.io/etcd:v3.4.13
91+
name: etcd-v3-4-13
92+
- image:
93+
pullPolicy: IfNotPresent
94+
reference: registry.k8s.io/etcd:v3.5.21
95+
name: etcd-v3-5-21
13496
- hostPath:
13597
path: /var/log/etcd.log
13698
type: FileOrCreate

0 commit comments

Comments
 (0)