From e52fa52d77224c1c80c041eee07ff5da434dfbc7 Mon Sep 17 00:00:00 2001
From: Dimitri Koshkin <dimitri.koshkin@nutanix.com>
Date: Tue, 9 Apr 2024 08:42:20 -0700
Subject: [PATCH] fixup! refactor: combine PC host and port into a single url
 var

---
 examples/capi-quick-start/nutanix-cluster-calico-crs.yaml      | 3 +--
 .../capi-quick-start/nutanix-cluster-calico-helm-addon.yaml    | 3 +--
 examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml      | 3 +--
 .../capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml    | 3 +--
 hack/examples/patches/nutanix/initialize-variables.yaml        | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
index 710f1a31c..6dc3990d7 100644
--- a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
@@ -343,9 +343,8 @@ spec:
           prismCentralEndpoint:
             credentials:
               name: ${CLUSTER_NAME}-pc-creds
-            host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
-            port: 9440
+            url: https://${NUTANIX_ENDPOINT}:9440
     - name: workerConfig
       value:
         nutanix:
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
index e49994c81..85422af88 100644
--- a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
@@ -343,9 +343,8 @@ spec:
           prismCentralEndpoint:
             credentials:
               name: ${CLUSTER_NAME}-pc-creds
-            host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
-            port: 9440
+            url: https://${NUTANIX_ENDPOINT}:9440
     - name: workerConfig
       value:
         nutanix:
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
index f089aa951..c1bba7a60 100644
--- a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
@@ -343,9 +343,8 @@ spec:
           prismCentralEndpoint:
             credentials:
               name: ${CLUSTER_NAME}-pc-creds
-            host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
-            port: 9440
+            url: https://${NUTANIX_ENDPOINT}:9440
     - name: workerConfig
       value:
         nutanix:
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
index 209c73674..57ac8da14 100644
--- a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
@@ -343,9 +343,8 @@ spec:
           prismCentralEndpoint:
             credentials:
               name: ${CLUSTER_NAME}-pc-creds
-            host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
-            port: 9440
+            url: https://${NUTANIX_ENDPOINT}:9440
     - name: workerConfig
       value:
         nutanix:
diff --git a/hack/examples/patches/nutanix/initialize-variables.yaml b/hack/examples/patches/nutanix/initialize-variables.yaml
index 46a17d7d2..25f970e4e 100644
--- a/hack/examples/patches/nutanix/initialize-variables.yaml
+++ b/hack/examples/patches/nutanix/initialize-variables.yaml
@@ -11,9 +11,8 @@
       host: ${CONTROL_PLANE_ENDPOINT_IP}
       port: 6443
     prismCentralEndpoint:
-      host: ${NUTANIX_ENDPOINT}
+      url: https://${NUTANIX_ENDPOINT}:9440
       insecure: ${NUTANIX_INSECURE}
-      port: 9440
       credentials:
         name: ${CLUSTER_NAME}-pc-creds
 - op: "add"