From 51afadba1924dd12cd5f3abf69060db7c44981e3 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Petersen" <ben@benjaminapetersen.me>
Date: Tue, 29 Aug 2023 12:41:35 -0400
Subject: [PATCH] Fix: default image_repo for supervisor,concierge, packages
 installed in global kapp-controller-packaging-global

---
 deploy_carvel/build.sh                        | 22 +++++++++++--------
 deploy_carvel/delete.sh                       |  8 +++++++
 deploy_carvel/delete_pinn.sh                  |  4 ----
 .../concierge.pinniped.dev/0.25.0.yml         |  2 +-
 .../supervisor.pinniped.dev/0.25.0.yml        |  8 +++----
 5 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100755 deploy_carvel/delete.sh
 delete mode 100755 deploy_carvel/delete_pinn.sh

diff --git a/deploy_carvel/build.sh b/deploy_carvel/build.sh
index acaca45d..7bf087b9 100755
--- a/deploy_carvel/build.sh
+++ b/deploy_carvel/build.sh
@@ -77,6 +77,7 @@ mkdir -p "./${PACKAGE_REPOSITORY_DIR}/packages/supervisor.pinniped.dev"
 
 PACKAGE_INSTALL_DIR="temp_actual_deploy_resources"
 rm -rf "./${PACKAGE_INSTALL_DIR}"
+mkdir "./${PACKAGE_INSTALL_DIR}"
 
 ## TODO:
 ## "${resource_name}/deployment.yml" vs "${resource_name}/deployment-HACKED.yml"
@@ -188,18 +189,19 @@ PINNIPED_PACKAGE_RBAC_FILE="./${PACKAGE_INSTALL_DIR}/${PINNIPED_PACKAGE_RBAC_PRE
 
 echo -n "" > "${PINNIPED_PACKAGE_RBAC_FILE}"
 cat <<EOF >> "${PINNIPED_PACKAGE_RBAC_FILE}"
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "${NAMESPACE}"
+# ---
+# apiVersion: v1
+# kind: Namespace
+# metadata:
+#  name: "${NAMESPACE}" <--- "supervisor-ns" will cause other package install errors.
 ---
 # ServiceAccount details from the file linked above
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: "${PINNIPED_PACKAGE_RBAC_PREFIX}-sa-superadmin-dangerous"
-  namespace: "${NAMESPACE}"
+  # namespace: "${NAMESPACE}"
+  namespace: default # --> sticking to default for everything for now.
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -217,7 +219,8 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: "${PINNIPED_PACKAGE_RBAC_PREFIX}-sa-superadmin-dangerous"
-  namespace: "${NAMESPACE}"
+  # namespace: "${NAMESPACE}"
+  namespace: default # --> sticking to default for everything for now.
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -228,7 +231,7 @@ EOF
 kapp deploy --app "${PINNIPED_PACKAGE_RBAC_PREFIX}" --file "${PINNIPED_PACKAGE_RBAC_FILE}" -y
 done
 
-#FOOBAR="pinniped-package-rbac"
+
 #PINNIPED_PACKAGE_RBAC_FILE="./${PACKAGE_INSTALL_DIR}/${PINNIPED_PACKAGE_RBAC_PREFIX}-rbac.yml"
 ## TODO: obviously a mega-role that can do everything is not good.
 #echo -n "" > "${PINNIPED_PACKAGE_RBAC_FILE}"
@@ -250,7 +253,8 @@ kind: PackageInstall
 metadata:
     # name, does not have to be versioned, versionSelection.constraints below will handle
     name: "${resource_name}-package-install"
-    namespace: "${NAMESPACE}"                     # TODO: ---????? is this namespace ok?
+    # namespace: "${NAMESPACE}"
+    namespace: default # --> sticking to default for everything for now.
 spec:
   serviceAccountName: "${PINNIPED_PACKAGE_RBAC_PREFIX}-sa-superadmin-dangerous"
   packageRef:
diff --git a/deploy_carvel/delete.sh b/deploy_carvel/delete.sh
new file mode 100755
index 00000000..89a6089c
--- /dev/null
+++ b/deploy_carvel/delete.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# unfortunately all by hand.
+
+kubectl delete ns supervisor-ns
+kubectl delete ns concierge-ns
+kubectl delete packageinstall concierge-package-install
+kubectl delete packageinstall supervisor-package-install
diff --git a/deploy_carvel/delete_pinn.sh b/deploy_carvel/delete_pinn.sh
deleted file mode 100755
index cd32928b..00000000
--- a/deploy_carvel/delete_pinn.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# not a lot to this.
-kapp delete --app pinn-super && kapp delete --app pinn-conci
diff --git a/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml b/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
index c7b6f146..64f23bf8 100644
--- a/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
+++ b/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
@@ -2,7 +2,7 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: concierge.pinniped.dev.0.25.0
-  namespace: concierge-ns
+  namespace: kapp-controller-packaging-global
 spec:
   refName: concierge.pinniped.dev
   version: 0.25.0
diff --git a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
index 9cb200c0..d1e748c2 100644
--- a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
+++ b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
@@ -2,7 +2,7 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: supervisor.pinniped.dev.0.25.0
-  namespace: supervisor-ns
+  namespace: kapp-controller-packaging-global
 spec:
   refName: supervisor.pinniped.dev
   version: 0.25.0
@@ -39,9 +39,8 @@ spec:
           default: 2
         image_repo:
           type: string
-          nullable: true
           description: Specify either an image_digest or an image_tag. If both are given, only image_digest will be used.
-          default: null
+          default: projects.registry.vmware.com/pinniped/pinniped-server
         image_digest:
           type: string
           nullable: true
@@ -49,9 +48,8 @@ spec:
           default: null
         image_tag:
           type: string
-          nullable: true
           description: Specify either an image_digest or an image_tag. If both are given, only image_digest will be used.
-          default: null
+          default: latest
         package_image_repo:
           type: string
           nullable: true