From 676697cc9c14d16cffaa9e92b97e5bee0ee523bf Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Tue, 6 Feb 2024 09:57:58 +0100 Subject: [PATCH] Try to move helm inflation generator --- jupyter/base/kustomization.yaml | 6 ------ jupyter/overlays/test/hig/kustomization.yaml | 6 ++++++ jupyter/overlays/test/su/kustomization.yaml | 6 ++++++ jupyter/overlays/test/sunet/kustomization.yaml | 6 ++++++ jupyter/overlays/test/uu/kustomization.yaml | 6 ++++++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/jupyter/base/kustomization.yaml b/jupyter/base/kustomization.yaml index ce02bed..8e1d511 100644 --- a/jupyter/base/kustomization.yaml +++ b/jupyter/base/kustomization.yaml @@ -4,11 +4,5 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -helmCharts: -- includeCRDs: true - name: jupyterhub - releaseName: jupyterhub - valuesFile: ./values/values.yaml - version: 3.0.3 helmGlobals: chartHome: ./charts/ diff --git a/jupyter/overlays/test/hig/kustomization.yaml b/jupyter/overlays/test/hig/kustomization.yaml index f6cfc47..b32a692 100644 --- a/jupyter/overlays/test/hig/kustomization.yaml +++ b/jupyter/overlays/test/hig/kustomization.yaml @@ -2,6 +2,12 @@ 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 patches: - 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 f6cfc47..b32a692 100644 --- a/jupyter/overlays/test/su/kustomization.yaml +++ b/jupyter/overlays/test/su/kustomization.yaml @@ -2,6 +2,12 @@ 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 patches: - 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 046f910..841356e 100644 --- a/jupyter/overlays/test/sunet/kustomization.yaml +++ b/jupyter/overlays/test/sunet/kustomization.yaml @@ -2,6 +2,12 @@ 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 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 f6cfc47..b32a692 100644 --- a/jupyter/overlays/test/uu/kustomization.yaml +++ b/jupyter/overlays/test/uu/kustomization.yaml @@ -2,6 +2,12 @@ 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 patches: - path: jupyterhub-ingress.yml - path: jupyterhub-service.yml