Skip to content

Commit c7b9c24

Browse files
furkatgofurov7furkatgofurov7
committed
Bump CAPI versions (min=v1.7.7, max=v1.8.0) in E2E
Signed-off-by: Furkat Gofurov <[email protected]>
1 parent 2807b27 commit c7b9c24

17 files changed

+27112
-21694
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG)-$(ARCH):$(TAG)
144144
LDFLAGS := $(shell $(ROOT)/hack/version.sh)
145145

146146
# Default cert-manager version
147-
CERT_MANAGER_VERSION ?= v1.14.5
147+
CERT_MANAGER_VERSION ?= v1.15.1
148148

149149
# E2E configuration
150150
GINKGO_NOCOLOR ?= false

‎cmd/plugin/cmd/init_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,22 @@ func TestInitProviders(t *testing.T) {
171171
{
172172
name: "core provider",
173173
wantedProviders: []genericprovider.GenericProvider{
174-
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.6.0", "", ""),
174+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.8.0", "", ""),
175175
},
176176
wantErr: false,
177177
opts: &initOptions{
178-
coreProvider: "cluster-api:capi-system:v1.6.0",
178+
coreProvider: "cluster-api:capi-system:v1.8.0",
179179
targetNamespace: "capi-operator-system",
180180
},
181181
},
182182
{
183183
name: "core provider in default target namespace",
184184
wantedProviders: []genericprovider.GenericProvider{
185-
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-operator-system", "v1.6.0", "", ""),
185+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-operator-system", "v1.8.0", "", ""),
186186
},
187187
wantErr: false,
188188
opts: &initOptions{
189-
coreProvider: "cluster-api::v1.6.0",
189+
coreProvider: "cluster-api::v1.8.0",
190190
targetNamespace: "capi-operator-system",
191191
},
192192
},
@@ -254,7 +254,7 @@ func TestInitProviders(t *testing.T) {
254254
{
255255
name: "all providers",
256256
wantedProviders: []genericprovider.GenericProvider{
257-
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.6.0", "", ""),
257+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.8.0", "", ""),
258258
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "aws", "capa-operator-system", "", "", ""),
259259
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "capd-operator-system", "", "", ""),
260260
generateGenericProvider(clusterctlv1.ControlPlaneProviderType, "kubeadm", "kcp-system", "", "", ""),
@@ -263,9 +263,9 @@ func TestInitProviders(t *testing.T) {
263263
},
264264
wantErr: false,
265265
opts: &initOptions{
266-
coreProvider: "cluster-api:capi-system:v1.6.0",
266+
coreProvider: "cluster-api:capi-system:v1.8.0",
267267
infrastructureProviders: []string{
268-
"cluster-api:capi-system:v1.6.0",
268+
"cluster-api:capi-system:v1.8.0",
269269
"aws:capa-operator-system",
270270
"docker:capd-operator-system",
271271
},

‎cmd/plugin/cmd/upgrade_plan_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ func TestUpgradePlan(t *testing.T) {
5555
Name: "cluster-api",
5656
Namespace: "capi-system",
5757
Type: "core",
58-
CurrentVersion: "v1.6.0",
58+
CurrentVersion: "v1.8.0",
5959
Source: "https://github.com/kubernetes-sigs/cluster-api/releases/latest/core-components.yaml",
6060
SourceType: providerSourceTypeBuiltin,
6161
},
6262
},
6363
},
6464
wantedProviders: []genericprovider.GenericProvider{
65-
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.6.0", "", ""),
65+
generateGenericProvider(clusterctlv1.CoreProviderType, "cluster-api", "capi-system", "v1.8.0", "", ""),
6666
},
6767
wantErr: false,
6868
opts: &initOptions{
69-
coreProvider: "cluster-api:capi-system:v1.6.0",
69+
coreProvider: "cluster-api:capi-system:v1.8.0",
7070
targetNamespace: "capi-operator-system",
7171
},
7272
},
@@ -80,18 +80,18 @@ func TestUpgradePlan(t *testing.T) {
8080
Name: "docker",
8181
Namespace: "capi-system",
8282
Type: "infrastructure",
83-
CurrentVersion: "v1.6.0",
83+
CurrentVersion: "v1.8.0",
8484
Source: "https://github.com/kubernetes-sigs/cluster-api/releases/latest/core-components.yaml",
8585
SourceType: providerSourceTypeCustomURL,
8686
},
8787
},
8888
},
8989
wantedProviders: []genericprovider.GenericProvider{
90-
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "capi-system", "v1.6.0", "", ""),
90+
generateGenericProvider(clusterctlv1.InfrastructureProviderType, "docker", "capi-system", "v1.8.0", "", ""),
9191
},
9292
wantErr: false,
9393
opts: &initOptions{
94-
infrastructureProviders: []string{"docker:capi-system:v1.6.0"},
94+
infrastructureProviders: []string{"docker:capi-system:v1.8.0"},
9595
targetNamespace: "capi-operator-system",
9696
},
9797
},

