From 3f0c283a868f01d942fd44347cbd99b3278e321c Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 31 Mar 2023 14:05:01 +0200 Subject: [PATCH 1/3] config/samples: update API versions and file names Signed-off-by: Hidde Beydals --- ..._v1beta1_gitrepository.yaml => source_v1_gitrepository.yaml} | 2 +- ...1_helmrepository.yaml => source_v1beta2_helmrepository.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename config/samples/{source_v1beta1_gitrepository.yaml => source_v1_gitrepository.yaml} (75%) rename config/samples/{source_v1beta1_helmrepository.yaml => source_v1beta2_helmrepository.yaml} (100%) diff --git a/config/samples/source_v1beta1_gitrepository.yaml b/config/samples/source_v1_gitrepository.yaml similarity index 75% rename from config/samples/source_v1beta1_gitrepository.yaml rename to config/samples/source_v1_gitrepository.yaml index 6ee7b9470..4593ab840 100644 --- a/config/samples/source_v1beta1_gitrepository.yaml +++ b/config/samples/source_v1_gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: name: podinfo diff --git a/config/samples/source_v1beta1_helmrepository.yaml b/config/samples/source_v1beta2_helmrepository.yaml similarity index 100% rename from config/samples/source_v1beta1_helmrepository.yaml rename to config/samples/source_v1beta2_helmrepository.yaml From 799c542390270642cc0041309d268b417186e90a Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 31 Mar 2023 14:06:27 +0200 Subject: [PATCH 2/3] config/testdata: update Source API versions Signed-off-by: Hidde Beydals --- .../charts/crds/bootstrap/templates/git-repository.yaml | 2 +- config/testdata/delete-ns/test.yaml | 2 +- config/testdata/impersonation/test.yaml | 2 +- config/testdata/sources/gitrepository.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/testdata/charts/crds/bootstrap/templates/git-repository.yaml b/config/testdata/charts/crds/bootstrap/templates/git-repository.yaml index 266b71ed2..8a82764fd 100644 --- a/config/testdata/charts/crds/bootstrap/templates/git-repository.yaml +++ b/config/testdata/charts/crds/bootstrap/templates/git-repository.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: name: this diff --git a/config/testdata/delete-ns/test.yaml b/config/testdata/delete-ns/test.yaml index 1e5783705..0b9260b16 100644 --- a/config/testdata/delete-ns/test.yaml +++ b/config/testdata/delete-ns/test.yaml @@ -42,7 +42,7 @@ subjects: name: gotk-reconciler namespace: delete-ns --- -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: name: podinfo diff --git a/config/testdata/impersonation/test.yaml b/config/testdata/impersonation/test.yaml index ffe7c49f2..a7c5e115a 100644 --- a/config/testdata/impersonation/test.yaml +++ b/config/testdata/impersonation/test.yaml @@ -42,7 +42,7 @@ subjects: name: gotk-reconciler namespace: impersonation --- -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: name: podinfo diff --git a/config/testdata/sources/gitrepository.yaml b/config/testdata/sources/gitrepository.yaml index 6ee7b9470..4593ab840 100644 --- a/config/testdata/sources/gitrepository.yaml +++ b/config/testdata/sources/gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: name: podinfo From 2f7c18653a362f2aee496f55375c99ef6e90a3aa Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 31 Mar 2023 14:15:58 +0200 Subject: [PATCH 3/3] config/*: update podinfo to 6.x.x Signed-off-by: Hidde Beydals --- config/samples/helm_v2beta1_helmrelease_helmrepository.yaml | 2 +- config/testdata/delete-ns/test.yaml | 2 +- config/testdata/dependencies/helmrelease-backend.yaml | 2 +- config/testdata/dependencies/helmrelease-frontend.yaml | 2 +- config/testdata/impersonation/test.yaml | 4 ++-- config/testdata/install-create-target-ns/helmrelease.yaml | 2 +- config/testdata/install-fail-remediate/helmrelease.yaml | 2 +- config/testdata/install-fail-retry/helmrelease.yaml | 2 +- config/testdata/install-fail/helmrelease.yaml | 2 +- config/testdata/install-test-fail-ignore/helmrelease.yaml | 2 +- config/testdata/install-test-fail/helmrelease.yaml | 2 +- config/testdata/podinfo/helmrelease.yaml | 2 +- config/testdata/post-renderer-kustomize/helmrelease.yaml | 2 +- config/testdata/status-defaults/helmrelease.yaml | 2 +- config/testdata/targetnamespace/helmrelease.yaml | 2 +- config/testdata/upgrade-fail-remediate-uninstall/install.yaml | 2 +- config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml | 2 +- config/testdata/upgrade-fail-remediate/install.yaml | 2 +- config/testdata/upgrade-fail-remediate/upgrade.yaml | 2 +- config/testdata/upgrade-fail-retry/install.yaml | 2 +- config/testdata/upgrade-fail-retry/upgrade.yaml | 2 +- config/testdata/upgrade-fail/install.yaml | 2 +- config/testdata/upgrade-fail/upgrade.yaml | 2 +- config/testdata/upgrade-test-fail/install.yaml | 2 +- config/testdata/upgrade-test-fail/upgrade.yaml | 2 +- config/testdata/valuesfrom/helmrelease.yaml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config/samples/helm_v2beta1_helmrelease_helmrepository.yaml b/config/samples/helm_v2beta1_helmrelease_helmrepository.yaml index 80df4f9c4..7a52c3a36 100644 --- a/config/samples/helm_v2beta1_helmrelease_helmrepository.yaml +++ b/config/samples/helm_v2beta1_helmrelease_helmrepository.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/delete-ns/test.yaml b/config/testdata/delete-ns/test.yaml index 0b9260b16..f2bc4a082 100644 --- a/config/testdata/delete-ns/test.yaml +++ b/config/testdata/delete-ns/test.yaml @@ -62,7 +62,7 @@ spec: chart: spec: chart: podinfo - version: 5.0.3 + version: 6.3.5 sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/dependencies/helmrelease-backend.yaml b/config/testdata/dependencies/helmrelease-backend.yaml index f167cfae6..abbad7c6c 100644 --- a/config/testdata/dependencies/helmrelease-backend.yaml +++ b/config/testdata/dependencies/helmrelease-backend.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/dependencies/helmrelease-frontend.yaml b/config/testdata/dependencies/helmrelease-frontend.yaml index 797b83cdc..5756725b4 100644 --- a/config/testdata/dependencies/helmrelease-frontend.yaml +++ b/config/testdata/dependencies/helmrelease-frontend.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/impersonation/test.yaml b/config/testdata/impersonation/test.yaml index a7c5e115a..e60c74a81 100644 --- a/config/testdata/impersonation/test.yaml +++ b/config/testdata/impersonation/test.yaml @@ -62,7 +62,7 @@ spec: chart: spec: chart: podinfo - version: 5.0.3 + version: 6.3.5 sourceRef: kind: HelmRepository name: podinfo @@ -78,7 +78,7 @@ spec: chart: spec: chart: podinfo - version: 5.0.3 + version: 6.3.5 sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-create-target-ns/helmrelease.yaml b/config/testdata/install-create-target-ns/helmrelease.yaml index d194a1381..69b3b8c10 100644 --- a/config/testdata/install-create-target-ns/helmrelease.yaml +++ b/config/testdata/install-create-target-ns/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-fail-remediate/helmrelease.yaml b/config/testdata/install-fail-remediate/helmrelease.yaml index 0b0a977c4..94733cee9 100644 --- a/config/testdata/install-fail-remediate/helmrelease.yaml +++ b/config/testdata/install-fail-remediate/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-fail-retry/helmrelease.yaml b/config/testdata/install-fail-retry/helmrelease.yaml index b173aa88a..72ad3adcb 100644 --- a/config/testdata/install-fail-retry/helmrelease.yaml +++ b/config/testdata/install-fail-retry/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-fail/helmrelease.yaml b/config/testdata/install-fail/helmrelease.yaml index a7329bda3..7cd37fc71 100644 --- a/config/testdata/install-fail/helmrelease.yaml +++ b/config/testdata/install-fail/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-test-fail-ignore/helmrelease.yaml b/config/testdata/install-test-fail-ignore/helmrelease.yaml index dcd3f441d..d4d050f89 100644 --- a/config/testdata/install-test-fail-ignore/helmrelease.yaml +++ b/config/testdata/install-test-fail-ignore/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/install-test-fail/helmrelease.yaml b/config/testdata/install-test-fail/helmrelease.yaml index 3ceb16793..39ea4d260 100644 --- a/config/testdata/install-test-fail/helmrelease.yaml +++ b/config/testdata/install-test-fail/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/podinfo/helmrelease.yaml b/config/testdata/podinfo/helmrelease.yaml index 6f9635ad0..3c6c7b4b1 100644 --- a/config/testdata/podinfo/helmrelease.yaml +++ b/config/testdata/podinfo/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/post-renderer-kustomize/helmrelease.yaml b/config/testdata/post-renderer-kustomize/helmrelease.yaml index 7eee06c70..6f33528ba 100644 --- a/config/testdata/post-renderer-kustomize/helmrelease.yaml +++ b/config/testdata/post-renderer-kustomize/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/status-defaults/helmrelease.yaml b/config/testdata/status-defaults/helmrelease.yaml index 5bb2eae26..32d753ff7 100644 --- a/config/testdata/status-defaults/helmrelease.yaml +++ b/config/testdata/status-defaults/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/targetnamespace/helmrelease.yaml b/config/testdata/targetnamespace/helmrelease.yaml index 2cb5e261c..abe5e5747 100644 --- a/config/testdata/targetnamespace/helmrelease.yaml +++ b/config/testdata/targetnamespace/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-remediate-uninstall/install.yaml b/config/testdata/upgrade-fail-remediate-uninstall/install.yaml index a734685a0..7871e8ac9 100644 --- a/config/testdata/upgrade-fail-remediate-uninstall/install.yaml +++ b/config/testdata/upgrade-fail-remediate-uninstall/install.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml b/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml index 996dbcab6..92e372f31 100644 --- a/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml +++ b/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-remediate/install.yaml b/config/testdata/upgrade-fail-remediate/install.yaml index f957c4c75..a6b4e92a8 100644 --- a/config/testdata/upgrade-fail-remediate/install.yaml +++ b/config/testdata/upgrade-fail-remediate/install.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-remediate/upgrade.yaml b/config/testdata/upgrade-fail-remediate/upgrade.yaml index b96dfd471..a2def1fac 100644 --- a/config/testdata/upgrade-fail-remediate/upgrade.yaml +++ b/config/testdata/upgrade-fail-remediate/upgrade.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-retry/install.yaml b/config/testdata/upgrade-fail-retry/install.yaml index 709ac6630..63cad76ee 100644 --- a/config/testdata/upgrade-fail-retry/install.yaml +++ b/config/testdata/upgrade-fail-retry/install.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail-retry/upgrade.yaml b/config/testdata/upgrade-fail-retry/upgrade.yaml index ec3a45e81..32ced3592 100644 --- a/config/testdata/upgrade-fail-retry/upgrade.yaml +++ b/config/testdata/upgrade-fail-retry/upgrade.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail/install.yaml b/config/testdata/upgrade-fail/install.yaml index c116f375c..39a5414f2 100644 --- a/config/testdata/upgrade-fail/install.yaml +++ b/config/testdata/upgrade-fail/install.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-fail/upgrade.yaml b/config/testdata/upgrade-fail/upgrade.yaml index 0c5b30b7a..edcc45f0e 100644 --- a/config/testdata/upgrade-fail/upgrade.yaml +++ b/config/testdata/upgrade-fail/upgrade.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-test-fail/install.yaml b/config/testdata/upgrade-test-fail/install.yaml index a1af5d87f..78cbe3984 100644 --- a/config/testdata/upgrade-test-fail/install.yaml +++ b/config/testdata/upgrade-test-fail/install.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/upgrade-test-fail/upgrade.yaml b/config/testdata/upgrade-test-fail/upgrade.yaml index ca8a80930..defdcde49 100644 --- a/config/testdata/upgrade-test-fail/upgrade.yaml +++ b/config/testdata/upgrade-test-fail/upgrade.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo diff --git a/config/testdata/valuesfrom/helmrelease.yaml b/config/testdata/valuesfrom/helmrelease.yaml index ed3a783bb..76937bfda 100644 --- a/config/testdata/valuesfrom/helmrelease.yaml +++ b/config/testdata/valuesfrom/helmrelease.yaml @@ -7,7 +7,7 @@ spec: chart: spec: chart: podinfo - version: '>=4.0.0 <5.0.0' + version: '>=6.0.0 <7.0.0' sourceRef: kind: HelmRepository name: podinfo