From 6100e7e290784b062dee7cfbb98bddd0b23169d7 Mon Sep 17 00:00:00 2001
From: rblundon <ryan.blundon@protonmail.com>
Date: Mon, 12 May 2025 21:46:06 -0500
Subject: [PATCH] uninstall ESO, but add sync waves

---
 .../external-secrets/base/cluster-secret-store.yaml  |  2 ++
 cluster/external-secrets/base/namespace.yaml         |  1 +
 cluster/external-secrets/base/operatorconfig.yaml    |  2 ++
 cluster/external-secrets/base/subscription.yaml      |  2 ++
 cluster/{ => external-secrets}/external-secrets.yaml |  0
 step-by-step.md                                      | 12 ++++--------
 6 files changed, 11 insertions(+), 8 deletions(-)
 rename cluster/{ => external-secrets}/external-secrets.yaml (100%)

diff --git a/cluster/external-secrets/base/cluster-secret-store.yaml b/cluster/external-secrets/base/cluster-secret-store.yaml
index 1a93cd8..0151a4f 100644
--- a/cluster/external-secrets/base/cluster-secret-store.yaml
+++ b/cluster/external-secrets/base/cluster-secret-store.yaml
@@ -2,6 +2,8 @@ apiVersion: external-secrets.io/v1beta1
 kind: ClusterSecretStore
 metadata:
   name: doppler-cluster
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   provider:
     doppler:
diff --git a/cluster/external-secrets/base/namespace.yaml b/cluster/external-secrets/base/namespace.yaml
index de28405..bd9e27d 100644
--- a/cluster/external-secrets/base/namespace.yaml
+++ b/cluster/external-secrets/base/namespace.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    argocd.argoproj.io/hook: PreSync
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/tracking-id: 'external-secrets:/Namespace:openshift-operators/external-secrets'
   name: external-secrets
diff --git a/cluster/external-secrets/base/operatorconfig.yaml b/cluster/external-secrets/base/operatorconfig.yaml
index 5d761cf..a86d5de 100644
--- a/cluster/external-secrets/base/operatorconfig.yaml
+++ b/cluster/external-secrets/base/operatorconfig.yaml
@@ -2,6 +2,8 @@ apiVersion: operator.external-secrets.io/v1alpha1
 kind: OperatorConfig
 metadata:
   name: cluster
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   prometheus:
     enabled: true
diff --git a/cluster/external-secrets/base/subscription.yaml b/cluster/external-secrets/base/subscription.yaml
index ea424dd..68042b0 100644
--- a/cluster/external-secrets/base/subscription.yaml
+++ b/cluster/external-secrets/base/subscription.yaml
@@ -2,6 +2,8 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
   labels:
     operators.coreos.com/external-secrets-operator.openshift-operators: ''
   name: external-secrets-operator
diff --git a/cluster/external-secrets.yaml b/cluster/external-secrets/external-secrets.yaml
similarity index 100%
rename from cluster/external-secrets.yaml
rename to cluster/external-secrets/external-secrets.yaml
diff --git a/step-by-step.md b/step-by-step.md
index 4785f42..5cb026b 100644
--- a/step-by-step.md
+++ b/step-by-step.md
@@ -113,19 +113,15 @@ Other needed software:
 
 - Admin password and kubeconfig are in the homelab/10-sno-hub-cluster/03-openshift-image/auth directory
 
+- Bootstrap ACM
+
   From laptop/infra server:
 
   ```bash
   cd homelab
   oc apply -k hub-cluster-bootstrap
-  ```
-
-- Bootstrap ACM
-
-  Running this playbook will configure Matchbox to wait for the sno-cluster to boot via iPXE and will install Single Node OpenShift.  All configuration files are built from templates driven from Ansible variables.
-
-  ```bash
-  ansible-playbook -i inventory.yml 10-sno-hub-cluster/install2.yml
+  oc apply -f ~/ocp/doppler-token.yaml
+  oc apply -k hub-cluster-bootstrap
   ```
 
 ## Internal Cluster *TBD*