From 08f40ca63a7a05b5894dd91f1bf8895b4933f67c Mon Sep 17 00:00:00 2001
From: craig <cbrookes@redhat.com>
Date: Wed, 13 Mar 2024 13:16:02 +0000
Subject: [PATCH 1/3] fix for failing quick start

---
 hack/.deployUtils | 115 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/hack/.deployUtils b/hack/.deployUtils
index 0c199434..53771faa 100644
--- a/hack/.deployUtils
+++ b/hack/.deployUtils
@@ -27,6 +27,121 @@ metadata:
 EOF
 }
 
+# quickstart-setup specific functions
+
+setupAWSProvider() {
+  local namespace="$1"
+  if [ -z "$1" ]; then
+    namespace="multi-cluster-gateways"
+  fi
+  if [ "$KUADRANT_AWS_ACCESS_KEY_ID" == "" ]; then
+    echo "KUADRANT_AWS_ACCESS_KEY_ID is not set"
+    exit 1
+  fi
+
+  kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}aws-credentials
+  namespace: ${namespace}
+type: "kuadrant.io/aws"
+stringData:
+  AWS_ACCESS_KEY_ID: ${KUADRANT_AWS_ACCESS_KEY_ID}
+  AWS_SECRET_ACCESS_KEY: ${KUADRANT_AWS_SECRET_ACCESS_KEY}
+  AWS_REGION: ${KUADRANT_AWS_REGION}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}controller-config
+  namespace: ${namespace}
+data:
+  AWS_DNS_PUBLIC_ZONE_ID: ${KUADRANT_AWS_DNS_PUBLIC_ZONE_ID}
+  ZONE_ROOT_DOMAIN: ${KUADRANT_ZONE_ROOT_DOMAIN}
+  LOG_LEVEL: "${LOG_LEVEL}"
+---
+apiVersion: kuadrant.io/v1alpha1
+kind: ManagedZone
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}dev-mz
+  namespace: ${namespace}
+spec:
+  id: ${KUADRANT_AWS_DNS_PUBLIC_ZONE_ID}
+  domainName: ${KUADRANT_ZONE_ROOT_DOMAIN}
+  description: "Dev Managed Zone"
+  dnsProviderSecretRef:
+    name: ${KIND_CLUSTER_PREFIX}aws-credentials
+EOF
+}
+
+setupGCPProvider() {
+  local namespace="$1"
+  if [ -z "$1" ]; then
+    namespace="multi-cluster-gateways"
+  fi
+  kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}gcp-credentials
+  namespace: ${namespace}
+type: "kuadrant.io/gcp"
+stringData:
+  GOOGLE: '${GOOGLE}'
+  PROJECT_ID: ${PROJECT_ID}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}controller-config
+  namespace: ${namespace}
+data:
+  ZONE_DNS_NAME: ${ZONE_DNS_NAME}
+  ZONE_NAME: ${ZONE_NAME}
+  LOG_LEVEL: "${LOG_LEVEL}"
+---
+apiVersion: kuadrant.io/v1alpha1
+kind: ManagedZone
+metadata:
+  name: ${KIND_CLUSTER_PREFIX}dev-mz
+  namespace: ${namespace}
+spec:
+  id: ${ZONE_NAME}
+  domainName: ${ZONE_DNS_NAME}
+  description: "Dev Managed Zone"
+  dnsProviderSecretRef:
+    name: ${KIND_CLUSTER_PREFIX}gcp-credentials
+EOF
+}
+
+configureController(){
+  echo "configureController ${1} ${2}"
+  postDeployMGCHub ${1} ${2}
+} 
+
+postDeployMGCHub() {
+    clusterName=${1}
+    namespace=${2}
+    kubectl config use-context kind-${clusterName}
+    echo "Running post MGC deployment setup on ${clusterName}"
+
+    case $DNS_PROVIDER in
+      aws)
+          echo "Setting up an AWS Route 53 DNS provider"
+          setupAWSProvider ${namespace}
+          ;;
+      gcp)
+          echo "Setting up a Google Cloud DNS provider"
+          setupGCPProvider ${namespace}
+          ;;
+      *)
+        echo "Unknown DNS provider"
+        exit
+        ;;
+    esac
+}
+
 configureManagedAddon () {
   clusterName=${1}
   workloadCluster=${2}

From 5bf783c330d2c0ec5416aea77dbc669d6436079f Mon Sep 17 00:00:00 2001
From: craig <cbrookes@redhat.com>
Date: Wed, 13 Mar 2024 13:50:40 +0000
Subject: [PATCH 2/3] remove echo

---
 hack/.deployUtils | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hack/.deployUtils b/hack/.deployUtils
index 53771faa..1617ba71 100644
--- a/hack/.deployUtils
+++ b/hack/.deployUtils
@@ -116,7 +116,6 @@ EOF
 }
 
 configureController(){
-  echo "configureController ${1} ${2}"
   postDeployMGCHub ${1} ${2}
 } 
 

From 7befeadc0ea25a48bb1f289414e0cd2566284d4a Mon Sep 17 00:00:00 2001
From: craig <cbrookes@redhat.com>
Date: Wed, 13 Mar 2024 16:27:33 +0000
Subject: [PATCH 3/3] move quickstart functions

---
 hack/.deployUtils   | 25 -------------------------
 hack/.quickstartEnv | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/hack/.deployUtils b/hack/.deployUtils
index 1617ba71..2ad95c0d 100644
--- a/hack/.deployUtils
+++ b/hack/.deployUtils
@@ -115,31 +115,6 @@ spec:
 EOF
 }
 
-configureController(){
-  postDeployMGCHub ${1} ${2}
-} 
-
-postDeployMGCHub() {
-    clusterName=${1}
-    namespace=${2}
-    kubectl config use-context kind-${clusterName}
-    echo "Running post MGC deployment setup on ${clusterName}"
-
-    case $DNS_PROVIDER in
-      aws)
-          echo "Setting up an AWS Route 53 DNS provider"
-          setupAWSProvider ${namespace}
-          ;;
-      gcp)
-          echo "Setting up a Google Cloud DNS provider"
-          setupGCPProvider ${namespace}
-          ;;
-      *)
-        echo "Unknown DNS provider"
-        exit
-        ;;
-    esac
-}
 
 configureManagedAddon () {
   clusterName=${1}
diff --git a/hack/.quickstartEnv b/hack/.quickstartEnv
index 9ee17dce..3892c44c 100644
--- a/hack/.quickstartEnv
+++ b/hack/.quickstartEnv
@@ -87,3 +87,29 @@ requiredENV() {
       fi
     fi 
 }
+
+configureController(){
+  postDeployMGCHub ${1} ${2}
+} 
+
+postDeployMGCHub() {
+    clusterName=${1}
+    namespace=${2}
+    kubectl config use-context kind-${clusterName}
+    echo "Running post MGC deployment setup on ${clusterName}"
+
+    case $DNS_PROVIDER in
+      aws)
+          echo "Setting up an AWS Route 53 DNS provider"
+          setupAWSProvider ${namespace}
+          ;;
+      gcp)
+          echo "Setting up a Google Cloud DNS provider"
+          setupGCPProvider ${namespace}
+          ;;
+      *)
+        echo "Unknown DNS provider"
+        exit
+        ;;
+    esac
+}