Merge pull request #662 from fluxcd/misc-nit-picks

config/*: update API versions and file names
fluxcd · Mar 31, 2023 · d471d7d · d471d7d
2 parents 336c5c6 + 2f7c186
commit d471d7d
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 32 deletions.
diff --git 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/...samples/source_v1beta1_gitrepository.yaml → config/samples/source_v1_gitrepository.yaml b/...samples/source_v1beta1_gitrepository.yaml → 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/...amples/source_v1beta1_helmrepository.yaml → ...amples/source_v1beta2_helmrepository.yaml b/...amples/source_v1beta1_helmrepository.yaml → ...amples/source_v1beta2_helmrepository.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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