More trial and error

2024-02-06 10:30:03 +01:00 · 2024-02-06 10:30:03 +01:00 · ad868a714c
parent 676697cc9c
commit ad868a714c
5 changed files with 42 additions and 38 deletions
--- 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/
--- 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
+  - 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
--- 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
+  - 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
--- 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
+  - 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
--- 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
+  - 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