Skip to content

Commit 4b093b2

Browse files
alexander-demicevalexander-demicev
committed
Bump CAPI version in E2E
1 parent b2128fc commit 4b093b2

12 files changed

+2902
-4738
lines changed

‎test/e2e/air_gapped_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
4343
bootstrapCluster := bootstrapClusterProxy.GetClient()
4444
configMaps := []corev1.ConfigMap{}
4545

46-
for _, fileName := range []string{"core-cluster-api-v1.4.2.yaml", "core-cluster-api-v1.4.3.yaml"} {
46+
for _, fileName := range []string{"core-cluster-api-v1.5.4.yaml", "core-cluster-api-v1.6.0.yaml"} {
4747
coreProviderComponents, err := os.ReadFile(customManifestsFolder + fileName)
4848
Expect(err).ToNot(HaveOccurred(), "Failed to read the core provider manifests file")
4949

@@ -77,7 +77,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
7777
},
7878
},
7979
},
80-
Version: "v1.4.2",
80+
Version: "v1.5.4",
8181
},
8282
},
8383
}
@@ -101,7 +101,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
101101
}), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
102102
})
103103

104-
It("should successfully upgrade a CoreProvider (v1.4.2 -> latest)", func() {
104+
It("should successfully upgrade a CoreProvider (v1.5.4 -> latest)", func() {
105105
bootstrapCluster := bootstrapClusterProxy.GetClient()
106106
coreProvider := &operatorv1.CoreProvider{}
107107
key := client.ObjectKey{Namespace: operatorNamespace, Name: coreProviderName}
@@ -153,7 +153,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
153153
bootstrapCluster := bootstrapClusterProxy.GetClient()
154154
configMaps := []corev1.ConfigMap{}
155155

156-
for _, fileName := range []string{"core-cluster-api-v1.4.2.yaml", "core-cluster-api-v1.4.3.yaml"} {
156+
for _, fileName := range []string{"core-cluster-api-v1.5.4.yaml", "core-cluster-api-v1.6.0.yaml"} {
157157
coreProviderComponents, err := os.ReadFile(customManifestsFolder + fileName)
158158
Expect(err).ToNot(HaveOccurred(), "Failed to read the core provider manifests file")
159159

‎test/e2e/compressed_manifests_test.go

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
appsv1 "k8s.io/api/apps/v1"
2828
corev1 "k8s.io/api/core/v1"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
30-
operatorv1alpha1 "sigs.k8s.io/cluster-api-operator/api/v1alpha1"
30+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
3131
"sigs.k8s.io/cluster-api/test/framework"
3232

3333
"k8s.io/utils/ptr"
@@ -49,10 +49,12 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
4949

5050
It("should successfully create a CoreProvider", func() {
5151
bootstrapCluster := bootstrapClusterProxy.GetClient()
52-
coreProvider := &operatorv1alpha1.CoreProvider{ObjectMeta: metav1.ObjectMeta{
53-
Name: coreProviderName,
54-
Namespace: operatorNamespace,
55-
}}
52+
coreProvider := &operatorv1.CoreProvider{
53+
ObjectMeta: metav1.ObjectMeta{
54+
Name: coreProviderName,
55+
Namespace: operatorNamespace,
56+
},
57+
}
5658
Expect(bootstrapCluster.Create(ctx, coreProvider)).To(Succeed())
5759

5860
By("Waiting for the core provider deployment to be ready")
@@ -63,7 +65,7 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
6365

6466
By("Waiting for core provider to be ready")
6567
WaitFor(ctx, For(coreProvider).In(bootstrapCluster).ToSatisfy(
66-
HaveStatusCondition(&coreProvider.Status.Conditions, operatorv1alpha1.ProviderInstalledCondition),
68+
HaveStatusCondition(&coreProvider.Status.Conditions, operatorv1.ProviderInstalledCondition),
6769
), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
6870

6971
By("Waiting for status.IntalledVersion to be set")
@@ -74,13 +76,13 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
7476

7577
It("should successfully create and delete an InfrastructureProvider for OCI", func() {
7678
bootstrapCluster := bootstrapClusterProxy.GetClient()
77-
infraProvider := &operatorv1alpha1.InfrastructureProvider{
79+
infraProvider := &operatorv1.InfrastructureProvider{
7880
ObjectMeta: metav1.ObjectMeta{
7981
Name: ociInfrastructureProviderName,
8082
Namespace: operatorNamespace,
8183
},
82-
Spec: operatorv1alpha1.InfrastructureProviderSpec{
83-
ProviderSpec: operatorv1alpha1.ProviderSpec{
84+
Spec: operatorv1.InfrastructureProviderSpec{
85+
ProviderSpec: operatorv1.ProviderSpec{
8486
Version: ociInfrastructureProviderVersion,
8587
},
8688
},
@@ -90,7 +92,7 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
9092

9193
By("Waiting for the infrastructure provider to be ready")
9294
WaitFor(ctx, For(infraProvider).In(bootstrapCluster).ToSatisfy(
93-
HaveStatusCondition(&infraProvider.Status.Conditions, operatorv1alpha1.ProviderInstalledCondition),
95+
HaveStatusCondition(&infraProvider.Status.Conditions, operatorv1.ProviderInstalledCondition),
9496
), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
9597

9698
By("Waiting for status.IntalledVersion to be set")
@@ -134,14 +136,14 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
134136

135137
It("should successfully create and delete an InfrastructureProvider for OCI with custom name from a pre-created ConfigMap", func() {
136138
bootstrapCluster := bootstrapClusterProxy.GetClient()
137-
infraProvider := &operatorv1alpha1.InfrastructureProvider{
139+
infraProvider := &operatorv1.InfrastructureProvider{
138140
ObjectMeta: metav1.ObjectMeta{
139141
Name: ociInfrastructureProviderCustomName,
140142
Namespace: operatorNamespace,
141143
},
142-
Spec: operatorv1alpha1.InfrastructureProviderSpec{
143-
ProviderSpec: operatorv1alpha1.ProviderSpec{
144-
FetchConfig: &operatorv1alpha1.FetchConfiguration{
144+
Spec: operatorv1.InfrastructureProviderSpec{
145+
ProviderSpec: operatorv1.ProviderSpec{
146+
FetchConfig: &operatorv1.FetchConfiguration{
145147
Selector: &metav1.LabelSelector{
146148
MatchLabels: map[string]string{
147149
"provider.cluster.x-k8s.io/name": "oci",
@@ -163,7 +165,7 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
163165

164166
By("Waiting for the infrastructure provider to be ready")
165167
WaitFor(ctx, For(infraProvider).In(bootstrapCluster).ToSatisfy(
166-
HaveStatusCondition(&infraProvider.Status.Conditions, operatorv1alpha1.ProviderInstalledCondition)),
168+
HaveStatusCondition(&infraProvider.Status.Conditions, operatorv1.ProviderInstalledCondition)),
167169
e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
168170

169171
By("Waiting for status.IntalledVersion to be set")
@@ -199,7 +201,7 @@ var _ = Describe("Create and delete a provider with manifests that don't fit the
199201

200202
It("should successfully delete a CoreProvider", func() {
201203
bootstrapCluster := bootstrapClusterProxy.GetClient()
202-
coreProvider := &operatorv1alpha1.CoreProvider{ObjectMeta: metav1.ObjectMeta{
204+
coreProvider := &operatorv1.CoreProvider{ObjectMeta: metav1.ObjectMeta{
203205
Name: coreProviderName,
204206
Namespace: operatorNamespace,
205207
}}

‎test/e2e/helm_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
5555
manifests, err := helmChart.Run(map[string]string{
5656
"configSecret.name": "test-secret-name",
5757
"configSecret.namespace": "test-secret-namespace",
58-
"core": "capi-custom-ns:cluster-api:v1.4.2",
59-
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.4.2",
60-
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.4.2",
61-
"infrastructure": "capd-custom-ns:docker:v1.4.2",
58+
"core": "capi-custom-ns:cluster-api:v1.5.4",
59+
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.5.4",
60+
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.5.4",
61+
"infrastructure": "capd-custom-ns:docker:v1.5.4",
6262
"addon": "helm-custom-ns:helm:v0.1.0-alpha.9",
6363
})
6464
Expect(err).ToNot(HaveOccurred())
@@ -72,10 +72,10 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
7272
manifests, err := helmChart.Run(map[string]string{
7373
"configSecret.name": "test-secret-name",
7474
"configSecret.namespace": "test-secret-namespace",
75-
"core": "cluster-api:v1.4.2",
76-
"controlPlane": "kubeadm:v1.4.2",
77-
"bootstrap": "kubeadm:v1.4.2",
78-
"infrastructure": "docker:v1.4.2",
75+
"core": "cluster-api:v1.5.4",
76+
"controlPlane": "kubeadm:v1.5.4",
77+
"bootstrap": "kubeadm:v1.5.4",
78+
"infrastructure": "docker:v1.5.4",
7979
"addon": "helm:v0.1.0-alpha.9",
8080
})
8181
Expect(err).ToNot(HaveOccurred())
@@ -145,7 +145,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
145145
manifests, err := helmChart.Run(map[string]string{
146146
"configSecret.name": "test-secret-name",
147147
"configSecret.namespace": "test-secret-namespace",
148-
"infrastructure": "capd-custom-ns:docker:v1.4.2;capz-custom-ns:azure:v1.10.0",
148+
"infrastructure": "capd-custom-ns:docker:v1.5.4;capz-custom-ns:azure:v1.10.0",
149149
})
150150
Expect(err).ToNot(HaveOccurred())
151151
Expect(manifests).ToNot(BeEmpty())
@@ -158,7 +158,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
158158
manifests, err := helmChart.Run(map[string]string{
159159
"configSecret.name": "test-secret-name",
160160
"configSecret.namespace": "test-secret-namespace",
161-
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.4.2;rke2-control-plane-custom-ns:rke2:v0.3.0",
161+
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.5.4;rke2-control-plane-custom-ns:rke2:v0.3.0",
162162
})
163163
Expect(err).ToNot(HaveOccurred())
164164
Expect(manifests).ToNot(BeEmpty())
@@ -171,7 +171,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
171171
manifests, err := helmChart.Run(map[string]string{
172172
"configSecret.name": "test-secret-name",
173173
"configSecret.namespace": "test-secret-namespace",
174-
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.4.2;rke2-bootstrap-custom-ns:rke2:v0.3.0",
174+
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.5.4;rke2-bootstrap-custom-ns:rke2:v0.3.0",
175175
})
176176
Expect(err).ToNot(HaveOccurred())
177177
Expect(manifests).ToNot(BeEmpty())

‎test/e2e/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var (
3030
const (
3131
operatorNamespace = "capi-operator-system"
3232

33-
previousCAPIVersion = "v1.4.2"
33+
previousCAPIVersion = "v1.5.4"
3434

3535
coreProviderName = "cluster-api"
3636
coreProviderDeploymentName = "capi-controller-manager"

‎test/e2e/minimal_configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ metadata:
267267
e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
268268
})
269269

270-
It("should successfully upgrade a CoreProvider (v1.4.2 -> latest)", func() {
270+
It("should successfully upgrade a CoreProvider (v1.5.4 -> latest)", func() {
271271
bootstrapCluster := bootstrapClusterProxy.GetClient()
272272
coreProvider := &operatorv1.CoreProvider{ObjectMeta: metav1.ObjectMeta{
273273
Name: coreProviderName,

‎test/e2e/resources/all-providers-custom-ns-versions.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ metadata:
6666
"helm.sh/hook": "post-install"
6767
"helm.sh/hook-weight": "2"
6868
spec:
69-
version: v1.4.2
69+
version: v1.5.4
7070
configSecret:
7171
name: test-secret-name
7272
namespace: test-secret-namespace
@@ -81,7 +81,7 @@ metadata:
8181
"helm.sh/hook": "post-install"
8282
"helm.sh/hook-weight": "2"
8383
spec:
84-
version: v1.4.2
84+
version: v1.5.4
8585
configSecret:
8686
name: test-secret-name
8787
namespace: test-secret-namespace
@@ -96,7 +96,7 @@ metadata:
9696
"helm.sh/hook": "post-install"
9797
"helm.sh/hook-weight": "2"
9898
spec:
99-
version: v1.4.2
99+
version: v1.5.4
100100
configSecret:
101101
name: test-secret-name
102102
namespace: test-secret-namespace
@@ -111,7 +111,7 @@ metadata:
111111
"helm.sh/hook": "post-install"
112112
"helm.sh/hook-weight": "2"
113113
spec:
114-
version: v1.4.2
114+
version: v1.5.4
115115
configSecret:
116116
name: test-secret-name
117117
namespace: test-secret-namespace

‎test/e2e/resources/all-providers-custom-versions.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ metadata:
6666
"helm.sh/hook": "post-install"
6767
"helm.sh/hook-weight": "2"
6868
spec:
69-
version: v1.4.2
69+
version: v1.5.4
7070
configSecret:
7171
name: test-secret-name
7272
namespace: test-secret-namespace
@@ -81,7 +81,7 @@ metadata:
8181
"helm.sh/hook": "post-install"
8282
"helm.sh/hook-weight": "2"
8383
spec:
84-
version: v1.4.2
84+
version: v1.5.4
8585
configSecret:
8686
name: test-secret-name
8787
namespace: test-secret-namespace
@@ -96,7 +96,7 @@ metadata:
9696
"helm.sh/hook": "post-install"
9797
"helm.sh/hook-weight": "2"
9898
spec:
99-
version: v1.4.2
99+
version: v1.5.4
100100
configSecret:
101101
name: test-secret-name
102102
namespace: test-secret-namespace
@@ -111,7 +111,7 @@ metadata:
111111
"helm.sh/hook": "post-install"
112112
"helm.sh/hook-weight": "2"
113113
spec:
114-
version: v1.4.2
114+
version: v1.5.4
115115
configSecret:
116116
name: test-secret-name
117117
namespace: test-secret-namespace

0 commit comments

Comments
 (0)