From 47fc03e75c4be680c82871dabe4996c80de79452 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 3 May 2023 16:51:57 +0200
Subject: [PATCH] Use resource infator again

---
 rds/base/kustomization.yaml          | 11 +++++------
 rds/overlays/test/kustomization.yaml | 14 +++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/rds/base/kustomization.yaml b/rds/base/kustomization.yaml
index ed1860b..530ae1a 100644
--- a/rds/base/kustomization.yaml
+++ b/rds/base/kustomization.yaml
@@ -6,10 +6,9 @@ resources:
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-helmCharts:
-- name: all
-  namespace: helmrds
+helmChartInflationGenerator:
+- chartHome: ./charts/
+  chartName: all
   releaseName: sciebords
-  valuesFile: ./values/values.yaml
-helmGlobals:
-  chartHome: ./charts/
+  releaseNamespace: helmrds
+  values: ./values/values.yaml
diff --git a/rds/overlays/test/kustomization.yaml b/rds/overlays/test/kustomization.yaml
index 81f5c8f..4b5f400 100644
--- a/rds/overlays/test/kustomization.yaml
+++ b/rds/overlays/test/kustomization.yaml
@@ -1,8 +1,8 @@
-apiVersion: 'kustomize.config.k8s.io/v1beta1'
+apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- ../../base
-patchesStrategicMerge:
-  - describo-ingress.yml
-  - rds-ingress.yml
-  - sunet-service.yml
+resources:
+- ../../base/
+patches:
+- path: describo-ingress.yml
+- path: rds-ingress.yml
+- path: sunet-service.yml