additional cleanup

bootstrap/00_1password/README.md

@@ -11,7 +11,7 @@ The two secrets are injected outside of the deploy processes, after the deployme
 op inject -i op-session.tpl -o op-session
 kubectl -n 1password create secret generic op-credentials --from-file=1password-credentials.json=op-session
 
-kubectl create secret generic onepassword-token --from-literal=token=$(op item get hhk8s-1password --fields token)
+kubectl -n 1password create secret generic onepassword-token --from-literal=token=$(op item get hhk8s-1password --fields token)
 ```
 
 

bootstrap/03_argocd/base/non-ha/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argocd
+resources:
+- namespace.yaml
+- install.yaml

bootstrap/03_argocd/base/non-ha/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    operator.1password.io/auto-restart: "true"
+  name: argocd

bootstrap/03_argocd/kustomization.yaml

@@ -3,10 +3,10 @@ kind: Kustomization
 
 namespace: argocd
 bases:
-  - base/
+  - base/non-ha #non-ha for temp microk8s small cluster
 
 resources:
-- overlays/ingress.yaml
+#- overlays/ingress.yaml #ingress is now CFTunnel->Service
 - op-secrets/dex-githubapp.yaml
 - op-secrets/github-repocreds.yaml
 - certificates/ingress-certificate.yaml

bootstrap/03_argocd/update-ha.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+wget https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/ha/install.yaml -O base/ha/ha-install.yaml

bootstrap/03_argocd/update.sh → bootstrap/03_argocd/update-nonha.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-wget https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/ha/install.yaml -O base/ha-install.yaml
+wget https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml -O base/non-ha/install.yaml