Skip to content

Commit

Permalink
updates during filming
Browse files Browse the repository at this point in the history
  • Loading branch information
sidpalas committed Jul 28, 2024
1 parent df6d936 commit ce6abb1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 17 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/image-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }})"
2 changes: 1 addition & 1 deletion 13-cluster-and-node-upgrades/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions 14-cicd/kluctl-gitops/.kluctl.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
1 change: 1 addition & 0 deletions 14-cicd/kluctl-gitops/clusters/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce6abb1

Please sign in to comment.