From c463cbc4ae387f14889c2b5a2f24a3f0134dfb05 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Sep 2021 16:38:53 -0500 Subject: [PATCH 1/6] Attempt new template format --- site/templates/subscriptions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/templates/subscriptions.yaml b/site/templates/subscriptions.yaml index 65ec71f2..ffdf933b 100644 --- a/site/templates/subscriptions.yaml +++ b/site/templates/subscriptions.yaml @@ -10,7 +10,7 @@ spec: sourceNamespace: {{ default "openshift-marketplace" .sourceNamespace }} channel: {{ default "stable" .channel }} installPlanApproval: {{ coalesce .installPlanApproval $.Values.global.options.installPlanApproval }} - {{- if $.Values.global.options.useCSV }} + {{- if coalesce .useCSV .Values.site.subscriptions.useCSV .Values.global.options.useCSV }} startingCSV: {{ .csv }} {{- end }} --- From da21117463bc60ba957800174146349c622daec7 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Thu, 23 Sep 2021 10:58:40 -0500 Subject: [PATCH 2/6] Ensure password has length before exiting wait loop --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0e09b046..5fe7d130 100644 --- a/Makefile +++ b/Makefile @@ -25,19 +25,20 @@ argosecret: ns=1 fi - if [ oc -n openshift-gitops extract secrets/openshift-gitops-cluster --to=- 1>/dev/null 2>/dev/null ]; then + pw=`oc -n openshift-gitops extract secrets/openshift-gitops-cluster --to=- 2>/dev/null` + if [ "$$?" == 0 ] && [ -n "$$pw" ]; gitops=0 else gitops=1 fi - if [ "$$gitops" == 1 -a "$$ns" == 1 ]; then + if [ "$$gitops" == 1 ] && [ "$$ns" == 1 ]; then break fi done user=$$(echo admin | base64) - password=$$(oc -n openshift-gitops extract secrets/openshift-gitops-cluster --to=- 2>/dev/null | base64) + password=$$(echo $$pw | base64) echo "{ \"apiVersion\": \"v1\", \"kind\": \"Secret\", \"metadata\": { \"name\": \"argocd-env\", \"namespace\": \"$$target_ns\" }, \"data\": { \"ARGOCD_PASSWORD\": \"$$password\", \"ARGOCD_USERNAME\": \"$$user\" }, \"type\": \"Opaque\" }" | oc apply -f- From 2ea0f3e2d015d5908f4f39b3c63e02b7b7e2d4b0 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Thu, 23 Sep 2021 11:00:20 -0500 Subject: [PATCH 3/6] Replace makefile template and make embedded shell wait for password to have length as well as 0 exit --- Makefile.toplevel | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/Makefile.toplevel b/Makefile.toplevel index b82b5d77..1317d8b9 100644 --- a/Makefile.toplevel +++ b/Makefile.toplevel @@ -1,26 +1,16 @@ -# This is an example top-level makefile for a new pattern. It delegates the tasks to the common makefile. BOOTSTRAP=1 ARGO_TARGET_NAMESPACE=replaceme -show: - make -f common/Makefile show +.PHONY: default +default: show -init: - make -f common/Makefile init +%: + make -f common/Makefile $* -deploy: - make -f common/Makefile deploy +install: deploy ifeq ($(BOOTSTRAP),1) make -f common/Makefile TARGET_NAMESPACE=$(ARGO_TARGET_NAMESPACE) argosecret endif -upgrade: - make -f common/Makefile upgrade -ifeq ($(BOOTSTRAP),1) +secret: make -f common/Makefile TARGET_NAMESPACE=$(ARGO_TARGET_NAMESPACE) argosecret -endif - -uninstall: - make -f common/Makefile uninstall - -.phony: install From 69a57b9504450c1d7bc10b71fe37f2dd088298ee Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Thu, 23 Sep 2021 11:03:06 -0500 Subject: [PATCH 4/6] Add then --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5fe7d130..2086e751 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ argosecret: fi pw=`oc -n openshift-gitops extract secrets/openshift-gitops-cluster --to=- 2>/dev/null` - if [ "$$?" == 0 ] && [ -n "$$pw" ]; + if [ "$$?" == 0 ] && [ -n "$$pw" ]; then gitops=0 else gitops=1 From ec744e952c6ed422c33a06788d9c401823013903 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Thu, 23 Sep 2021 11:09:48 -0500 Subject: [PATCH 5/6] Make script explain what it's doing --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2086e751..fa0b0893 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ argosecret: # Check for Namespaces and Secrets to be ready (it takes the cluster a while to deploy them) while [ 1 ]; do if [ oc get namespace $$target_ns >/dev/null 2>/dev/null ]; then + echo "Waiting for namespace $$target_ns to be created" ns=0 else ns=1 @@ -27,13 +28,17 @@ argosecret: pw=`oc -n openshift-gitops extract secrets/openshift-gitops-cluster --to=- 2>/dev/null` if [ "$$?" == 0 ] && [ -n "$$pw" ]; then - gitops=0 - else gitops=1 + else + echo "Waiting for password to be populated" + gitops=0 fi if [ "$$gitops" == 1 ] && [ "$$ns" == 1 ]; then + echo "Conditions met, creating resource" break + else + sleep 2 fi done From 21eddba3270f445c73aee67d377b2c20442a4ade Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Thu, 23 Sep 2021 11:12:24 -0500 Subject: [PATCH 6/6] make output clearer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa0b0893..49b4b116 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ argosecret: fi if [ "$$gitops" == 1 ] && [ "$$ns" == 1 ]; then - echo "Conditions met, creating resource" + echo "Conditions met, managing secret in $$target_ns" break else sleep 2