[v2.9] support helm release v2beta2 only

Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
flux-subsystem-argo · Feb 16, 2024 · 402c9e4 · 402c9e4
1 parent 5d09a14
commit 402c9e4
Show file tree

Hide file tree

Showing 8 changed files with 503 additions and 9 deletions.
diff --git a/.github/workflows/build_v29.yaml b/.github/workflows/build_v29.yaml
@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - patches-argo-cd-v2.9/**
-      - patches-gitops-engine-v2.0.0/**
+      - patches-gitops-engine-v2.2.0/**
       - VERSION_29
       - .github/workflows/build_v29.yaml
 
@@ -46,7 +46,7 @@ jobs:
         run: |
           ln -s VERSION_29 VERSION
           ln -s patches-argo-cd-v2.9 patches-argo-cd
-          ln -s patches-gitops-engine-v2.0.0 patches-gitops-engine
+          ln -s patches-gitops-engine-v2.2.0 patches-gitops-engine
           rm -rf argo-cd || true
           bash -x ./init.sh
           source ./VERSION

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: init-v29
 init-v29:
 	ln -s VERSION_29 VERSION
-	ln -s patches-gitops-engine-v2.0.0 patches-gitops-engine
+	ln -s patches-gitops-engine-v2.2.0 patches-gitops-engine
 	ln -s patches-argo-cd-v2.9 patches-argo-cd
 	make init
 

diff --git a/patches-argo-cd-v2.9/02-implement-loopback.patch b/patches-argo-cd-v2.9/02-implement-loopback.patch
@@ -87,7 +87,7 @@ index 000000000..f795c6a75
 +	var hl *unstructured.Unstructured
 +	hl, err = m.kubectl.GetResource(context.TODO(), config, schema.GroupVersionKind{
 +		Group:   "helm.toolkit.fluxcd.io",
-+		Version: "v2beta1",
++		Version: "v2beta2",
 +		Kind:    "HelmRelease",
 +	}, app.Name, app.Spec.Destination.Namespace)
 +	if err != nil {

diff --git a/patches-argo-cd-v2.9/09-auto-create-flux-resources.patch b/patches-argo-cd-v2.9/09-auto-create-flux-resources.patch
@@ -81,7 +81,7 @@ index f795c6a75..54bb28e4f 100644
 +	)
  	hl, err = m.kubectl.GetResource(context.TODO(), config, schema.GroupVersionKind{
  		Group:   "helm.toolkit.fluxcd.io",
- 		Version: "v2beta1",
+ 		Version: "v2beta2",
  		Kind:    "HelmRelease",
  	}, app.Name, app.Spec.Destination.Namespace)
 +
@@ -317,7 +317,7 @@ index 000000000..7041569a2
 +
 +	release := map[string]interface{}{}
 +	releaseTemplate := []byte(`
-+apiVersion: helm.toolkit.fluxcd.io/v2beta1
++apiVersion: helm.toolkit.fluxcd.io/v2beta2
 +kind: HelmRelease
 +metadata:
 +  name: undefined

diff --git a/patches-argo-cd-v2.9/11-support-helm-oci-and.patch b/patches-argo-cd-v2.9/11-support-helm-oci-and.patch
@@ -78,7 +78,7 @@ index 7041569a2..65ccf8782 100644
 +
  	release := map[string]interface{}{}
  	releaseTemplate := []byte(`
- apiVersion: helm.toolkit.fluxcd.io/v2beta1
+ apiVersion: helm.toolkit.fluxcd.io/v2beta2
 @@ -125,9 +134,17 @@ spec:
  }
 

diff --git a/patches-argo-cd-v2.9/13-upgrade-to-flux-v2.0.0-rc.1.patch b/patches-argo-cd-v2.9/13-upgrade-to-flux-v2.0.0-rc.1.patch
@@ -36,7 +36,7 @@ index 18f41430d..28cd571cc 100644
 +	},
 +	HelmRelease: {
 +		Group:   "helm.toolkit.fluxcd.io",
-+		Version: "v2beta1",
++		Version: "v2beta2",
 +		Kind:    "HelmRelease",
 +	},
 +	HelmRepository: {
@@ -70,7 +70,7 @@ index 18f41430d..28cd571cc 100644
  	)
 -	hl, err = m.kubectl.GetResource(context.TODO(), config, schema.GroupVersionKind{
 -		Group:   "helm.toolkit.fluxcd.io",
--		Version: "v2beta1",
+-		Version: "v2beta2",
 -		Kind:    "HelmRelease",
 -	}, app.Name, app.Spec.Destination.Namespace)
 +	hl, err = m.kubectl.GetResource(context.TODO(), config, supportedKinds[HelmRelease], app.Name, app.Spec.Destination.Namespace)