feat: allow user to use a branch of their deploy repo

Allow the user to use a branch of their deploy repo for templating out the configs.
rackerlabs · Apr 12, 2024 · dd1e41e · dd1e41e
1 parent f4fc4a6
commit dd1e41e
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 13 deletions.
diff --git a/apps/components/argo-workflows.yaml b/apps/components/argo-workflows.yaml
@@ -10,7 +10,7 @@ spec:
       targetRevision: ${UC_REPO_REF}
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: secret-argo-sso-argo.yaml
   destination:

diff --git a/apps/components/dexidp.yaml b/apps/components/dexidp.yaml
@@ -19,7 +19,7 @@ spec:
       ref: values
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: 'secret-*-sso-dex.yaml'
       ref: secrets

diff --git a/apps/components/ironic.yaml b/apps/components/ironic.yaml
@@ -23,7 +23,7 @@ spec:
           - $secrets/secrets/${DEPLOY_NAME}/secret-openstack.yaml
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: 'secret-ironic-*.yaml'
       ref: secrets

diff --git a/apps/components/keystone.yaml b/apps/components/keystone.yaml
@@ -21,7 +21,7 @@ spec:
           - $secrets/helm-configs/${DEPLOY_NAME}/keystone.yaml
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: 'secret-keystone-*.yaml'
       ref: secrets

diff --git a/apps/components/mariadb.yaml b/apps/components/mariadb.yaml
@@ -10,7 +10,7 @@ spec:
       targetRevision: ${UC_REPO_REF}
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: secret-mariadb.yaml
   destination:

diff --git a/apps/components/nautobot.yaml b/apps/components/nautobot.yaml
@@ -28,7 +28,7 @@ spec:
                 value: ${DEPLOY_NAME}-cluster-issuer
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: 'secret-nautobot*.yaml'
         exclude: secret-nautobot-sso-dex.yaml

diff --git a/apps/operators/cert-manager.yaml b/apps/operators/cert-manager.yaml
@@ -18,7 +18,7 @@ spec:
           installCRDs: true
     - repoURL: ${UC_DEPLOY_GIT_URL}
       path: secrets/${DEPLOY_NAME}/
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       directory:
         include: cluster-issuer.yaml
   destination:

diff --git a/apps/operators/ingress-nginx.yaml b/apps/operators/ingress-nginx.yaml
@@ -17,7 +17,7 @@ spec:
       targetRevision: ${UC_REPO_REF}
       ref: values
     - repoURL: ${UC_DEPLOY_GIT_URL}
-      targetRevision: HEAD
+      targetRevision: ${UC_DEPLOY_REF}
       ref: secrets
   destination:
     server: "https://kubernetes.default.svc"

diff --git a/apps/operators/mariadb-operator.yaml b/apps/operators/mariadb-operator.yaml
@@ -7,7 +7,7 @@ spec:
   source:
     repoURL: https://github.com/rackerlabs/understack.git
     path: operators/mariadb-operator/
-    targetRevision: HEAD
+    targetRevision: ${UC_DEPLOY_REF}
   destination:
     server: "https://kubernetes.default.svc"
     namespace: mariadb-operator

diff --git a/apps/operators/messaging-topology-operator.yaml b/apps/operators/messaging-topology-operator.yaml
@@ -7,7 +7,7 @@ spec:
   source:
     repoURL: https://github.com/rackerlabs/understack.git
     path: operators/messaging-topology-operator/
-    targetRevision: HEAD
+    targetRevision: ${UC_DEPLOY_REF}
   destination:
     server: "https://kubernetes.default.svc"
     namespace: rabbitmq-system

diff --git a/apps/operators/postgres-operator.yaml b/apps/operators/postgres-operator.yaml
@@ -7,7 +7,7 @@ spec:
   source:
     repoURL: https://github.com/rackerlabs/understack.git
     path: operators/postgres-operator/
-    targetRevision: HEAD
+    targetRevision: ${UC_DEPLOY_REF}
   destination:
     server: "https://kubernetes.default.svc"
     namespace: postgres-operator

diff --git a/apps/operators/rabbitmq-operator.yaml b/apps/operators/rabbitmq-operator.yaml
@@ -7,7 +7,7 @@ spec:
   source:
     repoURL: https://github.com/rackerlabs/understack.git
     path: operators/rabbitmq-operator/
-    targetRevision: HEAD
+    targetRevision: ${UC_DEPLOY_REF}
   destination:
     server: "https://kubernetes.default.svc"
     namespace: rabbitmq-system

diff --git a/docs/gitops-install.md b/docs/gitops-install.md
@@ -62,6 +62,9 @@ UC_DEPLOY_EMAIL="my@email"
 The `UC_REPO` and `UC_DEPLOY` variables are local paths on your machine to where
 these two repos have been cloned.
 
+Optional variables of `UC_REPO_REF` and `UC_DEPLOY_REF` can be defined which
+can be set to any valid git reference in their respective repos (e.g. branch or tag or commit).
+
 #### Deployment Name
 
 The `DEPLOY_NAME` variable contains the name that you'll refer to your

diff --git a/scripts/gitops-deploy.sh b/scripts/gitops-deploy.sh
@@ -9,7 +9,7 @@ usage() {
 
 template() {
     local subvars
-    subvars="\$DNS_ZONE \$UC_DEPLOY_GIT_URL \$UC_REPO_REF \$DEPLOY_NAME"
+    subvars="\$DNS_ZONE \$UC_DEPLOY_GIT_URL \$UC_REPO_REF \$UC_DEPLOY_REF \$DEPLOY_NAME"
     cat "$1" | envsubst "${subvars}" > "$2"
 }
 
@@ -48,6 +48,7 @@ export DNS_ZONE
 export UC_DEPLOY_GIT_URL
 export DEPLOY_NAME
 export UC_REPO_REF="${UC_REPO_REF:-HEAD}"
+export UC_DEPLOY_REF="${UC_DEPLOY_REF:-HEAD}"
 
 for part in operators components; do
     echo "Creating ${part} configs"