From ad868a714cf6183b82e4196cf0fc80f01bcb6d89 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Tue, 6 Feb 2024 10:30:03 +0100
Subject: [PATCH] More trial and error

---
 jupyter/base/kustomization.yaml               |  8 ++------
 jupyter/overlays/test/hig/kustomization.yaml  | 20 ++++++++++---------
 jupyter/overlays/test/su/kustomization.yaml   | 20 ++++++++++---------
 .../overlays/test/sunet/kustomization.yaml    | 12 ++++++-----
 jupyter/overlays/test/uu/kustomization.yaml   | 20 ++++++++++---------
 5 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/jupyter/base/kustomization.yaml b/jupyter/base/kustomization.yaml
index 8e1d511..0193d7d 100644
--- a/jupyter/base/kustomization.yaml
+++ b/jupyter/base/kustomization.yaml
@@ -1,8 +1,4 @@
-resources:
-- jupyterhub-ingress.yml
-- jupyterhub-service.yml
-
+---
+resources: [jupyterhub-ingress.yml, jupyterhub-service.yml]
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-helmGlobals:
-  chartHome: ./charts/
diff --git a/jupyter/overlays/test/hig/kustomization.yaml b/jupyter/overlays/test/hig/kustomization.yaml
index b32a692..4a6bc6e 100644
--- a/jupyter/overlays/test/hig/kustomization.yaml
+++ b/jupyter/overlays/test/hig/kustomization.yaml
@@ -1,13 +1,15 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- ../../../base/
+resources: [../../../base/]
 helmCharts:
-- includeCRDs: true
-  name: jupyterhub
-  releaseName: jupyterhub
-  valuesFile: ./values/values.yaml
-  version: 3.0.3
+  - includeCRDs: true
+    name: jupyterhub
+    releaseName: jupyterhub
+    valuesFile: ./values/values.yaml
+    version: 3.0.3
+helmGlobals:
+  chartHome: ../../../base/charts/
 patches:
-- path: jupyterhub-ingress.yml
-- path: jupyterhub-service.yml
+  - path: jupyterhub-ingress.yml
+  - path: jupyterhub-service.yml
diff --git a/jupyter/overlays/test/su/kustomization.yaml b/jupyter/overlays/test/su/kustomization.yaml
index b32a692..4a6bc6e 100644
--- a/jupyter/overlays/test/su/kustomization.yaml
+++ b/jupyter/overlays/test/su/kustomization.yaml
@@ -1,13 +1,15 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- ../../../base/
+resources: [../../../base/]
 helmCharts:
-- includeCRDs: true
-  name: jupyterhub
-  releaseName: jupyterhub
-  valuesFile: ./values/values.yaml
-  version: 3.0.3
+  - includeCRDs: true
+    name: jupyterhub
+    releaseName: jupyterhub
+    valuesFile: ./values/values.yaml
+    version: 3.0.3
+helmGlobals:
+  chartHome: ../../../base/charts/
 patches:
-- path: jupyterhub-ingress.yml
-- path: jupyterhub-service.yml
+  - path: jupyterhub-ingress.yml
+  - path: jupyterhub-service.yml
diff --git a/jupyter/overlays/test/sunet/kustomization.yaml b/jupyter/overlays/test/sunet/kustomization.yaml
index 841356e..4a6bc6e 100644
--- a/jupyter/overlays/test/sunet/kustomization.yaml
+++ b/jupyter/overlays/test/sunet/kustomization.yaml
@@ -3,11 +3,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources: [../../../base/]
 helmCharts:
-- includeCRDs: true
-  name: jupyterhub
-  releaseName: jupyterhub
-  valuesFile: ./values/values.yaml
-  version: 3.0.3
+  - includeCRDs: true
+    name: jupyterhub
+    releaseName: jupyterhub
+    valuesFile: ./values/values.yaml
+    version: 3.0.3
+helmGlobals:
+  chartHome: ../../../base/charts/
 patches:
   - path: jupyterhub-ingress.yml
   - path: jupyterhub-service.yml
diff --git a/jupyter/overlays/test/uu/kustomization.yaml b/jupyter/overlays/test/uu/kustomization.yaml
index b32a692..4a6bc6e 100644
--- a/jupyter/overlays/test/uu/kustomization.yaml
+++ b/jupyter/overlays/test/uu/kustomization.yaml
@@ -1,13 +1,15 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- ../../../base/
+resources: [../../../base/]
 helmCharts:
-- includeCRDs: true
-  name: jupyterhub
-  releaseName: jupyterhub
-  valuesFile: ./values/values.yaml
-  version: 3.0.3
+  - includeCRDs: true
+    name: jupyterhub
+    releaseName: jupyterhub
+    valuesFile: ./values/values.yaml
+    version: 3.0.3
+helmGlobals:
+  chartHome: ../../../base/charts/
 patches:
-- path: jupyterhub-ingress.yml
-- path: jupyterhub-service.yml
+  - path: jupyterhub-ingress.yml
+  - path: jupyterhub-service.yml