Skip to content

Commit ce6abb1

Browse files
committed
updates during filming
1 parent df6d936 commit ce6abb1

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

.github/workflows/image-ci.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ jobs:
6767
username: ${{ secrets.DOCKERHUB_USERNAME }}
6868
password: ${{ secrets.DOCKERHUB_TOKEN }}
6969

70-
- name: Generate Image Tag
71-
id: generate-image-tag
72-
working-directory: 14-cicd/github-actions
73-
run: |
74-
image_tag=$(task generate-version-tag)
75-
echo "image_tag=$image_tag" >> $GITHUB_OUTPUT
76-
7770
- uses: actions/setup-go@v5
7871
if: matrix.path == '06-demo-application/api-golang'
7972
with:
@@ -118,8 +111,8 @@ jobs:
118111
fi
119112
120113
- name: Create Pull Request
121-
uses: peter-evans/create-pull-request@v6
122-
with:
114+
uses: peter-evans/create-pull-request@v6
115+
with:
123116
base: main
124117
token: ${{ secrets.DEVOPS_DIRECTIVE_KUBERNETES_COURSE_GITHUB_ACTION_PAT }}
125118
title: "Update image tags to (${{ needs.generate-image-tag.outputs.image_tag }})"

13-cluster-and-node-upgrades/Taskfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tasks:
2929
04-upgrade-control-plane:
3030
desc: "Upgrade the control plane to a specific version"
3131
vars:
32-
VERSION: 1.30.1-gke.1329000
32+
VERSION: 1.30.1-gke.1329003
3333
cmds:
3434
- cmd: |
3535
gum style "$(cat <<EOF

14-cicd/kluctl-gitops/.kluctl.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# .kluctl.yaml
2-
args:
3-
# This allows us to deploy the GitOps deployment to different clusters. It is used to include dedicated deployment
4-
# items for the selected cluster.
5-
- name: cluster_name
6-
72
targets:
83
- name: staging
94
args:
105
cluster_name: staging
116
# Adding a context to .kluctl.yaml helps prevent accidentally deploying to the wrong cluster!
12-
# context: SOME_KUBECTL_CONTEXT
7+
context: devops-directive-kubernetes-course
138

149
- name: production
1510
args:
1611
cluster_name: production
1712
# Adding a context to .kluctl.yaml helps prevent accidentally deploying to the wrong cluster!
18-
# context: SOME_OTHER_KUBECTL_CONTEXT
13+
context: gke_kubernetes-course-424917_us-central1-a_devops-directive-kubernetes-course-2
14+
15+
args:
16+
# This allows us to deploy the GitOps deployment to different clusters. It is used to include dedicated deployment
17+
# items for the selected cluster.
18+
- name: cluster_name
1919

2020
# Without a discriminator, pruning won't work. Make sure the rendered result is unique on the target cluster
2121
discriminator: gitops-{{ args.cluster_name | slugify }}

14-cicd/kluctl-gitops/clusters/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ deployments:
1010
subDir: install/webui
1111
ref:
1212
tag: v2.24.1
13+
- barrier: true
1314
# Include things that are required on all clusters (e.g., the KluctlDeployment for the GitOps deployment itself)
1415
- path: all
1516
# We use simple templating to change a dedicated deployment item per cluster

0 commit comments

Comments
 (0)