e2e: update podinfo to version with newer APIs

Signed-off-by: Hidde Beydals <hidde@hhh.computer>

.github/workflows/e2e.yaml

@@ -81,12 +81,12 @@ jobs:
         run: |
           /tmp/flux create source git podinfo \
             --url https://github.com/stefanprodan/podinfo  \
-            --tag-semver=">=3.2.3"
+            --tag-semver=">=6.3.5"
       - name: flux create source git export apply
         run: |
           /tmp/flux create source git podinfo-export \
             --url https://github.com/stefanprodan/podinfo  \
-            --tag-semver=">=3.2.3" \
+            --tag-semver=">=6.3.5" \
             --export | kubectl apply -f -
           /tmp/flux delete source git podinfo-export --silent
       - name: flux get sources git
@@ -143,7 +143,7 @@ jobs:
             --target-namespace=default \
             --source=HelmRepository/podinfo.flux-system \
             --chart=podinfo \
-            --chart-version=">4.0.0 <5.0.0"
+            --chart-version=">6.0.0 <7.0.0"
       - name: flux create helmrelease --source=GitRepository/podinfo
         run: |
           /tmp/flux create hr podinfo-git \
@@ -187,11 +187,11 @@ jobs:
         run: |
           /tmp/flux create source oci podinfo-oci \
             --url oci://ghcr.io/stefanprodan/manifests/podinfo \
-            --tag-semver 6.1.x \
+            --tag-semver 6.3.x \
             --interval 10m
           /tmp/flux create kustomization podinfo-oci \
             --source=OCIRepository/podinfo-oci \
-            --path="./kustomize" \
+            --path="./" \
             --prune=true \
             --interval=5m \
             --target-namespace=default \
@@ -212,7 +212,7 @@ jobs:
           /tmp/flux -n apps create hr podinfo-helm \
             --source=HelmRepository/podinfo \
             --chart=podinfo \
-            --chart-version="5.0.x" \
+            --chart-version="6.3.x" \
             --service-account=dev-team
       - name: flux2-kustomize-helm-example
         run: |

cmd/flux/create_source_oci_test.go

@@ -38,12 +38,12 @@ func TestCreateSourceOCI(t *testing.T) {
 		},
 		{
 			name:       "export manifest",
-			args:       "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m --export",
+			args:       "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m --export",
 			assertFunc: assertGoldenFile("./testdata/oci/export.golden"),
 		},
 		{
 			name:       "export manifest with secret",
-			args:       "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m --secret-ref=creds --export",
+			args:       "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m --secret-ref=creds --export",
 			assertFunc: assertGoldenFile("./testdata/oci/export_with_secret.golden"),
 		},
 	}

cmd/flux/helmrelease_test.go