‎hack/cert-manager.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
CERT_MANAGER_VERSION=v1.14.5
17+
CERT_MANAGER_VERSION=v1.15.1
1818
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml

‎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.5.4.yaml", "core-cluster-api-v1.6.0.yaml"} {
46+
for _, fileName := range []string{"core-cluster-api-v1.7.7.yaml", "core-cluster-api-v1.8.0.yaml"} {
4747
coreProviderComponents, err := os.ReadFile(customManifestsFolder + fileName)
4848
Expect(err).ToNot(HaveOccurred(), "Failed to read the core provider manifests file")
4949

@@ -85,7 +85,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
8585
},
8686
},
8787
},
88-
Version: "v1.5.4",
88+
Version: "v1.7.7",
8989
},
9090
},
9191
}
@@ -109,7 +109,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
109109
}), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
110110
})
111111

112-
It("should successfully upgrade a CoreProvider (v1.5.4 -> latest)", func() {
112+
It("should successfully upgrade a CoreProvider (v1.7.7 -> latest)", func() {
113113
bootstrapCluster := bootstrapClusterProxy.GetClient()
114114
coreProvider := &operatorv1.CoreProvider{}
115115
key := client.ObjectKey{Namespace: capiSystemNamespace, Name: coreProviderName}
@@ -161,7 +161,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() {
161161
bootstrapCluster := bootstrapClusterProxy.GetClient()
162162
configMaps := []corev1.ConfigMap{}
163163

164-
for _, fileName := range []string{"core-cluster-api-v1.5.4.yaml", "core-cluster-api-v1.6.0.yaml"} {
164+
for _, fileName := range []string{"core-cluster-api-v1.7.7.yaml", "core-cluster-api-v1.8.0.yaml"} {
165165
coreProviderComponents, err := os.ReadFile(customManifestsFolder + fileName)
166166
Expect(err).ToNot(HaveOccurred(), "Failed to read the core provider manifests file")
167167

‎test/e2e/helm_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ 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.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",
62-
"addon": "helm-custom-ns:helm:v0.1.0-alpha.9",
58+
"core": "capi-custom-ns:cluster-api:v1.7.7",
59+
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.7.7",
60+
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.7.7",
61+
"infrastructure": "capd-custom-ns:docker:v1.7.7",
62+
"addon": "helm-custom-ns:helm:v0.2.6",
6363
})
6464
Expect(err).ToNot(HaveOccurred())
6565
Expect(manifests).ToNot(BeEmpty())
@@ -72,11 +72,11 @@ 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.5.4",
76-
"controlPlane": "kubeadm:v1.5.4",
77-
"bootstrap": "kubeadm:v1.5.4",
78-
"infrastructure": "docker:v1.5.4",
79-
"addon": "helm:v0.1.0-alpha.9",
75+
"core": "cluster-api:v1.7.7",
76+
"controlPlane": "kubeadm:v1.7.7",
77+
"bootstrap": "kubeadm:v1.7.7",
78+
"infrastructure": "docker:v1.7.7",
79+
"addon": "helm:v0.2.6",
8080
})
8181
Expect(err).ToNot(HaveOccurred())
8282
Expect(manifests).ToNot(BeEmpty())
@@ -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.5.4;capz-custom-ns:azure:v1.10.0",
148+
"infrastructure": "capd-custom-ns:docker:v1.7.7;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.5.4;rke2-control-plane-custom-ns:rke2:v0.3.0",
161+
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.7.7;rke2-control-plane-custom-ns:rke2:v0.8.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.5.4;rke2-bootstrap-custom-ns:rke2:v0.3.0",
174+
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.7.7;rke2-bootstrap-custom-ns:rke2:v0.8.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
@@ -31,7 +31,7 @@ const (
3131
operatorNamespace = "capi-operator-system"
3232
capiSystemNamespace = "capi-system"
3333

34-
previousCAPIVersion = "v1.5.4"
34+
previousCAPIVersion = "v1.7.7"
3535

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

‎test/e2e/minimal_configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ metadata:
311311
e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
312312
})
313313

314-
It("should successfully upgrade a CoreProvider (v1.5.4 -> latest)", func() {
314+
It("should successfully upgrade a CoreProvider (v1.7.7 -> latest)", func() {
315315
bootstrapCluster := bootstrapClusterProxy.GetClient()
316316
coreProvider := &operatorv1.CoreProvider{ObjectMeta: metav1.ObjectMeta{
317317
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
@@ -69,7 +69,7 @@ metadata:
6969
"helm.sh/hook": "post-install,post-upgrade"
7070
"helm.sh/hook-weight": "2"
7171
spec:
72-
version: v1.5.4
72+
version: v1.7.7
7373
configSecret:
7474
name: test-secret-name
7575
namespace: test-secret-namespace
@@ -84,7 +84,7 @@ metadata:
8484
"helm.sh/hook": "post-install,post-upgrade"
8585
"helm.sh/hook-weight": "2"
8686
spec:
87-
version: v1.5.4
87+
version: v1.7.7
8888
configSecret:
8989
name: test-secret-name
9090
namespace: test-secret-namespace
@@ -100,7 +100,7 @@ metadata:
100100
"helm.sh/hook-weight": "2"
101101
"argocd.argoproj.io/sync-wave": "2"
102102
spec:
103-
version: v1.5.4
103+
version: v1.7.7
104104
configSecret:
105105
name: test-secret-name
106106
namespace: test-secret-namespace
@@ -116,7 +116,7 @@ metadata:
116116
"helm.sh/hook-weight": "2"
117117
"argocd.argoproj.io/sync-wave": "2"
118118
spec:
119-
version: v1.5.4
119+
version: v1.7.7
120120
configSecret:
121121
name: test-secret-name
122122
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
@@ -69,7 +69,7 @@ metadata:
6969
"helm.sh/hook": "post-install,post-upgrade"
7070
"helm.sh/hook-weight": "2"
7171
spec:
72-
version: v1.5.4
72+
version: v1.7.7
7373
configSecret:
7474
name: test-secret-name
7575
namespace: test-secret-namespace
@@ -84,7 +84,7 @@ metadata:
8484
"helm.sh/hook": "post-install,post-upgrade"
8585
"helm.sh/hook-weight": "2"
8686
spec:
87-
version: v1.5.4
87+
version: v1.7.7
8888
configSecret:
8989
name: test-secret-name
9090
namespace: test-secret-namespace
@@ -100,7 +100,7 @@ metadata:
100100
"helm.sh/hook-weight": "2"
101101
"argocd.argoproj.io/sync-wave": "2"
102102
spec:
103-
version: v1.5.4
103+
version: v1.7.7
104104
configSecret:
105105
name: test-secret-name
106106
namespace: test-secret-namespace
@@ -116,7 +116,7 @@ metadata:
116116
"helm.sh/hook-weight": "2"
117117
"argocd.argoproj.io/sync-wave": "2"
118118
spec:
119-
version: v1.5.4
119+
version: v1.7.7
120120
configSecret:
121121
name: test-secret-name
122122
namespace: test-secret-namespace

0 commit comments

Comments
 (0)