From e51d754f1dd0a1db862828b356fb1ceba6fef7b5 Mon Sep 17 00:00:00 2001 From: Jorge Morales Pou Date: Fri, 12 Jul 2024 18:31:30 +0200 Subject: [PATCH] Fixing multiworkshop --- .github/workflows/publish-workshop.yaml | 6 ++---- .../resources/trainingportal.yaml | 15 --------------- .../resources/workshop.yaml | 8 ++++++-- .../resources/trainingportal.yaml | 15 --------------- .../resources/workshop.yaml | 9 ++++++--- .../resources/trainingportal.yaml | 15 --------------- .../resources/workshop.yaml | 2 ++ 7 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 workshops/lab-containerizing-spring/resources/trainingportal.yaml delete mode 100644 workshops/lab-creating-a-spring-app/resources/trainingportal.yaml delete mode 100644 workshops/lab-spring-boot-on-k8s/resources/trainingportal.yaml diff --git a/.github/workflows/publish-workshop.yaml b/.github/workflows/publish-workshop.yaml index f78baaf..a42ae8b 100644 --- a/.github/workflows/publish-workshop.yaml +++ b/.github/workflows/publish-workshop.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Carvel tools shell: bash @@ -27,9 +27,7 @@ jobs: - name: Install Educates CLI shell: bash run: | - # curl -Lo /usr/local/bin/educates https://github.com/vmware-tanzu-labs/educates-training-platform/releases/download/2.6.0/educates-linux-amd64 - # chmod +x /usr/local/bin/educates - imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:2.6.0 -o /tmp/client-programs + imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:2.7.2 -o /tmp/client-programs mv /tmp/client-programs/educates-linux-amd64 /usr/local/bin/educates - name: Setup repository variables and release details diff --git a/workshops/lab-containerizing-spring/resources/trainingportal.yaml b/workshops/lab-containerizing-spring/resources/trainingportal.yaml deleted file mode 100644 index 827389f..0000000 --- a/workshops/lab-containerizing-spring/resources/trainingportal.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: training.educates.dev/v1beta1 -kind: TrainingPortal -metadata: - name: lab-containerizing-spring -spec: - portal: - registration: - type: anonymous - updates: - workshop: true - workshops: - - name: lab-containerizing-spring - capacity: 1 - expires: 15m - orphaned: 5m diff --git a/workshops/lab-containerizing-spring/resources/workshop.yaml b/workshops/lab-containerizing-spring/resources/workshop.yaml index d51f935..9af66b8 100644 --- a/workshops/lab-containerizing-spring/resources/workshop.yaml +++ b/workshops/lab-containerizing-spring/resources/workshop.yaml @@ -5,13 +5,17 @@ metadata: spec: title: Containerizing a Spring Boot application description: A workshop describing how to run a Spring Boot application in docker. + publish: + image: $(image_repository)/lab-containerizing-spring-files:$(workshop_version) workshop: image: jdk17-environment:* files: - image: - url: $(image_repository)/labs-spring-workshops-files:$(workshop_version) + url: $(image_repository)/lab-containerizing-spring-files:$(workshop_version) includePaths: - - /workshops/lab-containerizing-spring/workshop/** + - /workshop/** + - /exercises/** + - /README.md newRootPath: workshops/lab-containerizing-spring session: resources: diff --git a/workshops/lab-creating-a-spring-app/resources/trainingportal.yaml b/workshops/lab-creating-a-spring-app/resources/trainingportal.yaml deleted file mode 100644 index 1ae86a1..0000000 --- a/workshops/lab-creating-a-spring-app/resources/trainingportal.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: training.educates.dev/v1beta1 -kind: TrainingPortal -metadata: - name: lab-creating-a-spring-app -spec: - portal: - registration: - type: anonymous - updates: - workshop: true - workshops: - - name: lab-creating-a-spring-app - capacity: 1 - expires: 15m - orphaned: 5m diff --git a/workshops/lab-creating-a-spring-app/resources/workshop.yaml b/workshops/lab-creating-a-spring-app/resources/workshop.yaml index 86db57c..ab007a5 100644 --- a/workshops/lab-creating-a-spring-app/resources/workshop.yaml +++ b/workshops/lab-creating-a-spring-app/resources/workshop.yaml @@ -5,14 +5,17 @@ metadata: spec: title: Creating a Spring Boot application description: A workshop introducing the start.spring.io web site. + publish: + image: $(image_repository)/labs-creating-a-spring-app-files:$(workshop_version) workshop: image: jdk17-environment:* files: - image: - url: $(image_repository)/labs-spring-workshops-files:$(workshop_version) + url: $(image_repository)/labs-creating-a-spring-app-files:$(workshop_version) includePaths: - - /workshops/lab-creating-a-spring-app/workshop/** - newRootPath: workshops/lab-creating-a-spring-app + - /workshop/** + - /exercises/** + - /README.md - path: .m2 image: url: ghcr.io/educates/lab-spring-boot-on-k8s-maven:latest diff --git a/workshops/lab-spring-boot-on-k8s/resources/trainingportal.yaml b/workshops/lab-spring-boot-on-k8s/resources/trainingportal.yaml deleted file mode 100644 index 90fac42..0000000 --- a/workshops/lab-spring-boot-on-k8s/resources/trainingportal.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: training.educates.dev/v1beta1 -kind: TrainingPortal -metadata: - name: lab-spring-boot-on-k8s -spec: - portal: - registration: - type: anonymous - updates: - workshop: true - workshops: - - name: lab-spring-boot-on-k8s - capacity: 1 - expires: 60m - orphaned: 5m diff --git a/workshops/lab-spring-boot-on-k8s/resources/workshop.yaml b/workshops/lab-spring-boot-on-k8s/resources/workshop.yaml index fd93128..bebf818 100644 --- a/workshops/lab-spring-boot-on-k8s/resources/workshop.yaml +++ b/workshops/lab-spring-boot-on-k8s/resources/workshop.yaml @@ -5,6 +5,8 @@ metadata: spec: title: Spring Boot on Kubernetes description: Introduction to Spring Boot on Kubernetes + publish: + image: $(image_repository)/lab-spring-boot-on-k8s-files:$(workshop_version) workshop: image: jdk17-environment:* files: