From 07975ae9499a776df125b91623c12e31e25fbe8c Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Mon, 10 Jun 2024 13:04:47 +1000
Subject: [PATCH 1/2] correcting podinfo

---
 kubernetes/apps/podinfo/namespace.yaml  |  6 ++++++
 kubernetes/apps/podinfo/podinfo.yaml    | 13 +-----------
 kubernetes/apps/podinfo/release.yaml    | 27 +++++++++++++++++++++++++
 kubernetes/apps/podinfo/repository.yaml |  8 ++++++++
 4 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 kubernetes/apps/podinfo/namespace.yaml
 create mode 100644 kubernetes/apps/podinfo/release.yaml
 create mode 100644 kubernetes/apps/podinfo/repository.yaml

diff --git a/kubernetes/apps/podinfo/namespace.yaml b/kubernetes/apps/podinfo/namespace.yaml
new file mode 100644
index 0000000..d7f8518
--- /dev/null
+++ b/kubernetes/apps/podinfo/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: podinfo
+  labels:
+    toolkit.fluxcd.io/tenant: dev-team
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index 04b6eb0..d6547a1 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -1,14 +1,3 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: podinfo
-  namespace: podinfo
-spec:
-  interval: 5m
-  url: https://github.com/stefanprodan/podinfo
-  ref:
-    branch: master
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -22,6 +11,6 @@ spec:
   sourceRef:
     kind: GitRepository
     name: podinfo
-  targetNamespace: default
+  targetNamespace: podinfo
   timeout: 3m0s
   wait: true
diff --git a/kubernetes/apps/podinfo/release.yaml b/kubernetes/apps/podinfo/release.yaml
new file mode 100644
index 0000000..5f2f500
--- /dev/null
+++ b/kubernetes/apps/podinfo/release.yaml
@@ -0,0 +1,27 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  releaseName: podinfo
+  chart:
+    spec:
+      chart: podinfo
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+  interval: 50m
+  install:
+    remediation:
+      retries: 3
+  # Default values
+  # https://github.com/stefanprodan/podinfo/blob/master/charts/podinfo/values.yaml
+  values:
+    redis:
+      enabled: true
+      repository: public.ecr.aws/docker/library/redis
+      tag: 7.0.6
+    ingress:
+      enabled: true
+      className: nginx
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/repository.yaml b/kubernetes/apps/podinfo/repository.yaml
new file mode 100644
index 0000000..b3b0730
--- /dev/null
+++ b/kubernetes/apps/podinfo/repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  interval: 5m
+  url: https://stefanprodan.github.io/podinfo
\ No newline at end of file

From b3601d4c3a2a96362ecf39b68df3ef866171ae85 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Mon, 10 Jun 2024 13:10:27 +1000
Subject: [PATCH 2/2] fixing infrasturecture

---
 kubernetes/infrastructure/infrasturecture.yaml    | 14 ++++++++++++++
 kubernetes/infrastructure/kustomization.yaml      |  2 +-
 .../infrastructure/repositories/repositories.yaml | 15 ---------------
 3 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 kubernetes/infrastructure/infrasturecture.yaml

diff --git a/kubernetes/infrastructure/infrasturecture.yaml b/kubernetes/infrastructure/infrasturecture.yaml
new file mode 100644
index 0000000..7bd7512
--- /dev/null
+++ b/kubernetes/infrastructure/infrasturecture.yaml
@@ -0,0 +1,14 @@
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: home-cluster-ops-repo
+  namespace: flux-system
+spec:
+  interval: 5m
+  path: ./kubernetes/infrastructure/repositories
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: home-cluster-ops
\ No newline at end of file
diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index d47da2f..76efe62 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./repositories
+  - ./infrasturecture.yaml
diff --git a/kubernetes/infrastructure/repositories/repositories.yaml b/kubernetes/infrastructure/repositories/repositories.yaml
index 37db8a5..87a51fa 100644
--- a/kubernetes/infrastructure/repositories/repositories.yaml
+++ b/kubernetes/infrastructure/repositories/repositories.yaml
@@ -12,18 +12,3 @@ spec:
     name: flux-system
   timeout: 60s
   url: https://github.com/3dwardch3ng/home-cluster-ops.git
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: home-cluster-ops-repo
-  namespace: flux-system
-spec:
-  interval: 5m
-  path: ./kubernetes/infrastructure/repositories
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: home-cluster-ops
\ No newline at end of file