Skip to content

test(e2e): Use same versions of providers from module dependencies #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2024
Merged

test(e2e): Use same versions of providers from module dependencies #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions test/e2e/config/caren.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: "{go://sigs.k8s.io/[email protected]}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
- name: "${CAPI_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/core-components.yaml"
type: url
contract: v1beta1
files:
Expand All @@ -24,8 +24,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: "{go://sigs.k8s.io/[email protected]}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
- name: "${CAPI_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/bootstrap-components.yaml"
type: url
contract: v1beta1
files:
Expand All @@ -37,8 +37,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: "{go://sigs.k8s.io/[email protected]}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
- name: "${CAPI_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/control-plane-components.yaml"
type: url
contract: v1beta1
files:
Expand All @@ -50,8 +50,8 @@ providers:
- name: aws
type: InfrastructureProvider
versions:
- name: "{go://sigs.k8s.io/cluster-api-provider-aws/[email protected]}"
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"
- name: "${CAPA_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/${CAPA_VERSION}/infrastructure-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -73,8 +73,8 @@ providers:
- name: docker
type: InfrastructureProvider
versions:
- name: "{go://sigs.k8s.io/[email protected]}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
- name: "${CAPD_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPD_VERSION}/infrastructure-components-development.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -96,8 +96,8 @@ providers:
- name: helm
type: AddonProvider
versions:
- name: "{go://sigs.k8s.io/[email protected]}"
value: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/{go://sigs.k8s.io/[email protected]}/addon-components.yaml"
- name: "${CAAPH_VERSION}"
value: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/${CAAPH_VERSION}/addon-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/data/shared/v1beta1-caaph/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
releaseSeries:
- major: 0
minor: 1
minor: 2
contract: v1beta1
6 changes: 3 additions & 3 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ func initBootstrapCluster(
clusterctl.InitManagementClusterAndWatchControllerLogsInput{
ClusterProxy: bootstrapClusterProxy,
ClusterctlConfigPath: clusterctlConfig,
InfrastructureProviders: config.InfrastructureProviders(),
AddonProviders: config.AddonProviders(),
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
InfrastructureProviders: config.GetProviderLatestVersionsByContract("*", config.InfrastructureProviders()...),
AddonProviders: config.GetProviderLatestVersionsByContract("*", config.AddonProviders()...),
RuntimeExtensionProviders: config.GetProviderLatestVersionsByContract("*", config.RuntimeExtensionProviders()...),
LogFolder: filepath.Join(
artifactFolder,
"clusters",
Expand Down
Loading