diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7f4bb2ec..c0a253d1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,17 +42,6 @@ jobs: push: true tags: | quay.io/acend/kubernetes-basics-training:pr-${{ github.event.pull_request.number }} - - - name: Build Mobi Version - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - build-args: | - TRAINING_HUGO_ENV=mobi - push: true - tags: | - quay.io/acend/kubernetes-basics-training:pr-${{ github.event.pull_request.number }}-mobi - name: Build OpenShift Version uses: docker/build-push-action@v6 @@ -148,7 +137,6 @@ jobs: TRAINING_NAMESPACE: 'acend-kubernetes-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}-mobi --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-openshift --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-baloise --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-sbb --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE @@ -162,7 +150,6 @@ jobs: message: | PR environments: * [acend](https://kubernetes-basics-pr-${{ github.event.pull_request.number }}.training.acend.ch) - * [Mobi](https://kubernetes-basics-mobi-pr-${{ github.event.pull_request.number }}.training.puzzle.ch) * [OpenShift](https://openshift-basics-pr-${{ github.event.pull_request.number }}.training.acend.ch) * [OpenShift Baloise](https://openshift-basics-baloise-pr-${{ github.event.pull_request.number }}.training.acend.ch) * [OpenShift SBB](https://openshift-basics-sbb-pr-${{ github.event.pull_request.number }}.training.acend.ch) diff --git a/.github/workflows/pr-cleanup.yaml b/.github/workflows/pr-cleanup.yaml index aa99970f..130827bc 100644 --- a/.github/workflows/pr-cleanup.yaml +++ b/.github/workflows/pr-cleanup.yaml @@ -45,7 +45,7 @@ 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}{,-mobi,-openshift,-sbb,-bfh} + curl -X DELETE -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" https://quay.io/api/v1/repository/${REPOSITORY}/tag/pr-${PR_NUMBER}{-openshift,-sbb,-bfh} - name: Delete tags in quay.io appuio organization id: delete_tags_appuio diff --git a/.github/workflows/push-main.yaml b/.github/workflows/push-main.yaml index 87ac9ff5..cb405ca9 100644 --- a/.github/workflows/push-main.yaml +++ b/.github/workflows/push-main.yaml @@ -44,17 +44,6 @@ jobs: push: true tags: | quay.io/acend/kubernetes-basics-training:latest - - - name: Build Mobi Version - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - build-args: | - TRAINING_HUGO_ENV=mobi - push: true - tags: | - quay.io/acend/kubernetes-basics-training:latest-mobi - name: Build OpenShift Version uses: docker/build-push-action@v6 @@ -150,7 +139,6 @@ jobs: TRAINING_NAMESPACE: 'acend-kubernetes-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}-mobi --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-openshift --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-baloise --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME}-sbb --kubeconfig $HOME/.kube/config --namespace $TRAINING_NAMESPACE diff --git a/config/mobi/config.toml b/config/mobi/config.toml deleted file mode 100644 index 72c62206..00000000 --- a/config/mobi/config.toml +++ /dev/null @@ -1,56 +0,0 @@ -[module] - [module.hugoVersion] - extended = true - min = "0.100.0" - [[module.imports]] - path = "github.com/puzzle/docsy-puzzle" - disable = false - [[module.imports]] - path = "github.com/acend/docsy-plus" - disable = false - [[module.imports]] - path = "github.com/google/docsy" - disable = false - [[module.imports]] - path = "github.com/google/docsy/dependencies" - disable = false - -[params] -enabledModule = "base mobi" -copyright = "Puzzle ITC GmbH" -imagePrefix = "puzzle_" -customer = "mobi" - -[[Languages.en.menu.main]] -copyright = "Puzzle ITC GmbH" -url = "https://www.puzzle.ch" - -[params.replaceContent] -allowedHrefHosts = ['localhost', 'puzzle.ch', 'acend.ch'] - -[[params.replaceContent.placeholders]] -placeholder = "" -queryParam = "n" -defaultValue = "$USER" - -[[params.replaceContent.placeholders]] -placeholder = "" -queryParam = "a" -defaultValue = "" - -############################## social links ############################## -[params.links] -[[params.links.developer]] -name = "GitHub" -icon = "fab fa-github" -url = "https://github.com/acend/kubernetes-basics-training" - -[[params.links.user]] -name = "Twitter" -icon = "fab fa-twitter" -url = "https://twitter.com/puzzleitc" - -[[params.links.user]] -name = "LinkedIn" -icon = "fab fa-linkedin-in" -url = "https://linkedin.com/company/puzzle-itc/" diff --git a/content/en/materials/_index.md b/content/en/materials/_index.md index 7f426f9f..f37f6757 100644 --- a/content/en/materials/_index.md +++ b/content/en/materials/_index.md @@ -11,7 +11,6 @@ menu: {{% onlyWhenNot bfh %}} {{% onlyWhenNot openshift %}} -{{% onlyWhenNot mobi %}} {{% blocks/feature icon="fa-magic" url="https://acend.ch/documents/acend_kubectl-cheat-sheet_v1.pdf" title="kubectl Cheat Sheet" %}} {{% /blocks/feature %}} @@ -20,14 +19,6 @@ menu: {{% blocks/feature icon="fa-chalkboard-teacher" url="https://drive.google.com/uc?export=download&id=17sqbsjMPzAnYAKzEhL5waxPg8_N2xsZa" title="Kubernetes Architecture" %}} {{% /blocks/feature %}} -{{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -{{% blocks/feature icon="fa-chalkboard-teacher" url="https://drive.google.com/uc?export=download&id=1qeb_Nmyj8016sRJaL0CGfuAi2LIwoTF2" title="Kubernetes Basics" %}} -{{% /blocks/feature %}} - -{{% blocks/feature icon="fa-chalkboard-teacher" url="https://drive.google.com/uc?export=download&id=1M4txDY3UhzqWr4HLn5UXFibv2umbfx3d" title="Kubernetes Architecture" %}} -{{% /blocks/feature %}} -{{% /onlyWhen %}} {{% blocks/feature icon="fa-chalkboard-teacher" url="https://www.cncf.io/wp-content/uploads/2018/03/CNCF-Presentation-Template-K8s-Deployment.pdf" title="Kubernetes Deployment Strategies" %}} {{% /blocks/feature %}} diff --git a/content/en/pdf/header.md b/content/en/pdf/header.md index 906f6c7e..88c1c253 100644 --- a/content/en/pdf/header.md +++ b/content/en/pdf/header.md @@ -5,6 +5,6 @@ weight: 10
-

{{< site_title >}} - {{% onlyWhen mobi %}}Puzzle ITC GmbH{{% /onlyWhen %}}{{% onlyWhenNot mobi %}}acend gmbh{{% /onlyWhenNot %}}

+

{{< site_title >}} - acend gmbh

diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 80d56638..495b439e 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -13,18 +13,6 @@ acendTraining: secretOverride: acend-wildcard appname: kubernetes-basics domain: training.acend.ch - - - name: mobi - replicaCount: 2 - image: - repository: quay.io/acend/kubernetes-basics-training - pullPolicy: Always - tag: "" - tagsuffix: "-mobi" - ingress: - secretOverride: acend-wildcard - appname: kubernetes-basics-mobi - domain: training.puzzle.ch - name: openshift replicaCount: 2