@@ -37,7 +37,7 @@ func TestHelmReleaseFromGit(t *testing.T) {
 		tmpl       map[string]string
 	}{
 		{
-			"create source git thrfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.0.0",
+			"create source git thrfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.3.5",
 			"testdata/helmrelease/create_source_git.golden",
 			nil,
 		},

cmd/flux/kustomization_test.go

@@ -37,7 +37,7 @@ func TestKustomizationFromGit(t *testing.T) {
 		tmpl       map[string]string
 	}{
 		{
-			"create source git tkfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.0.0",
+			"create source git tkfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.3.5",
 			"testdata/kustomization/create_source_git.golden",
 			nil,
 		},

cmd/flux/source_oci_test.go

@@ -39,7 +39,7 @@ func TestSourceOCI(t *testing.T) {
 		tmpl       map[string]string
 	}{
 		{
-			"create source oci thrfg --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m",
+			"create source oci thrfg --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m",
 			"testdata/oci/create_source_oci.golden",
 			nil,
 		},

cmd/flux/testdata/helmrelease/create_helmrelease_from_git.golden

@@ -3,4 +3,4 @@
 ✔ HelmRelease created
 ◎ waiting for HelmRelease reconciliation
 ✔ HelmRelease thrfg is ready
-✔ applied revision 6.0.0
+✔ applied revision 6.3.5

cmd/flux/testdata/helmrelease/create_source_git.golden

@@ -3,4 +3,4 @@
 ✔ GitRepository source created
 ◎ waiting for GitRepository source reconciliation
 ✔ GitRepository source reconciliation completed
-✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision: 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

cmd/flux/testdata/helmrelease/get_helmrelease_from_git.golden

@@ -1,2 +1,2 @@
 NAME 	REVISION	SUSPENDED	READY	MESSAGE                          
-thrfg	6.0.0   	False    	True 	Release reconciliation succeeded	
+thrfg	6.3.5   	False    	True 	Release reconciliation succeeded	

cmd/flux/testdata/helmrelease/reconcile_helmrelease_from_git.golden

@@ -1,8 +1,8 @@
 ► annotating GitRepository thrfg in {{ .ns }} namespace
 ✔ GitRepository annotated
 ◎ waiting for GitRepository reconciliation
-✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9
 ► annotating HelmRelease thrfg in {{ .ns }} namespace
 ✔ HelmRelease annotated
 ◎ waiting for HelmRelease reconciliation
-✔ applied revision 6.0.0
+✔ applied revision 6.3.5

cmd/flux/testdata/helmrelease/resume_helmrelease_from_git.golden

@@ -2,4 +2,4 @@
 ✔ helmrelease resumed
 ◎ waiting for HelmRelease reconciliation
 ✔ HelmRelease reconciliation completed
-✔ applied revision 6.0.0
+✔ applied revision 6.3.5

cmd/flux/testdata/kustomization/create_kustomization_from_git.golden

@@ -3,4 +3,4 @@
 ✔ Kustomization created
 ◎ waiting for Kustomization reconciliation
 ✔ Kustomization tkfg is ready
-✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

cmd/flux/testdata/kustomization/create_source_git.golden

@@ -3,4 +3,4 @@
 ✔ GitRepository source created
 ◎ waiting for GitRepository source reconciliation
 ✔ GitRepository source reconciliation completed
-✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision: 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

cmd/flux/testdata/kustomization/get_kustomization_from_git.golden

@@ -1,2 +1,2 @@
 NAME	REVISION           	SUSPENDED	READY	MESSAGE                               
-tkfg	6.0.0@sha1:627d5c4b	False    	True 	Applied revision: 6.0.0@sha1:627d5c4b	
+tkfg	6.3.5@sha1:67e2c98a	False    	True 	Applied revision: 6.3.5@sha1:67e2c98a	

cmd/flux/testdata/kustomization/reconcile_kustomization_from_git.golden

@@ -1,8 +1,8 @@
 ► annotating GitRepository tkfg in {{ .ns }} namespace
 ✔ GitRepository annotated
 ◎ waiting for GitRepository reconciliation
-✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9
 ► annotating Kustomization tkfg in {{ .ns }} namespace
 ✔ Kustomization annotated
 ◎ waiting for Kustomization reconciliation
-✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

cmd/flux/testdata/kustomization/resume_kustomization_from_git.golden

@@ -2,4 +2,4 @@
 ✔ kustomization resumed
 ◎ waiting for Kustomization reconciliation
 ✔ Kustomization reconciliation completed
-✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

cmd/flux/testdata/oci/create_source_oci.golden

@@ -2,4 +2,4 @@
 ✔ OCIRepository created
 ◎ waiting for OCIRepository reconciliation
 ✔ OCIRepository reconciliation completed
-✔ fetched revision: 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision: 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

cmd/flux/testdata/oci/export.golden

@@ -7,6 +7,6 @@ metadata:
 spec:
   interval: 10m0s
   ref:
-    tag: 6.1.6
+    tag: 6.3.5
   url: oci://ghcr.io/stefanprodan/manifests/podinfo
 

cmd/flux/testdata/oci/export_with_secret.golden

@@ -7,7 +7,7 @@ metadata:
 spec:
   interval: 10m0s
   ref:
-    tag: 6.1.6
+    tag: 6.3.5
   secretRef:
     name: creds
   url: oci://ghcr.io/stefanprodan/manifests/podinfo

cmd/flux/testdata/oci/get_oci.golden

@@ -1,2 +1,2 @@
 NAME 	REVISION             	SUSPENDED	READY	MESSAGE                                            
-thrfg	6.1.6@sha256:dbdb1097	False    	True 	stored artifact for digest '6.1.6@sha256:dbdb1097'	
+thrfg	6.3.5@sha256:6c959c51	False    	True 	stored artifact for digest '6.3.5@sha256:6c959c51'	

cmd/flux/testdata/oci/reconcile_oci.golden

@@ -1,4 +1,4 @@
 ► annotating OCIRepository thrfg in {{ .ns }} namespace
 ✔ OCIRepository annotated
 ◎ waiting for OCIRepository reconciliation
-✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

cmd/flux/testdata/oci/resume_oci.golden

@@ -2,4 +2,4 @@
 ✔ source oci resumed
 ◎ waiting for OCIRepository reconciliation
 ✔ OCIRepository reconciliation completed
-✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

cmd/flux/testdata/trace/deployment.golden

@@ -5,17 +5,17 @@ Status:         Managed by Flux
 ---
 HelmRelease:    podinfo
 Namespace:      {{ .ns }}
-Revision:       6.0.0
+Revision:       6.3.5
 Status:         Last reconciled at {{ .helmReleaseLastReconcile }}
 Message:        Release reconciliation succeeded
 ---
 HelmChart:      podinfo-podinfo
 Namespace:      {{ .fluxns }}
 Chart:          podinfo
-Version:        6.0.0
+Version:        6.3.5
-Revision:       6.0.0
+Revision:       6.3.5
 Status:         Last reconciled at {{ .helmChartLastReconcile }}
-Message:        Fetched revision: 6.0.0
+Message:        Fetched revision: 6.3.5
 ---
 HelmRepository: podinfo
 Namespace:      {{ .fluxns }}

cmd/flux/testdata/trace/deployment.yaml

@@ -59,8 +59,8 @@ status:
     status: "True"
     type: Ready
   helmChart: {{ .fluxns }}/podinfo-podinfo
-  lastAppliedRevision: 6.0.0
+  lastAppliedRevision: 6.3.5
-  lastAttemptedRevision: 6.0.0
+  lastAttemptedRevision: 6.3.5
   lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
@@ -73,18 +73,18 @@ spec:
   sourceRef:
     kind: HelmRepository
     name: podinfo
-  version: 6.0.0
+  version: 6.3.5
   interval: 5m
 status:
   artifact:
     checksum: cf13ba96773d9a879cd052c86e73199b3f96c854
     lastUpdateTime: "2021-08-01T04:42:55Z"
-    revision: 6.0.0
+    revision: 6.3.5
     path: "example"
     url: "example"
   conditions:
   - lastTransitionTime: "2021-07-16T15:32:09Z"
-    message: 'Fetched revision: 6.0.0'
+    message: 'Fetched revision: 6.3.5'
     reason: ChartPullSucceeded
     status: "True"
     type: Ready

cmd/flux/testdata/trace/helmrelease-oci.yaml

@@ -34,8 +34,8 @@ status:
     status: "True"
     type: Ready
   helmChart: {{ .fluxns }}/podinfo-podinfo
-  lastAppliedRevision: 6.0.0
+  lastAppliedRevision: 6.3.5
-  lastAttemptedRevision: 6.0.0
+  lastAttemptedRevision: 6.3.5
   lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2

cmd/flux/testdata/trace/helmrelease.yaml

@@ -34,8 +34,8 @@ status:
     status: "True"
     type: Ready
   helmChart: {{ .fluxns }}/podinfo-podinfo
-  lastAppliedRevision: 6.0.0
+  lastAppliedRevision: 6.3.5
-  lastAttemptedRevision: 6.0.0
+  lastAttemptedRevision: 6.3.5
   lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1