From fd42e5b7096bf4dd80edc9bacd6399ffea4435d7 Mon Sep 17 00:00:00 2001
From: Luke Ashe-Browne <xactly@gmail.com>
Date: Sat, 27 Mar 2021 13:32:43 +0000
Subject: [PATCH] add test3 ns setup

---
 .../flux-system/kustomization.yaml             | 18 +++++++++++++++++-
 deployments/test/helmrepo-podinfo.yaml         | 10 ----------
 deployments/test/kustomization.yaml            | 15 ---------------
 deployments/test3/namespace_test.yaml          |  4 ++++
 deployments/{test => test3}/nginx-deploy.yaml  |  0
 deployments/test3/podinfo-hr.yaml              | 15 +++++++++++++++
 6 files changed, 36 insertions(+), 26 deletions(-)
 delete mode 100644 deployments/test/helmrepo-podinfo.yaml
 delete mode 100644 deployments/test/kustomization.yaml
 create mode 100644 deployments/test3/namespace_test.yaml
 rename deployments/{test => test3}/nginx-deploy.yaml (100%)
 create mode 100644 deployments/test3/podinfo-hr.yaml

diff --git a/clusters/odc2-110-admin/flux-system/kustomization.yaml b/clusters/odc2-110-admin/flux-system/kustomization.yaml
index 45b7950..f311ba3 100644
--- a/clusters/odc2-110-admin/flux-system/kustomization.yaml
+++ b/clusters/odc2-110-admin/flux-system/kustomization.yaml
@@ -1,6 +1,22 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - gotk-components.yaml
 - gotk-kustomization.yaml
-- gotk-sync.yaml
\ No newline at end of file
+- gotk-sync.yaml
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: testns3
+  namespace: test3
+spec:
+  interval: 1m0s
+  path: ./deployments/test3
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  validation: "true"
+
diff --git a/deployments/test/helmrepo-podinfo.yaml b/deployments/test/helmrepo-podinfo.yaml
deleted file mode 100644
index 48baeea..0000000
--- a/deployments/test/helmrepo-podinfo.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: podinfo
-  namespace: test
-spec:
-  interval: 1m0s
-  url: https://stefanprodan.github.io/podinfo
-
diff --git a/deployments/test/kustomization.yaml b/deployments/test/kustomization.yaml
deleted file mode 100644
index ca1a745..0000000
--- a/deployments/test/kustomization.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
-kind: Kustomization
-metadata:
-  name: testns
-  namespace: test
-spec:
-  interval: 1m0s
-  path: ./deployments/test
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  validation: "true"
-
diff --git a/deployments/test3/namespace_test.yaml b/deployments/test3/namespace_test.yaml
new file mode 100644
index 0000000..4a53dee
--- /dev/null
+++ b/deployments/test3/namespace_test.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test3
diff --git a/deployments/test/nginx-deploy.yaml b/deployments/test3/nginx-deploy.yaml
similarity index 100%
rename from deployments/test/nginx-deploy.yaml
rename to deployments/test3/nginx-deploy.yaml
diff --git a/deployments/test3/podinfo-hr.yaml b/deployments/test3/podinfo-hr.yaml
new file mode 100644
index 0000000..1a11032
--- /dev/null
+++ b/deployments/test3/podinfo-hr.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: podinfo
+  namespace: test3
+spec:
+  chart:
+    spec:
+      chart: podinfo
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+  interval: 1m0s
+