Skip to content

Commit 5dd48bd

Browse files
lentzi90lentzi90
committed
E2E: Update e2e config for v1beta2
Signed-off-by: Lennart Jern <[email protected]>
1 parent 3489aa8 commit 5dd48bd

File tree

5 files changed

+76
-41
lines changed

5 files changed

+76
-41
lines changed

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,21 @@ providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20+
- name: "v1.11.99"
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/core-components.yaml"
22+
type: "url"
23+
contract: v1beta2
24+
replacements:
25+
- old: --metrics-addr=127.0.0.1:8080
26+
new: --metrics-addr=:8080
27+
files:
28+
- sourcePath: "../data/shared/capi/metadata.yaml"
2029
- name: "{go://sigs.k8s.io/[email protected]}"
2130
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
2231
type: url
2332
contract: v1beta1
2433
files:
25-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
34+
- sourcePath: "../data/shared/capi/metadata.yaml"
2635
replacements:
2736
- old: "imagePullPolicy: Always"
2837
new: "imagePullPolicy: IfNotPresent"
@@ -34,7 +43,7 @@ providers:
3443
type: url
3544
contract: v1beta1
3645
files:
37-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
46+
- sourcePath: "../data/shared/capi/metadata.yaml"
3847
replacements:
3948
- old: "imagePullPolicy: Always"
4049
new: "imagePullPolicy: IfNotPresent"
@@ -43,12 +52,21 @@ providers:
4352
- name: kubeadm
4453
type: BootstrapProvider
4554
versions:
55+
- name: "v1.11.99"
56+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/bootstrap-components.yaml"
57+
type: "url"
58+
contract: v1beta2
59+
replacements:
60+
- old: --metrics-addr=127.0.0.1:8080
61+
new: --metrics-addr=:8080
62+
files:
63+
- sourcePath: "../data/shared/capi/metadata.yaml"
4664
- name: "{go://sigs.k8s.io/[email protected]}"
4765
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
4866
type: url
4967
contract: v1beta1
5068
files:
51-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
69+
- sourcePath: "../data/shared/capi/metadata.yaml"
5270
replacements:
5371
- old: "imagePullPolicy: Always"
5472
new: "imagePullPolicy: IfNotPresent"
@@ -60,7 +78,7 @@ providers:
6078
type: url
6179
contract: v1beta1
6280
files:
63-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
81+
- sourcePath: "../data/shared/capi/metadata.yaml"
6482
replacements:
6583
- old: "imagePullPolicy: Always"
6684
new: "imagePullPolicy: IfNotPresent"
@@ -69,12 +87,21 @@ providers:
6987
- name: kubeadm
7088
type: ControlPlaneProvider
7189
versions:
90+
- name: "v1.11.99"
91+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-beta.2/control-plane-components.yaml"
92+
type: "url"
93+
contract: v1beta2
94+
replacements:
95+
- old: --metrics-addr=127.0.0.1:8080
96+
new: --metrics-addr=:8080
97+
files:
98+
- sourcePath: "../data/shared/capi/metadata.yaml"
7299
- name: "{go://sigs.k8s.io/[email protected]}"
73100
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
74101
type: url
75102
contract: v1beta1
76103
files:
77-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
104+
- sourcePath: "../data/shared/capi/metadata.yaml"
78105
replacements:
79106
- old: "imagePullPolicy: Always"
80107
new: "imagePullPolicy: IfNotPresent"
@@ -86,7 +113,7 @@ providers:
86113
type: url
87114
contract: v1beta1
88115
files:
89-
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
116+
- sourcePath: "../data/shared/capi/metadata.yaml"
90117
replacements:
91118
- old: "imagePullPolicy: Always"
92119
new: "imagePullPolicy: IfNotPresent"
@@ -101,7 +128,7 @@ providers:
101128
type: url
102129
contract: v1beta1
103130
files:
104-
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
131+
- sourcePath: "../data/shared/provider/metadata.yaml"
105132
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
106133
replacements:
107134
- old: "imagePullPolicy: Always"
@@ -116,7 +143,7 @@ providers:
116143
type: url
117144
contract: v1beta1
118145
files:
119-
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
146+
- sourcePath: "../data/shared/provider/metadata.yaml"
120147
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
121148
replacements:
122149
- old: "imagePullPolicy: Always"
@@ -125,13 +152,13 @@ providers:
125152
new: "--v=4"
126153
- old: "--leader-elect"
127154
new: "--leader-elect=false\n - --sync-period=1m"
128-
- name: v0.12.99
155+
- name: v0.13.99
129156
value: ../../../config/default
130157
# This is the upcoming version.
131158
# Specify no contract so that upgrade tests that start from a specific contract won't pick it up.
132-
# contract: v1beta1
159+
# contract: v1beta2
133160
files:
134-
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
161+
- sourcePath: "../data/shared/provider/metadata.yaml"
135162
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
136163
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template-without-lb.yaml"
137164
replacements:

‎test/e2e/data/shared/capi/metadata.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
2+
kind: Metadata
3+
releaseSeries:
4+
- major: 1
5+
minor: 2
6+
contract: v1beta1
7+
- major: 1
8+
minor: 3
9+
contract: v1beta1
10+
- major: 1
11+
minor: 4
12+
contract: v1beta1
13+
- major: 1
14+
minor: 5
15+
contract: v1beta1
16+
- major: 1
17+
minor: 6
18+
contract: v1beta1
19+
- major: 1
20+
minor: 7
21+
contract: v1beta1
22+
- major: 1
23+
minor: 8
24+
contract: v1beta1
25+
- major: 1
26+
minor: 9
27+
contract: v1beta1
28+
- major: 1
29+
minor: 10
30+
contract: v1beta1
31+
- major: 1
32+
minor: 11
33+
contract: v1beta2

‎test/e2e/data/shared/v1beta1_provider/metadata.yaml‎ renamed to ‎test/e2e/data/shared/provider/metadata.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ releaseSeries:
2525
- major: 0
2626
minor: 12
2727
contract: v1beta1
28+
- major: 0
29+
minor: 13
30+
contract: v1beta2

‎test/e2e/data/shared/v1beta1/metadata.yaml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎test/e2e/shared/defaults.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"k8s.io/apimachinery/pkg/runtime"
2727
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
28+
clusterv1b1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2829
"sigs.k8s.io/cluster-api/test/framework"
2930

3031
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
@@ -69,6 +70,7 @@ func DefaultScheme() *runtime.Scheme {
6970
framework.TryAddDefaultSchemes(sc)
7071

7172
err := errors.Join(
73+
clusterv1b1.AddToScheme(sc),
7274
orcv1alpha1.AddToScheme(sc),
7375
infrav1alpha1.AddToScheme(sc),
7476
infrav1.AddToScheme(sc),

0 commit comments

Comments
 (0)