Skip to content
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

testsys: Add support for EKS-A release manifest url for metal and VMware testing #3446

Merged
merged 1 commit into from
Sep 13, 2023
Merged

testsys: Add support for EKS-A release manifest url for metal and VMware testing #3446

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
5 changes: 5 additions & 0 deletions tools/testsys-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ pub struct DeveloperConfig {
/// Overrides the EKS service endpoint for TestSys agents gathering EKS cluster metadata
/// (only for pre-existing EKS clusters, does not apply to new EKS cluster creation)
pub eks_service_endpoint: Option<String>,
/// A manifest containing the EKS Anywhere binary that should be used for cluster provisioning
pub eks_a_release_manifest_url: Option<String>,
}

impl DeveloperConfig {
Expand All @@ -378,6 +380,9 @@ impl DeveloperConfig {
keep_tests_running: self.keep_tests_running.or(other.keep_tests_running),
image_account_id: self.image_account_id.or(other.image_account_id),
eks_service_endpoint: self.eks_service_endpoint.or(other.eks_service_endpoint),
eks_a_release_manifest_url: self
.eks_a_release_manifest_url
.or(other.eks_a_release_manifest_url),
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions tools/testsys/src/metal_k8s.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ impl CrdCreator for MetalK8sCreator {
what: "A cluster config is required for Bare Metal testing",
})?,
))
.eks_a_release_manifest_url(
cluster_input
.crd_input
.config
.dev
.eks_a_release_manifest_url
.clone(),
)
.set_conflicts_with(Some(existing_clusters))
.destruction_policy(
cluster_input
Expand Down
8 changes: 8 additions & 0 deletions tools/testsys/src/vmware_k8s.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ impl CrdCreator for VmwareK8sCreator {
.vcenter_resource_pool(&self.datacenter.resource_pool)
.vcenter_workload_folder(&self.datacenter.folder)
.mgmt_cluster_kubeconfig_base64(&self.encoded_mgmt_cluster_kubeconfig)
.eks_a_release_manifest_url(
cluster_input
.crd_input
.config
.dev
.eks_a_release_manifest_url
.clone(),
)
.set_conflicts_with(Some(existing_clusters))
.destruction_policy(
cluster_input
Expand Down