From ce6abb14177ce2c66ec7f8f82a698633a5439d36 Mon Sep 17 00:00:00 2001
From: sid palas <sid@devopsdirective.com>
Date: Sat, 27 Jul 2024 22:40:00 -0400
Subject: [PATCH] updates during filming

---
 .github/workflows/image-ci.yml                 | 11 ++---------
 13-cluster-and-node-upgrades/Taskfile.yaml     |  2 +-
 14-cicd/kluctl-gitops/.kluctl.yaml             | 14 +++++++-------
 14-cicd/kluctl-gitops/clusters/deployment.yaml |  1 +
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/image-ci.yml b/.github/workflows/image-ci.yml
index a614bd8..3c369f3 100644
--- a/.github/workflows/image-ci.yml
+++ b/.github/workflows/image-ci.yml
@@ -67,13 +67,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Generate Image Tag
-        id: generate-image-tag
-        working-directory: 14-cicd/github-actions
-        run: |
-          image_tag=$(task generate-version-tag)
-          echo "image_tag=$image_tag" >> $GITHUB_OUTPUT
-
       - uses: actions/setup-go@v5
         if: matrix.path == '06-demo-application/api-golang'
         with:
@@ -118,8 +111,8 @@ jobs:
           fi
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
+      uses: peter-evans/create-pull-request@v6
+      with:
           base: main
           token: ${{ secrets.DEVOPS_DIRECTIVE_KUBERNETES_COURSE_GITHUB_ACTION_PAT }}
           title: "Update image tags to (${{ needs.generate-image-tag.outputs.image_tag }})"
diff --git a/13-cluster-and-node-upgrades/Taskfile.yaml b/13-cluster-and-node-upgrades/Taskfile.yaml
index 5be026b..96389b4 100644
--- a/13-cluster-and-node-upgrades/Taskfile.yaml
+++ b/13-cluster-and-node-upgrades/Taskfile.yaml
@@ -29,7 +29,7 @@ tasks:
   04-upgrade-control-plane:
     desc: "Upgrade the control plane to a specific version"
     vars:
-      VERSION: 1.30.1-gke.1329000
+      VERSION: 1.30.1-gke.1329003
     cmds:
       - cmd: |
           gum style "$(cat <<EOF
diff --git a/14-cicd/kluctl-gitops/.kluctl.yaml b/14-cicd/kluctl-gitops/.kluctl.yaml
index 4cb52ca..cc9e6b0 100644
--- a/14-cicd/kluctl-gitops/.kluctl.yaml
+++ b/14-cicd/kluctl-gitops/.kluctl.yaml
@@ -1,21 +1,21 @@
 # .kluctl.yaml
-args:
-  # This allows us to deploy the GitOps deployment to different clusters. It is used to include dedicated deployment
-  # items for the selected cluster.
-  - name: cluster_name
-
 targets:
   - name: staging
     args:
       cluster_name: staging
     # Adding a context to .kluctl.yaml helps prevent accidentally deploying to the wrong cluster!
-    # context: SOME_KUBECTL_CONTEXT
+    context: devops-directive-kubernetes-course
 
   - name: production
     args:
       cluster_name: production
     # Adding a context to .kluctl.yaml helps prevent accidentally deploying to the wrong cluster!
-    # context: SOME_OTHER_KUBECTL_CONTEXT
+    context: gke_kubernetes-course-424917_us-central1-a_devops-directive-kubernetes-course-2
+
+args:
+  # This allows us to deploy the GitOps deployment to different clusters. It is used to include dedicated deployment
+  # items for the selected cluster.
+  - name: cluster_name
 
 # Without a discriminator, pruning won't work. Make sure the rendered result is unique on the target cluster
 discriminator: gitops-{{ args.cluster_name | slugify }}
diff --git a/14-cicd/kluctl-gitops/clusters/deployment.yaml b/14-cicd/kluctl-gitops/clusters/deployment.yaml
index 3b5a732..582b14b 100644
--- a/14-cicd/kluctl-gitops/clusters/deployment.yaml
+++ b/14-cicd/kluctl-gitops/clusters/deployment.yaml
@@ -10,6 +10,7 @@ deployments:
       subDir: install/webui
       ref:
         tag: v2.24.1
+  - barrier: true
   # Include things that are required on all clusters (e.g., the KluctlDeployment for the GitOps deployment itself)
   - path: all
   # We use simple templating to change a dedicated deployment item per cluster