From f249b51764812d3659500530e13db8daa997fa29 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 12 Dec 2023 18:20:34 +0200
Subject: [PATCH] Update `HelmRelease` API to v2beta2

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 README.md                                     | 10 +++++-----
 apps/base/podinfo/release.yaml                |  2 +-
 apps/production/podinfo-values.yaml           |  2 +-
 apps/staging/podinfo-values.yaml              |  2 +-
 infrastructure/controllers/cert-manager.yaml  |  2 +-
 infrastructure/controllers/ingress-nginx.yaml |  2 +-
 infrastructure/controllers/weave-gitops.yaml  |  2 +-
 scripts/validate.sh                           |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b222dbd35..ffc637724 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ The apps configuration is structured into:
 In **apps/base/podinfo/** dir we have a Flux `HelmRelease` with common values for both clusters:
 
 ```yaml
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
@@ -111,7 +111,7 @@ spec:
 In **apps/staging/** dir we have a Kustomize patch with the staging specific values:
 
 ```yaml
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
@@ -133,7 +133,7 @@ the `HelmRelease` to the latest chart version including alpha, beta and pre-rele
 In **apps/production/** dir we have a Kustomize patch with the production specific values:
 
 ```yaml
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
@@ -174,7 +174,7 @@ The infrastructure is structured into:
 In **infrastructure/controllers/** dir we have the Flux `HelmRepository` and `HelmRelease` definitions such as:
 
 ```yaml
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: cert-manager
@@ -376,7 +376,7 @@ they can easily discover the relationship between Flux objects and navigate to d
 You can change the admin password bcrypt hash in **infrastructure/controllers/weave-gitops.yaml**:
 
 ```yaml
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: weave-gitops
diff --git a/apps/base/podinfo/release.yaml b/apps/base/podinfo/release.yaml
index 487147754..9decfd1d8 100644
--- a/apps/base/podinfo/release.yaml
+++ b/apps/base/podinfo/release.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
diff --git a/apps/production/podinfo-values.yaml b/apps/production/podinfo-values.yaml
index aa13f8bef..98a230d5c 100644
--- a/apps/production/podinfo-values.yaml
+++ b/apps/production/podinfo-values.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
diff --git a/apps/staging/podinfo-values.yaml b/apps/staging/podinfo-values.yaml
index 784aa09c6..eb3f9af30 100644
--- a/apps/staging/podinfo-values.yaml
+++ b/apps/staging/podinfo-values.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: podinfo
diff --git a/infrastructure/controllers/cert-manager.yaml b/infrastructure/controllers/cert-manager.yaml
index c18718737..8b26a3234 100644
--- a/infrastructure/controllers/cert-manager.yaml
+++ b/infrastructure/controllers/cert-manager.yaml
@@ -15,7 +15,7 @@ spec:
   interval: 24h
   url: https://charts.jetstack.io
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: cert-manager
diff --git a/infrastructure/controllers/ingress-nginx.yaml b/infrastructure/controllers/ingress-nginx.yaml
index 4b45d48ca..5ab5a606f 100644
--- a/infrastructure/controllers/ingress-nginx.yaml
+++ b/infrastructure/controllers/ingress-nginx.yaml
@@ -15,7 +15,7 @@ spec:
   interval: 24h
   url: https://kubernetes.github.io/ingress-nginx
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: ingress-nginx
diff --git a/infrastructure/controllers/weave-gitops.yaml b/infrastructure/controllers/weave-gitops.yaml
index 7657872ce..d6b210df0 100644
--- a/infrastructure/controllers/weave-gitops.yaml
+++ b/infrastructure/controllers/weave-gitops.yaml
@@ -9,7 +9,7 @@ spec:
   interval: 60m0s
   url: oci://ghcr.io/weaveworks/charts
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: weave-gitops
diff --git a/scripts/validate.sh b/scripts/validate.sh
index 7e2168509..4a07b716a 100755
--- a/scripts/validate.sh
+++ b/scripts/validate.sh
@@ -21,7 +21,7 @@
 
 # Prerequisites
 # - yq v4.34
-# - kustomize v5.0
+# - kustomize v5.3
 # - kubeconform v0.6
 
 set -o errexit