From 3cd6c68e9daefda0926c020dc3dc6591fc1a9300 Mon Sep 17 00:00:00 2001
From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
Date: Thu, 15 Aug 2024 19:36:55 +1000
Subject: [PATCH] Switch one cluster to 2.7.3.

---
 .../resources/workshop.yaml                   | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/workshops/lab-lookup-configuration/resources/workshop.yaml b/workshops/lab-lookup-configuration/resources/workshop.yaml
index e4c5333..a0bcf8d 100644
--- a/workshops/lab-lookup-configuration/resources/workshop.yaml
+++ b/workshops/lab-lookup-configuration/resources/workshop.yaml
@@ -19,8 +19,7 @@ spec:
     - name: educates
       files:
       - image:
-            # url: $(oci_image_cache)/educates-client-programs:3.0.0-alpha.12
-            url: $(oci_image_cache)/educates-client-programs:lookup-service-failures
+            url: $(oci_image_cache)/educates-client-programs:3.0.0-alpha.14
         path: bin
         includePaths:
         - educates-linux-$(platform_arch)
@@ -168,6 +167,7 @@ spec:
             name: vcluster
             repository:
               url: https://charts.loft.sh
+            version: "0.19.7"
         template:
         - helmTemplate:
             name: hub-vcluster
@@ -249,6 +249,7 @@ spec:
             name: vcluster
             repository:
               url: https://charts.loft.sh
+            version: "0.19.7"
         template:
         - helmTemplate:
             name: cluster-1-vcluster
@@ -328,8 +329,7 @@ spec:
             key: config
         fetch:
         - imgpkgBundle:
-            # image: ghcr.io/vmware-tanzu-labs/educates-installer:3.0.0-alpha.12
-            image: ghcr.io/grahamdumpleton/educates-installer:lookup-service-failures
+            image: ghcr.io/vmware-tanzu-labs/educates-installer:3.0.0-alpha.14
         deploy:
         - kapp:
             rawOptions:
@@ -355,19 +355,12 @@ spec:
         namespace: $(session_namespace)-cluster-1
       stringData:
         values.yaml: |
-          clusterInfrastructure:
-            provider: vcluster
-          clusterPackages:
-            kyverno:
-              enabled: false
           clusterIngress:
             domain: "cluster-1.$(session_name).$(ingress_domain)"
           clusterSecurity:
             policyEngine: none
           workshopSecurity:
             rulesEngine: none
-          lookupService:
-            enabled: true
     - apiVersion: kappctrl.k14s.io/v1alpha1
       kind: App
       metadata:
@@ -383,8 +376,7 @@ spec:
             key: config
         fetch:
         - imgpkgBundle:
-            # image: ghcr.io/vmware-tanzu-labs/educates-installer:3.0.0-alpha.12
-            image: ghcr.io/grahamdumpleton/educates-installer:lookup-service-failures
+            image: ghcr.io/vmware-tanzu-labs/educates-training-platform:2.7.3
         deploy:
         - kapp:
             rawOptions:
@@ -393,9 +385,9 @@ spec:
         - ytt:
             paths:
             - config
-            - kbld/kbld-bundle.yaml
+            - kbld-bundle.yaml
             valuesFrom:
-            - path: kbld/kbld-images.yaml
+            - path: kbld-images.yaml
             - secretRef:
                 name: educates-training-platform-values
         - kbld:
@@ -442,6 +434,7 @@ spec:
             name: vcluster
             repository:
               url: https://charts.loft.sh
+            version: "0.19.7"
         template:
         - helmTemplate:
             name: cluster-2-vcluster
@@ -521,8 +514,7 @@ spec:
             key: config
         fetch:
         - imgpkgBundle:
-            # image: ghcr.io/vmware-tanzu-labs/educates-installer:3.0.0-alpha.12
-            image: ghcr.io/grahamdumpleton/educates-installer:lookup-service-failures
+            image: ghcr.io/vmware-tanzu-labs/educates-installer:3.0.0-alpha.14
         deploy:
         - kapp:
             rawOptions:
@@ -545,8 +537,7 @@ spec:
       registries:
       - content:
         - destination: /educates-client-programs
-          # prefix: /vmware-tanzu-labs/educates-client-programs
-          prefix: /grahamdumpleton/educates-client-programs
+          prefix: /vmware-tanzu-labs/educates-client-programs
           stripPrefix: true
         onDemand: true
         urls: