From 0fdeb93fe74ec14a8a6d700804ea7c5c3c9b089b Mon Sep 17 00:00:00 2001
From: Erikson Tung <etung@amazon.com>
Date: Mon, 11 Sep 2023 22:58:46 -0700
Subject: [PATCH] vsphere-cluster-resource: add managementCluster field to
 cluster config

The vSphere workload cluster config was missing the managementCluster
field to indicate the management cluster to deploy the cluster in.
---
 .../vsphere_k8s_cluster_provider.rs           | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/bottlerocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs b/bottlerocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs
index 372125b3..8b1e68fd 100644
--- a/bottlerocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs
+++ b/bottlerocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs
@@ -402,8 +402,23 @@ async fn create_vsphere_k8s_cluster(
     );
 
     // Set up EKS-A vSphere cluster spec file
+    let mgmt_kubeconfig = Kubeconfig::read_from(mgmt_kubeconfig_path)
+        .context(*resources, "Unable to read kubeconfig")?;
+    let mgmt_cluster_name = &mgmt_kubeconfig
+        .clusters
+        .first()
+        .context(*resources, "Missing clusters in Kubeconfig")?
+        .name;
     let clusterspec_path = format!("{}/vsphere-k8s-clusterspec.yaml", WORKING_DIR);
-    write_vsphere_clusterspec(config, vm_template_name, resources, &clusterspec_path, memo).await?;
+    write_vsphere_clusterspec(
+        config,
+        vm_template_name,
+        mgmt_cluster_name.to_string(),
+        resources,
+        &clusterspec_path,
+        memo,
+    )
+    .await?;
 
     // Call eksctl-anywhere to create cluster with existing mgmt cluster in vsphere
     let status = Command::new("eksctl")
@@ -454,6 +469,7 @@ async fn create_vsphere_k8s_cluster(
 async fn write_vsphere_clusterspec(
     config: &VSphereK8sClusterConfig,
     vm_template_name: String,
+    mgmt_cluster_name: String,
     resources: &Resources,
     clusterspec_path: &str,
     memo: &mut ProductionMemo,
@@ -502,6 +518,8 @@ kind: Cluster
 metadata:
   name: {cluster_name}
 spec:
+  managementCluster:
+    name: {mgmt_cluster_name}
   clusterNetwork:
     cniConfig:
       cilium: {{}}