diff --git a/apps/code-kustomization.yaml b/apps/code-kustomization.yaml index 62419a3..bd6071b 100644 --- a/apps/code-kustomization.yaml +++ b/apps/code-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-apps diff --git a/apps/code/gitea-kustomization.yaml b/apps/code/gitea-kustomization.yaml index 12ceb54..d927d82 100644 --- a/apps/code/gitea-kustomization.yaml +++ b/apps/code/gitea-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: gitea diff --git a/apps/code/gitea/kustomization.yaml b/apps/code/gitea/kustomization.yaml index 938a8c1..364152c 100644 --- a/apps/code/gitea/kustomization.yaml +++ b/apps/code/gitea/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 +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 4aa48ff..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/v1beta1 +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 332d5bc..2c0a2f1 100644 --- a/apps/do/vikunja-kustomization.yaml +++ b/apps/do/vikunja-kustomization.yaml @@ -1,5 +1,5 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: vikunja diff --git a/apps/do/vikunja-test-kustomization.yaml b/apps/do/vikunja-test-kustomization.yaml index aafb037..c3290ed 100644 --- a/apps/do/vikunja-test-kustomization.yaml +++ b/apps/do/vikunja-test-kustomization.yaml @@ -1,5 +1,5 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: vikunja-test diff --git a/apps/do/vikunja/kustomization.yaml b/apps/do/vikunja/kustomization.yaml index 8520b27..ad6bfb6 100644 --- a/apps/do/vikunja/kustomization.yaml +++ b/apps/do/vikunja/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 +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 489a138..89efa17 100644 --- a/apps/forge-kustomization.yaml +++ b/apps/forge-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-apps diff --git a/apps/forge/forgejo-kustomization.yaml b/apps/forge/forgejo-kustomization.yaml index f77286c..e056188 100644 --- a/apps/forge/forgejo-kustomization.yaml +++ b/apps/forge/forgejo-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: forgejo diff --git a/apps/generate-kustomizations.sh b/apps/generate-kustomizations.sh index 857f418..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/v1beta1 + { 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 f6e32ef..78839fa 100644 --- a/apps/kustomization.yaml +++ b/apps/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 +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 cbbfb79..c7313fa 100644 --- a/apps/ninja-kustomization.yaml +++ b/apps/ninja-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: add-ninja diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml index 6089821..150c55d 100644 --- a/apps/ninja/invoiceninja-kustomization.yaml +++ b/apps/ninja/invoiceninja-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: invoiceninja @@ -21,14 +21,15 @@ spec: #- name: single-sign-on postBuild: substituteFrom: + - kind: Secret + name: stackspin-cluster-variables - kind: Secret name: stackspout-invoiceninja-variables + - kind: ConfigMap + name: stackspout-invoiceninja-kustomization-variables - kind: Secret name: stackspout-invoiceninja-oauth-variables optional: true - - kind: ConfigMap - name: stackspout-invoiceninja-kustomization-variables - - kind: Secret - name: stackspin-cluster-variables - kind: ConfigMap name: stackspin-single-sign-on-kustomization-variables + optional: true diff --git a/apps/ninja/invoiceninja-secrets-kustomization.yaml b/apps/ninja/invoiceninja-secrets-kustomization.yaml index 992f8d7..6dd9925 100644 --- a/apps/ninja/invoiceninja-secrets-kustomization.yaml +++ b/apps/ninja/invoiceninja-secrets-kustomization.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: invoiceninja-secrets diff --git a/apps/ninja/invoiceninja-secrets/kustomization.yaml b/apps/ninja/invoiceninja-secrets/kustomization.yaml index 01e50f0..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/v1beta1 +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 bed32ae..bd82a01 100644 --- a/apps/ninja/invoiceninja/kustomization.yaml +++ b/apps/ninja/invoiceninja/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 +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 6ebe0bc..8e552e3 100644 --- a/apps/people/suitecrm/kustomization.yaml +++ b/apps/people/suitecrm/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 +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 ebc080a..3afbd0d 100644 --- a/apps/support/zammad-kustomization.yaml +++ b/apps/support/zammad-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: zammad diff --git a/infrastructure/kustomizations/apps-kustomization.yaml b/infrastructure/kustomizations/apps-kustomization.yaml index 14c1d12..dab420d 100644 --- a/infrastructure/kustomizations/apps-kustomization.yaml +++ b/infrastructure/kustomizations/apps-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-apps diff --git a/infrastructure/kustomizations/namespace-kustomization.yaml b/infrastructure/kustomizations/namespace-kustomization.yaml index 0d483cb..02a4676 100644 --- a/infrastructure/kustomizations/namespace-kustomization.yaml +++ b/infrastructure/kustomizations/namespace-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-namespace diff --git a/infrastructure/kustomizations/overrides-kustomization.yaml b/infrastructure/kustomizations/overrides-kustomization.yaml index 5427f26..d2ef769 100644 --- a/infrastructure/kustomizations/overrides-kustomization.yaml +++ b/infrastructure/kustomizations/overrides-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-overrides diff --git a/infrastructure/kustomizations/sources-kustomization.yaml b/infrastructure/kustomizations/sources-kustomization.yaml index cd8179a..c6d276b 100644 --- a/infrastructure/kustomizations/sources-kustomization.yaml +++ b/infrastructure/kustomizations/sources-kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: stackspout-sources diff --git a/infrastructure/sources/8gears-n8n-helmrepository.yaml b/infrastructure/sources/8gears-n8n-helmrepository.yaml index 5d228f3..e085058 100644 --- a/infrastructure/sources/8gears-n8n-helmrepository.yaml +++ b/infrastructure/sources/8gears-n8n-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: 8gears-n8n diff --git a/infrastructure/sources/forgejo-helmrepository.yaml b/infrastructure/sources/forgejo-helmrepository.yaml index 922f295..a5622be 100644 --- a/infrastructure/sources/forgejo-helmrepository.yaml +++ b/infrastructure/sources/forgejo-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: forgejo diff --git a/infrastructure/sources/gitea-helmrepository.yaml b/infrastructure/sources/gitea-helmrepository.yaml index 1ab8d38..01bec3a 100644 --- a/infrastructure/sources/gitea-helmrepository.yaml +++ b/infrastructure/sources/gitea-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: gitea diff --git a/infrastructure/sources/invoiceninja-helmrepository.yaml b/infrastructure/sources/invoiceninja-helmrepository.yaml index 2abfbdf..fa41110 100644 --- a/infrastructure/sources/invoiceninja-helmrepository.yaml +++ b/infrastructure/sources/invoiceninja-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: invoiceninja diff --git a/infrastructure/sources/robjuz-helmrepository.yaml b/infrastructure/sources/robjuz-helmrepository.yaml index 8074644..17f027f 100644 --- a/infrastructure/sources/robjuz-helmrepository.yaml +++ b/infrastructure/sources/robjuz-helmrepository.yaml @@ -1,5 +1,5 @@ # For kimai2 -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: robjuz diff --git a/infrastructure/sources/truecharts-helmrepository.yaml b/infrastructure/sources/truecharts-helmrepository.yaml index e16b390..bfa4ad4 100644 --- a/infrastructure/sources/truecharts-helmrepository.yaml +++ b/infrastructure/sources/truecharts-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: truecharts diff --git a/infrastructure/sources/vikunja-helmrepository.yaml b/infrastructure/sources/vikunja-helmrepository.yaml index 87c9a4e..eaa73a9 100644 --- a/infrastructure/sources/vikunja-helmrepository.yaml +++ b/infrastructure/sources/vikunja-helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: vikunja diff --git a/infrastructure/sources/zammad.yaml b/infrastructure/sources/zammad.yaml index 8972876..752e048 100644 --- a/infrastructure/sources/zammad.yaml +++ b/infrastructure/sources/zammad.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: zammad