Skip to content

Commit 3ce7863

Browse files
committed
test(e2e): Use same versions of providers from module dependencies
This provides a stable test setup for e2e that is unaffected by ongoing upstream releases.
1 parent 3b49619 commit 3ce7863

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

test/e2e/config/caren.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ providers:
1111
- name: cluster-api
1212
type: CoreProvider
1313
versions:
14-
- name: "{go://sigs.k8s.io/[email protected]}"
15-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
14+
- name: "${CAPI_VERSION}"
15+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/core-components.yaml"
1616
type: url
1717
contract: v1beta1
1818
files:
@@ -24,8 +24,8 @@ providers:
2424
- name: kubeadm
2525
type: BootstrapProvider
2626
versions:
27-
- name: "{go://sigs.k8s.io/[email protected]}"
28-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
27+
- name: "${CAPI_VERSION}"
28+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/bootstrap-components.yaml"
2929
type: url
3030
contract: v1beta1
3131
files:
@@ -37,8 +37,8 @@ providers:
3737
- name: kubeadm
3838
type: ControlPlaneProvider
3939
versions:
40-
- name: "{go://sigs.k8s.io/[email protected]}"
41-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
40+
- name: "${CAPI_VERSION}"
41+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/control-plane-components.yaml"
4242
type: url
4343
contract: v1beta1
4444
files:
@@ -50,8 +50,8 @@ providers:
5050
- name: aws
5151
type: InfrastructureProvider
5252
versions:
53-
- name: "{go://sigs.k8s.io/cluster-api-provider-aws/[email protected]}"
54-
value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/{go://sigs.k8s.io/cluster-api-provider-aws/[email protected]}/infrastructure-components.yaml"
53+
- name: "${CAPA_VERSION}"
54+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/${CAPA_VERSION}/infrastructure-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -73,8 +73,8 @@ providers:
7373
- name: docker
7474
type: InfrastructureProvider
7575
versions:
76-
- name: "{go://sigs.k8s.io/[email protected]}"
77-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
76+
- name: "${CAPD_VERSION}"
77+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPD_VERSION}/infrastructure-components-development.yaml"
7878
type: "url"
7979
contract: v1beta1
8080
files:
@@ -96,8 +96,8 @@ providers:
9696
- name: helm
9797
type: AddonProvider
9898
versions:
99-
- name: "{go://sigs.k8s.io/[email protected]}"
100-
value: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/{go://sigs.k8s.io/[email protected]}/addon-components.yaml"
99+
- name: "${CAAPH_VERSION}"
100+
value: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/${CAAPH_VERSION}/addon-components.yaml"
101101
type: "url"
102102
contract: v1beta1
103103
files:

test/e2e/data/shared/v1beta1-caaph/metadata.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
1010
releaseSeries:
1111
- major: 0
12-
minor: 1
12+
minor: 2
1313
contract: v1beta1

test/e2e/e2e_suite_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ func initBootstrapCluster(
260260
clusterctl.InitManagementClusterAndWatchControllerLogsInput{
261261
ClusterProxy: bootstrapClusterProxy,
262262
ClusterctlConfigPath: clusterctlConfig,
263-
InfrastructureProviders: config.InfrastructureProviders(),
264-
AddonProviders: config.AddonProviders(),
265-
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
263+
InfrastructureProviders: config.GetProviderLatestVersionsByContract("*", config.InfrastructureProviders()...),
264+
AddonProviders: config.GetProviderLatestVersionsByContract("*", config.AddonProviders()...),
265+
RuntimeExtensionProviders: config.GetProviderLatestVersionsByContract("*", config.RuntimeExtensionProviders()...),
266266
LogFolder: filepath.Join(
267267
artifactFolder,
268268
"clusters",

0 commit comments

Comments
 (0)