Merge pull request #104 from fluxcd/flux-v2.2

Update `HelmRelease` API to v2beta2
fluxcd · Dec 12, 2023 · 6f646a8 · 6f646a8
2 parents 0ad4dfb + f249b51
commit 6f646a8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -21,7 +21,7 @@
 
 # Prerequisites
 # - yq v4.34
-# - kustomize v5.0
+# - kustomize v5.3
 # - kubeconform v0.6
 
 set -o errexit