Skip to content

Commit 74e303a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8361 from killianmuldoon/update-e2e-upgrade-versions
🌱 Update e2e upgrade test versions
2 parents 6100ef8 + a84547b commit 74e303a

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎test/e2e/clusterctl_upgrade_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
9696
SkipCleanup: skipCleanup,
9797
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/clusterctl-{OS}-{ARCH}",
9898
// We have to pin the providers because with `InitWithProvidersContract` the test would
99-
// use the latest version for the contract (which is v1.3.0 for v1beta1).
99+
// use the latest version for the contract (which is v1.3.X for v1beta1).
100100
InitWithCoreProvider: "cluster-api:v1.0.5",
101101
InitWithBootstrapProviders: []string{"kubeadm:v1.0.5"},
102102
InitWithControlPlaneProviders: []string{"kubeadm:v1.0.5"},
@@ -131,13 +131,13 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
131131
BootstrapClusterProxy: bootstrapClusterProxy,
132132
ArtifactFolder: artifactFolder,
133133
SkipCleanup: skipCleanup,
134-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/clusterctl-{OS}-{ARCH}",
134+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
135135
// We have to pin the providers because with `InitWithProvidersContract` the test would
136-
// use the latest version for the contract (which is v1.3.0 for v1beta1).
137-
InitWithCoreProvider: "cluster-api:v1.2.8",
138-
InitWithBootstrapProviders: []string{"kubeadm:v1.2.8"},
139-
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.8"},
140-
InitWithInfrastructureProviders: []string{"docker:v1.2.8"},
136+
// use the latest version for the contract (which is v1.3.X for v1beta1).
137+
InitWithCoreProvider: "cluster-api:v1.2.11",
138+
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
139+
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
140+
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
141141
// We have to set this to an empty array as clusterctl v1.2 doesn't support
142142
// runtime extension providers. If we don't do this the test will automatically
143143
// try to deploy the latest version of our test-extension from docker.yaml.
@@ -170,13 +170,13 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
170170
BootstrapClusterProxy: bootstrapClusterProxy,
171171
ArtifactFolder: artifactFolder,
172172
SkipCleanup: skipCleanup,
173-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/clusterctl-{OS}-{ARCH}",
173+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
174174
// We have to pin the providers because with `InitWithProvidersContract` the test would
175-
// use the latest version for the contract (which is v1.3.0 for v1beta1).
176-
InitWithCoreProvider: "cluster-api:v1.2.8",
177-
InitWithBootstrapProviders: []string{"kubeadm:v1.2.8"},
178-
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.8"},
179-
InitWithInfrastructureProviders: []string{"docker:v1.2.8"},
175+
// use the latest version for the contract (which is v1.3.X for v1beta1).
176+
InitWithCoreProvider: "cluster-api:v1.2.11",
177+
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
178+
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
179+
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
180180
// We have to set this to an empty array as clusterctl v1.2 doesn't support
181181
// runtime extension providers. If we don't do this the test will automatically
182182
// try to deploy the latest version of our test-extension from docker.yaml.
@@ -209,7 +209,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
209209
BootstrapClusterProxy: bootstrapClusterProxy,
210210
ArtifactFolder: artifactFolder,
211211
SkipCleanup: skipCleanup,
212-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
212+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
213213
InitWithProvidersContract: "v1beta1",
214214
InitWithKubernetesVersion: "v1.26.0",
215215
MgmtFlavor: "topology",
@@ -237,7 +237,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
237237
BootstrapClusterProxy: bootstrapClusterProxy,
238238
ArtifactFolder: artifactFolder,
239239
SkipCleanup: skipCleanup,
240-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
240+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
241241
InitWithProvidersContract: "v1beta1",
242242
InitWithKubernetesVersion: "v1.26.0",
243243
MgmtFlavor: "topology",

‎test/e2e/config/docker.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ providers:
5858
new: --metrics-addr=:8080
5959
files:
6060
- sourcePath: "../data/shared/v1.0/metadata.yaml"
61-
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
62-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/core-components.yaml"
61+
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
62+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/core-components.yaml"
6363
type: "url"
6464
contract: v1beta1
6565
replacements:
6666
- old: --metrics-addr=127.0.0.1:8080
6767
new: --metrics-addr=:8080
6868
files:
6969
- sourcePath: "../data/shared/v1.2/metadata.yaml"
70-
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
71-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/core-components.yaml"
70+
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
71+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml"
7272
type: "url"
7373
contract: v1beta1
7474
replacements:
@@ -114,17 +114,17 @@ providers:
114114
new: --metrics-addr=:8080
115115
files:
116116
- sourcePath: "../data/shared/v1.0/metadata.yaml"
117-
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
118-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/bootstrap-components.yaml"
117+
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
118+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/bootstrap-components.yaml"
119119
type: "url"
120120
contract: v1beta1
121121
replacements:
122122
- old: --metrics-addr=127.0.0.1:8080
123123
new: --metrics-addr=:8080
124124
files:
125125
- sourcePath: "../data/shared/v1.2/metadata.yaml"
126-
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
127-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/bootstrap-components.yaml"
126+
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
127+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml"
128128
type: "url"
129129
contract: v1beta1
130130
replacements:
@@ -170,17 +170,17 @@ providers:
170170
new: --metrics-addr=:8080
171171
files:
172172
- sourcePath: "../data/shared/v1.0/metadata.yaml"
173-
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
174-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/control-plane-components.yaml"
173+
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
174+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/control-plane-components.yaml"
175175
type: "url"
176176
contract: v1beta1
177177
replacements:
178178
- old: --metrics-addr=127.0.0.1:8080
179179
new: --metrics-addr=:8080
180180
files:
181181
- sourcePath: "../data/shared/v1.2/metadata.yaml"
182-
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
183-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/control-plane-components.yaml"
182+
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
183+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml"
184184
type: "url"
185185
contract: v1beta1
186186
replacements:
@@ -229,8 +229,8 @@ providers:
229229
files:
230230
- sourcePath: "../data/shared/v1.0/metadata.yaml"
231231
- sourcePath: "../data/infrastructure-docker/v1.0/cluster-template.yaml"
232-
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
233-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/infrastructure-components-development.yaml"
232+
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
233+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/infrastructure-components-development.yaml"
234234
type: "url"
235235
contract: v1beta1
236236
replacements:
@@ -241,8 +241,8 @@ providers:
241241
- sourcePath: "../data/infrastructure-docker/v1.2/cluster-template.yaml"
242242
- sourcePath: "../data/infrastructure-docker/v1.2/cluster-template-topology.yaml"
243243
- sourcePath: "../data/infrastructure-docker/v1.2/clusterclass-quick-start.yaml"
244-
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
245-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/infrastructure-components-development.yaml"
244+
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
245+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/infrastructure-components-development.yaml"
246246
type: "url"
247247
contract: v1beta1
248248
replacements:

0 commit comments

Comments
 (0)