Fix ingress and add owner references.

educates · Sep 20, 2023 · 8828977 · 8828977
1 parent d1f22d5
commit 8828977
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ kubectl apply -f https://github.com/educates/labs-vcluster-testing/releases/late
 kubectl apply -f https://github.com/educates/labs-vcluster-testing/releases/latest/download/trainingportal.yaml
 ```
 
-Educates version 2.6.0 or later is required to run these workshops.
+Educates version 2.6.12 or later is required to run these workshops.
 
 Note that some workshops have prerequisites that need to be satisified else they
 will not work. Check the README for each workshop for more details.
diff --git a/workshops/lab-admin-vcluster/resources/workshop.yaml b/workshops/lab-admin-vcluster/resources/workshop.yaml
@@ -73,6 +73,9 @@ spec:
             extraArgs:
             - --tls-san=admin-vcluster.$(session_namespace).svc.$(cluster_domain)
             - --out-kube-config-server=https://admin-vcluster.$(session_namespace).svc.$(cluster_domain)
+          sync:
+            ingresses:
+              enabled: true
     - apiVersion: kappctrl.k14s.io/v1alpha1
       kind: App
       metadata:
@@ -94,6 +97,23 @@ spec:
             valuesFrom:
             - secretRef:
                 name: $(session_name)-admin-vcluster-values
+        - ytt:
+            inline:
+              paths:
+                overlays.yaml: |
+                  #@ load("@ytt:data", "data")
+                  #@ load("@ytt:overlay", "overlay")
+                  #@overlay/match by=overlay.all, expects="1+"
+                  ---
+                  metadata:
+                    #@overlay/match missing_ok=True
+                    ownerReferences:
+                      - apiVersion: training.educates.dev/v1beta1
+                        kind: WorkshopSession
+                        blockOwnerDeletion: true
+                        controller: true
+                        name: $(session_name)
+                        uid: $(workshop_session_uid)
         deploy:
         - kapp:
             rawOptions:

diff --git a/workshops/lab-shared-vcluster/resources/workshop.yaml b/workshops/lab-shared-vcluster/resources/workshop.yaml
@@ -162,6 +162,9 @@ spec:
             extraArgs:
             - --tls-san=shared-vcluster.$(workshop_namespace).svc.$(cluster_domain)
             - --out-kube-config-server=https://shared-vcluster.$(workshop_namespace).svc.$(cluster_domain)
+          sync:
+            ingresses:
+              enabled: true
     - apiVersion: kappctrl.k14s.io/v1alpha1
       kind: App
       metadata:
@@ -183,6 +186,23 @@ spec:
             valuesFrom:
             - secretRef:
                 name: shared-vcluster-values
+        - ytt:
+            inline:
+              paths:
+                overlays.yaml: |
+                  #@ load("@ytt:data", "data")
+                  #@ load("@ytt:overlay", "overlay")
+                  #@overlay/match by=overlay.all, expects="1+"
+                  ---
+                  metadata:
+                    #@overlay/match missing_ok=True
+                    ownerReferences:
+                      - apiVersion: training.educates.dev/v1beta1
+                        kind: WorkshopEnvironment
+                        blockOwnerDeletion: true
+                        controller: true
+                        name: $(environment_name)
+                        uid: $(workshop_environment_uid)
         deploy:
         - kapp:
             rawOptions: