From 9c2bae6d79490b4a627e18b5fe5c7c14e2ffe958 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Tue, 21 Feb 2023 12:41:26 +0800
Subject: [PATCH] Revert "fix(flux): fixed HelmRepository patching"

This reverts commit d2458fa7832d41f215682636ad2e16e6dd28c393.
---
 .../Biohazard/2-config/2-flux-repo.yaml       | 26 -------------------
 .../Biohazard/2-config/5-deploy.yaml          | 11 +++++++-
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/kube/1-clusters/Biohazard/2-config/2-flux-repo.yaml b/kube/1-clusters/Biohazard/2-config/2-flux-repo.yaml
index cad55825..be1bf1e7 100644
--- a/kube/1-clusters/Biohazard/2-config/2-flux-repo.yaml
+++ b/kube/1-clusters/Biohazard/2-config/2-flux-repo.yaml
@@ -153,29 +153,3 @@ spec:
         version: v1beta2
         kind: Kustomization
         labelSelector: wait.flux.home.arpa/disabled=true
-    - patch: |-
-        apiVersion: source.toolkit.fluxcd.io/v1beta2
-        kind: HelmRepository
-        metadata:
-          name: not-used
-        spec:
-          interval: 1h
-          timeout: 3m
-      target:
-        group: source.toolkit.fluxcd.io
-        version: v1beta2
-        kind: HelmRepository
-        labelSelector: helmrepo.flux.home.arpa/default notin (false)
-    - patch: |-
-        apiVersion: source.toolkit.fluxcd.io/v1beta1
-        kind: HelmRepository
-        metadata:
-          name: not-used
-        spec:
-          interval: 1h
-          timeout: 3m
-      target:
-        group: source.toolkit.fluxcd.io
-        version: v1beta1
-        kind: HelmRepository
-        labelSelector: helmrepo.flux.home.arpa/default notin (false)
diff --git a/kube/1-clusters/Biohazard/2-config/5-deploy.yaml b/kube/1-clusters/Biohazard/2-config/5-deploy.yaml
index 89d562c6..f7eae229 100644
--- a/kube/1-clusters/Biohazard/2-config/5-deploy.yaml
+++ b/kube/1-clusters/Biohazard/2-config/5-deploy.yaml
@@ -1,11 +1,13 @@
 ---
 # core components first
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: cilium-charts
   namespace: flux-system
 spec:
+  interval: 10m0s
+  timeout: 3m0s
   url: https://helm.cilium.io/
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
@@ -25,6 +27,8 @@ metadata:
   name: rook-ceph-charts
   namespace: flux-system
 spec:
+  interval: 10m0s
+  timeout: 3m0s
   url: https://charts.rook.io/release
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
@@ -62,6 +66,7 @@ metadata:
   name: jetstack
   namespace: flux-system
 spec:
+  interval: 1h
   url: https://charts.jetstack.io/
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
@@ -89,6 +94,7 @@ metadata:
   name: k8s-gateway
   namespace: flux-system
 spec:
+  interval: 1h
   url: https://ori-edge.github.io/k8s_gateway/
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
@@ -106,6 +112,7 @@ metadata:
   name: ingress-nginx
   namespace: flux-system
 spec:
+  interval: 1h
   url: https://kubernetes.github.io/ingress-nginx
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
@@ -126,6 +133,8 @@ metadata:
   name: bjw-s
   namespace: flux-system
 spec:
+  interval: 1h
+  timeout: 3m0s
   url: https://bjw-s.github.io/helm-charts/
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2