testsys: Add support for eksa release manifest

bottlerocket-os · Sep 13, 2023 · d2500ef · d2500ef
1 parent f511ff1
commit d2500ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/tools/testsys-config/src/lib.rs b/tools/testsys-config/src/lib.rs
@@ -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 {
@@ -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),
         }
     }
 }

diff --git a/tools/testsys/src/metal_k8s.rs b/tools/testsys/src/metal_k8s.rs
@@ -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

diff --git a/tools/testsys/src/vmware_k8s.rs b/tools/testsys/src/vmware_k8s.rs
@@ -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