diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7093bf8..1dfc46c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,6 +42,17 @@ jobs: push: true tags: | quay.io/acend/argocd-basics-training:pr-${{ github.event.pull_request.number }} + - + name: Build Techlab Version + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + build-args: | + TRAINING_HUGO_ENV=techlab + push: true + tags: | + quay.io/acend/argocd-basics-training:pr-${{ github.event.pull_request.number }}-techlab - name: Build Puzzle Version uses: docker/build-push-action@v6 @@ -86,6 +97,7 @@ jobs: TRAINING_NAMESPACE: 'acend-argocd-basics-training-test' run: | kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-acend --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE + kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-techlab --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-puzzle --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE - name: Comment PR Environments in PR @@ -95,4 +107,5 @@ jobs: message: | PR Environments: * acend version + * techlab version * puzzle version diff --git a/.github/workflows/pr-cleanup.yaml b/.github/workflows/pr-cleanup.yaml index fe570e3..098406a 100644 --- a/.github/workflows/pr-cleanup.yaml +++ b/.github/workflows/pr-cleanup.yaml @@ -45,4 +45,4 @@ jobs: QUAYIO_API_TOKEN: '${{ secrets.QUAYIO_API_TOKEN }}' REPOSITORY: '${{ github.repository }}' run: | - curl -X DELETE -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" https://quay.io/api/v1/repository/${REPOSITORY}/tag/pr-${PR_NUMBER}{,-puzzle} + curl -X DELETE -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" https://quay.io/api/v1/repository/${REPOSITORY}/tag/pr-${PR_NUMBER}{,-techlab,-puzzle} diff --git a/.github/workflows/push-main.yaml b/.github/workflows/push-main.yaml index d1bf1f6..a773c1f 100644 --- a/.github/workflows/push-main.yaml +++ b/.github/workflows/push-main.yaml @@ -44,6 +44,17 @@ jobs: push: true tags: | quay.io/acend/argocd-basics-training:latest + - + name: Build Techlab Version + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + build-args: | + TRAINING_HUGO_ENV=techlab + push: true + tags: | + quay.io/acend/argocd-basics-training:latest-techlab - name: Build Puzzle Version uses: docker/build-push-action@v6 @@ -88,4 +99,5 @@ jobs: TRAINING_NAMESPACE: 'acend-argocd-basics-training-prod' run: | kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-acend --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE + kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-techlab --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-puzzle --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE diff --git a/config/techlab/config.toml b/config/techlab/config.toml new file mode 100644 index 0000000..491116c --- /dev/null +++ b/config/techlab/config.toml @@ -0,0 +1,12 @@ + +[Languages] +[Languages.en] +title = "ArgoCD Techlab" +languageName = "English" +weight = 1 + + +[params] +enabledModule = "base techlab" +github_repo = "" +github_branch = "" diff --git a/content/en/_index.html b/content/en/_index.html index 91ceccb..5e074f6 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -3,7 +3,7 @@ linkTitle = "ArgoCD Basics Training" +++ - +{{< onlyWhenNot techlab >}} {{< blocks/cover title="Welcome to the ArgoCD Basics Training" image_anchor="top" height="full" color="primary" >}}
}}"> @@ -17,3 +17,16 @@
{{< /blocks/cover >}} +{{< /onlyWhenNot >}} +{{< onlyWhen techlab >}} +{{< blocks/cover title="Welcome to the ArgoCD Techlab" image_anchor="top" height="full" color="primary" >}} +
+ }}"> + Setup + + }}"> + Labs + +
+{{< /blocks/cover >}} +{{< /onlyWhen >}} diff --git a/content/en/docs/06/_index.md b/content/en/docs/06/_index.md index 81c909b..719f7b0 100644 --- a/content/en/docs/06/_index.md +++ b/content/en/docs/06/_index.md @@ -2,6 +2,7 @@ title: "6. Multiple Applications" weight: 6 sectionnumber: 6 +onlyWhenNot: techlab --- When it comes to managing a larger amount of application or bootstrapping whole environments, it's not very practical to manage the ArgoCD application manually using the CLI Tool `argocd app create`. diff --git a/content/en/docs/06/app_of_apps.md b/content/en/docs/06/app_of_apps.md index 2f256db..de36808 100644 --- a/content/en/docs/06/app_of_apps.md +++ b/content/en/docs/06/app_of_apps.md @@ -2,6 +2,7 @@ title: "6.1 App of Apps" weight: 601 sectionnumber: 6.1 +onlyWhenNot: techlab --- The [App of apps](https://argoproj.github.io/argo-cd/operator-manual/cluster-bootstrapping/#app-of-apps-pattern) pattern is a declarative specification of one ArgoCD app that consists only of **other ArgoCD applications**. This way we have the possibility to deploy multiple apps within just one single App definition. diff --git a/content/en/docs/06/application_sets.md b/content/en/docs/06/application_sets.md index 9fab2af..c3b6111 100644 --- a/content/en/docs/06/application_sets.md +++ b/content/en/docs/06/application_sets.md @@ -2,6 +2,7 @@ title: "6.2 Application Sets" weight: 602 sectionnumber: 6.2 +onlyWhenNot: techlab --- With the ApplicationSet ArgoCD adds support for managing ArgoCD Application across a large number of clusters and environments. Plus it adds the capability of managing multitenant Kubernetes clusters. diff --git a/content/en/docs/07/_index.md b/content/en/docs/07/_index.md index 55d056b..0360808 100644 --- a/content/en/docs/07/_index.md +++ b/content/en/docs/07/_index.md @@ -2,6 +2,7 @@ title: "7. Projects" weight: 7 sectionnumber: 7 +onlyWhenNot: techlab --- Argo CD applications can be linked to a project which provides a logical grouping of applications. The following configurations can be made on a project: diff --git a/content/en/docs/08/_index.md b/content/en/docs/08/_index.md index 7ff4996..d44172b 100644 --- a/content/en/docs/08/_index.md +++ b/content/en/docs/08/_index.md @@ -2,6 +2,7 @@ title: "8. Controlling Deployment Workflows" weight: 8 sectionnumber: 8 +onlyWhenNot: techlab --- In this chapter you'll learn how to control the Deployment Workflow even more. diff --git a/content/en/docs/08/sync_windows.md b/content/en/docs/08/sync_windows.md index a202de0..9a6fef9 100644 --- a/content/en/docs/08/sync_windows.md +++ b/content/en/docs/08/sync_windows.md @@ -2,6 +2,7 @@ title: "8.2 Sync Windows" weight: 82 sectionnumber: 8.2 +onlyWhenNot: techlab --- With Sync windows the user can define at which time applications can be synchronized automatically and manually by Argo CD. Allowed and forbidden time windows can be defined. Sync windows can be restricted to a subset of applications, clusters and namespaces and thus offer great flexibility. diff --git a/content/en/docs/08/tracking_deployment_strategies.md b/content/en/docs/08/tracking_deployment_strategies.md index 56ecd37..931c1af 100644 --- a/content/en/docs/08/tracking_deployment_strategies.md +++ b/content/en/docs/08/tracking_deployment_strategies.md @@ -2,6 +2,7 @@ title: "8.1 Tracking and Deployment Strategies" weight: 81 sectionnumber: 8.1 +onlyWhenNot: techlab --- If you are using ArgoCD with Git or Helm tools, ArgoCD gives you the availability to configure different tracking and deployment strategies. diff --git a/content/en/docs/additional/_index.md b/content/en/docs/additional/_index.md index b7c7f95..5370c43 100644 --- a/content/en/docs/additional/_index.md +++ b/content/en/docs/additional/_index.md @@ -2,6 +2,7 @@ title: "9. Additional Concepts" weight: 90 sectionnumber: 9 +onlyWhenNot: techlab --- In this chapter you'll learn additional concepts of ArgoCD diff --git a/content/en/docs/additional/backup_restore.md b/content/en/docs/additional/backup_restore.md index a4be0ec..809f01b 100644 --- a/content/en/docs/additional/backup_restore.md +++ b/content/en/docs/additional/backup_restore.md @@ -2,6 +2,7 @@ title: "9.2 Backup and Restore" weight: 902 sectionnumber: 9.2 +onlyWhenNot: techlab --- {{% alert title="Warning" color="warning" %}} diff --git a/content/en/docs/additional/orphaned_resources.md b/content/en/docs/additional/orphaned_resources.md index dbebdca..71b03c8 100644 --- a/content/en/docs/additional/orphaned_resources.md +++ b/content/en/docs/additional/orphaned_resources.md @@ -2,6 +2,7 @@ title: "9.1 Orphaned Resources" weight: 901 sectionnumber: 9.1 +onlyWhenNot: techlab --- This lab contains demonstrates how to find orphaned top-level resources with Argo CD. Orphaned resources are not managed by Argo CD and could be potentially removed from cluster. diff --git a/content/en/slides/_index.md b/content/en/slides/_index.md index a640ca2..5308371 100644 --- a/content/en/slides/_index.md +++ b/content/en/slides/_index.md @@ -9,8 +9,10 @@ menu: {{< blocks/section color="light">}} +{{% onlyWhenNot techlab %}} {{% blocks/feature icon="fa-chalkboard-teacher" url="https://drive.google.com/drive/folders/1IgCIBVybSDrxxdYyvT8HKpZugIdWMnRY?usp=sharing" title="ArgoCD Basics Training Presentations" %}} {{% /blocks/feature %}} +{{% /onlyWhenNot %}} {{% blocks/feature icon="fa-chalkboard-teacher" url="../pdf/pdf.pdf" title="Lab PDF" %}} {{% /blocks/feature %}} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index caa4c52..d54f8aa 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -14,6 +14,18 @@ acendTraining: secretOverride: acend-wildcard appname: argocd-basics domain: training.acend.ch + - + name: techlab + replicaCount: 2 + image: + repository: quay.io/acend/argocd-basics-training + pullPolicy: Always + tag: "" + tagsuffix: "-techlab" + ingress: + secretOverride: acend-wildcard + appname: argocd-techlab + domain: training.acend.ch - name: puzzle replicaCount: 2 @@ -28,7 +40,6 @@ acendTraining: domain: training.puzzle.ch - nameOverride: "acend-argocd-basics" fullnameOverride: ""