Skip to content

Commit da4af99

Browse files
hakmanhakman
committed
hack/update-expected.sh
1 parent 3f99d04 commit da4af99

10 files changed

+138
-282
lines changed

‎tests/integration/update_cluster/minimal-1.33/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://tests/minimal.example.com
131131
InstanceGroupName: master-us-test-1a
132132
InstanceGroupRole: ControlPlane
133-
NodeupConfigHash: xbmJGssuIxsJRK9XhaKClsBg2o8f0AgSGPWoqHTTX7s=
133+
NodeupConfigHash: PtkgcAnStiVeR9dBVfWvjbyz7gMCuGX83Y49gsjcrqU=
134134
135135
__EOF_KUBE_ENV
136136

‎tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_cluster-completed.spec_content‎

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

‎tests/integration/update_cluster/minimal-1.33/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.34.0-alpha.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.34.0-alpha.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.34.0-alpha.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/minimal-1.33/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.34.0-alpha.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.34.0-alpha.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.34.0-alpha.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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ KubeletConfig:
287287
clusterDomain: cluster.local
288288
enableDebuggingHandlers: true
289289
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
290+
featureGates:
291+
ImageVolume: "true"
290292
kubeconfigPath: /var/lib/kubelet/kubeconfig
291293
logLevel: 2
292294
nodeLabels:

‎tests/integration/update_cluster/minimal-1.34/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://tests/minimal.example.com
131131
InstanceGroupName: master-us-test-1a
132132
InstanceGroupRole: ControlPlane
133-
NodeupConfigHash: U8Cc2occS9dwCHbAn8DC5s6yGK9OvKSeMOHSbbuEEls=
133+
NodeupConfigHash: 7LXIccGeBgv+GPtggY8yFTHYgeCSqNF8ybqN0ho9Hrk=
134134
135135
__EOF_KUBE_ENV
136136

‎tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_cluster-completed.spec_content‎

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

0 commit comments

Comments
 (0)