From 96506e7ee8bfab6a48c84fa89406aba64f08a924 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 7 Feb 2024 13:02:20 +0100 Subject: [PATCH] Fix kustomization versions Because k8s and fluxcd have differing versions --- apps/code-kustomization.yaml | 2 +- apps/code/gitea-kustomization.yaml | 2 +- apps/code/gitea/kustomization.yaml | 2 +- apps/do/do-test/kustomization.yaml | 2 +- apps/do/vikunja-kustomization.yaml | 2 +- apps/do/vikunja-test-kustomization.yaml | 2 +- apps/do/vikunja/kustomization.yaml | 2 +- apps/forge-kustomization.yaml | 2 +- apps/forge/forgejo-kustomization.yaml | 2 +- apps/generate-kustomizations.sh | 2 +- apps/kustomization.yaml | 2 +- apps/ninja-kustomization.yaml | 2 +- apps/ninja/invoiceninja-kustomization.yaml | 2 +- apps/ninja/invoiceninja-secrets-kustomization.yaml | 2 +- apps/ninja/invoiceninja-secrets/kustomization.yaml | 2 +- apps/ninja/invoiceninja/kustomization.yaml | 2 +- apps/people/suitecrm/kustomization.yaml | 2 +- apps/support/zammad-kustomization.yaml | 2 +- infrastructure/kustomizations/apps-kustomization.yaml | 2 +- infrastructure/kustomizations/namespace-kustomization.yaml | 2 +- infrastructure/kustomizations/overrides-kustomization.yaml | 2 +- infrastructure/kustomizations/sources-kustomization.yaml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/code-kustomization.yaml b/apps/code-kustomization.yaml index bd6071b..e96ed21 100644 --- a/apps/code-kustomization.yaml +++ b/apps/code-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-apps diff --git a/apps/code/gitea-kustomization.yaml b/apps/code/gitea-kustomization.yaml index d927d82..12ceb54 100644 --- a/apps/code/gitea-kustomization.yaml +++ b/apps/code/gitea-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: gitea diff --git a/apps/code/gitea/kustomization.yaml b/apps/code/gitea/kustomization.yaml index b2fbee5..364152c 100644 --- a/apps/code/gitea/kustomization.yaml +++ b/apps/code/gitea/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - gitea-release.yaml diff --git a/apps/do/do-test/kustomization.yaml b/apps/do/do-test/kustomization.yaml index e149331..54362b7 100644 --- a/apps/do/do-test/kustomization.yaml +++ b/apps/do/do-test/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - vikunja-oauth-client.yaml diff --git a/apps/do/vikunja-kustomization.yaml b/apps/do/vikunja-kustomization.yaml index 2c0a2f1..332d5bc 100644 --- a/apps/do/vikunja-kustomization.yaml +++ b/apps/do/vikunja-kustomization.yaml @@ -1,5 +1,5 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: vikunja diff --git a/apps/do/vikunja-test-kustomization.yaml b/apps/do/vikunja-test-kustomization.yaml index c3290ed..aafb037 100644 --- a/apps/do/vikunja-test-kustomization.yaml +++ b/apps/do/vikunja-test-kustomization.yaml @@ -1,5 +1,5 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: vikunja-test diff --git a/apps/do/vikunja/kustomization.yaml b/apps/do/vikunja/kustomization.yaml index dd476a0..ad6bfb6 100644 --- a/apps/do/vikunja/kustomization.yaml +++ b/apps/do/vikunja/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - vikunja-oauth-client.yaml diff --git a/apps/forge-kustomization.yaml b/apps/forge-kustomization.yaml index 89efa17..8f0cbba 100644 --- a/apps/forge-kustomization.yaml +++ b/apps/forge-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-apps diff --git a/apps/forge/forgejo-kustomization.yaml b/apps/forge/forgejo-kustomization.yaml index e056188..f77286c 100644 --- a/apps/forge/forgejo-kustomization.yaml +++ b/apps/forge/forgejo-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: forgejo diff --git a/apps/generate-kustomizations.sh b/apps/generate-kustomizations.sh index 1d4f2cc..7a5ce1a 100755 --- a/apps/generate-kustomizations.sh +++ b/apps/generate-kustomizations.sh @@ -2,7 +2,7 @@ # Generates kubernetes kustomizations if test $# -gt 0 then dir=$1 - { echo 'apiVersion: kustomize.config.k8s.io/v1beta2 + { echo 'apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources:' find $dir -maxdepth 1 -type f -name "*.yaml" -not -name "kustomization.yaml" -printf " - %f\n"; } | tee $dir/kustomization.yaml diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml index 1f184f5..78839fa 100644 --- a/apps/kustomization.yaml +++ b/apps/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - ninja-kustomization.yaml diff --git a/apps/ninja-kustomization.yaml b/apps/ninja-kustomization.yaml index c7313fa..be0c331 100644 --- a/apps/ninja-kustomization.yaml +++ b/apps/ninja-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: add-ninja diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml index 150c55d..afd3cfb 100644 --- a/apps/ninja/invoiceninja-kustomization.yaml +++ b/apps/ninja/invoiceninja-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: invoiceninja diff --git a/apps/ninja/invoiceninja-secrets-kustomization.yaml b/apps/ninja/invoiceninja-secrets-kustomization.yaml index 6dd9925..93ba264 100644 --- a/apps/ninja/invoiceninja-secrets-kustomization.yaml +++ b/apps/ninja/invoiceninja-secrets-kustomization.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: invoiceninja-secrets diff --git a/apps/ninja/invoiceninja-secrets/kustomization.yaml b/apps/ninja/invoiceninja-secrets/kustomization.yaml index 75e8b1e..1fe405c 100644 --- a/apps/ninja/invoiceninja-secrets/kustomization.yaml +++ b/apps/ninja/invoiceninja-secrets/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - invoiceninja-variables.yaml diff --git a/apps/ninja/invoiceninja/kustomization.yaml b/apps/ninja/invoiceninja/kustomization.yaml index 166da55..bd82a01 100644 --- a/apps/ninja/invoiceninja/kustomization.yaml +++ b/apps/ninja/invoiceninja/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - invoiceninja-mariadb-pvc.yaml diff --git a/apps/people/suitecrm/kustomization.yaml b/apps/people/suitecrm/kustomization.yaml index cb44b7b..8e552e3 100644 --- a/apps/people/suitecrm/kustomization.yaml +++ b/apps/people/suitecrm/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta2 +apiVersion: kustomize.config.k8s.io/v1 kind: Kustomization resources: - suitecrm-values-configmap.yaml diff --git a/apps/support/zammad-kustomization.yaml b/apps/support/zammad-kustomization.yaml index 3afbd0d..ebc080a 100644 --- a/apps/support/zammad-kustomization.yaml +++ b/apps/support/zammad-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: zammad diff --git a/infrastructure/kustomizations/apps-kustomization.yaml b/infrastructure/kustomizations/apps-kustomization.yaml index dab420d..51f5e91 100644 --- a/infrastructure/kustomizations/apps-kustomization.yaml +++ b/infrastructure/kustomizations/apps-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-apps diff --git a/infrastructure/kustomizations/namespace-kustomization.yaml b/infrastructure/kustomizations/namespace-kustomization.yaml index 02a4676..7eaca88 100644 --- a/infrastructure/kustomizations/namespace-kustomization.yaml +++ b/infrastructure/kustomizations/namespace-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-namespace diff --git a/infrastructure/kustomizations/overrides-kustomization.yaml b/infrastructure/kustomizations/overrides-kustomization.yaml index d2ef769..378f1ef 100644 --- a/infrastructure/kustomizations/overrides-kustomization.yaml +++ b/infrastructure/kustomizations/overrides-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-overrides diff --git a/infrastructure/kustomizations/sources-kustomization.yaml b/infrastructure/kustomizations/sources-kustomization.yaml index c6d276b..7dd0376 100644 --- a/infrastructure/kustomizations/sources-kustomization.yaml +++ b/infrastructure/kustomizations/sources-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: name: stackspout-sources