From b0ba95d5b5213717a7fd42211587b75f6351f098 Mon Sep 17 00:00:00 2001
From: Michael Jones <mj@mikejonesey.co.uk>
Date: Thu, 27 Jun 2024 09:21:35 +0100
Subject: [PATCH 1/4] correct kustomize readme overwriting flux readme, caused
 by commit cb33b21

---
 setup_project_repo.sh | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/setup_project_repo.sh b/setup_project_repo.sh
index 5d7897f..b19ebd7 100755
--- a/setup_project_repo.sh
+++ b/setup_project_repo.sh
@@ -87,12 +87,10 @@ You would maintain 3 Different Repos to maintain
           
 EOF
 
+# Flux
+mkdir flux/base flux/staging flux/production
 
-cd flux
-
-mkdir base staging production
-
-cat > base/README.md <<EOF
+cat > flux/base/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Deployment Manifests which are Synced by Flux to Deploy to a Kubernetes Environment.
 
@@ -119,20 +117,20 @@ Image Automation:
 
 EOF
 
-cat > staging/README.md <<EOF
+cat > flux/staging/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Kustomize Overlays for staging environemnt to flux sync  manifests defined in ../base.
 If you add a patch file, ensure you update kustomization.yaml accordingly.
 EOF
 
-cat > production/README.md <<EOF
+cat > flux/production/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Kustomize Overlays for staging environemnt to  manifests flux sync  defined in ../base.
 If you add a patch file, ensure you update kustomization.yaml accordingly.
 EOF
 
 
-cat > staging/kustomization.yaml <<EOF
+cat > flux/staging/kustomization.yaml <<EOF
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
@@ -140,16 +138,18 @@ resources:
 EOF
 
 
-cat > production/kustomization.yaml <<EOF
+cat > flux/production/kustomization.yaml <<EOF
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../base
 EOF
 
+# kustomize - arg 1, or example
+KUSTOMIZE_BASE="kustomize/${1:-example-project}"
+mkdir -p ${KUSTOMIZE_BASE}/base ${KUSTOMIZE_BASE}/staging ${KUSTOMIZE_BASE}/production
 
-
-cat > base/README.md <<EOF
+cat > ${KUSTOMIZE_BASE}/base/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Kubernetes Manifests YAML.  
 
@@ -166,37 +166,36 @@ In fact it could be any resource that you would apply to kubernetes.
 
 EOF
 
-cat > staging/README.md <<EOF
+cat > ${KUSTOMIZE_BASE}/staging/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Kustomize Overlays for staging environemnt to  manifests defined in ../base. 
 If you add a patch file, ensure you update kustomization.yaml accordingly. 
 EOF
 
-cat > production/README.md <<EOF
+cat > ${KUSTOMIZE_BASE}/production/README.md <<EOF
 ## Kubernetes Deployment Manifests
 This path is to add Kustomize Overlays for staging environemnt to  manifests defined in ../base.
 If you add a patch file, ensure you update kustomization.yaml accordingly.
 EOF
 
-cat > staging/kustomization.yaml <<EOF
+cat > ${KUSTOMIZE_BASE}/staging/kustomization.yaml <<EOF
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../base
 EOF
 
-
-cat > production/kustomization.yaml <<EOF
+cat > ${KUSTOMIZE_BASE}/production/kustomization.yaml <<EOF
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../base
 EOF
 
-cd ../helm
-mkdir charts
+# Helm 
+mkdir helm/charts
 
-cat > charts/README.md <<EOF
+cat > helm/charts/README.md <<EOF
 ## Helm Charts 
 Add your helm charts here. 
 EOF

From 7adcaf06fa8197bf4bee30b7bf159a42f43c5729 Mon Sep 17 00:00:00 2001
From: Michael Jones <mj@mikejonesey.co.uk>
Date: Thu, 27 Jun 2024 09:57:41 +0100
Subject: [PATCH 2/4] mkdir p to allow the script to re-run without warning

---
 setup_project_repo.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup_project_repo.sh b/setup_project_repo.sh
index b19ebd7..44babaf 100755
--- a/setup_project_repo.sh
+++ b/setup_project_repo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-mkdir flux kustomize helm
+mkdir -p flux kustomize helm
 
 cat >>  README.md <<EOF
 ## Deployment Repo
@@ -88,7 +88,7 @@ You would maintain 3 Different Repos to maintain
 EOF
 
 # Flux
-mkdir flux/base flux/staging flux/production
+mkdir -p flux/base flux/staging flux/production
 
 cat > flux/base/README.md <<EOF
 ## Kubernetes Deployment Manifests
@@ -193,7 +193,7 @@ resources:
 EOF
 
 # Helm 
-mkdir helm/charts
+mkdir -p helm/charts
 
 cat > helm/charts/README.md <<EOF
 ## Helm Charts 

From 20f9abd0005640a9dd95b1f89814e55add0ab5d2 Mon Sep 17 00:00:00 2001
From: Michael Jones <mj@mikejonesey.co.uk>
Date: Thu, 27 Jun 2024 10:01:12 +0100
Subject: [PATCH 3/4] add example usage comments

---
 setup_project_repo.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setup_project_repo.sh b/setup_project_repo.sh
index 44babaf..7606187 100755
--- a/setup_project_repo.sh
+++ b/setup_project_repo.sh
@@ -1,4 +1,16 @@
 #!/bin/bash
+#
+# Example useage
+#
+# default example:
+# setup_project_repo.sh
+#
+# instavote apps:
+# setup_project_repo.sh redis
+# setup_project_repo.sh results
+# setup_project_repo.sh vote
+# setup_project_repo.sh worker
+#
 
 mkdir -p flux kustomize helm
 

From bcacc3bc7724c313f40e982d342ba825f01b8da2 Mon Sep 17 00:00:00 2001
From: Michael Jones <mj@mikejonesey.co.uk>
Date: Thu, 27 Jun 2024 10:10:09 +0100
Subject: [PATCH 4/4] filter append to main readme to allow script re-run and
 not replace main readme

---
 setup_project_repo.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup_project_repo.sh b/setup_project_repo.sh
index 7606187..b4529c4 100755
--- a/setup_project_repo.sh
+++ b/setup_project_repo.sh
@@ -14,6 +14,8 @@
 
 mkdir -p flux kustomize helm
 
+# main readme is maintained as append, but only run 1x
+if [ ! -f "flux/base/README.md" ]; then
 cat >>  README.md <<EOF
 ## Deployment Repo
 
@@ -98,6 +100,7 @@ You would maintain 3 Different Repos to maintain
        * Running Reconciliation for each of the Flux Resource with actual Kubernetes Cluster. 
           
 EOF
+fi
 
 # Flux
 mkdir -p flux/base flux/staging flux/production