diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index ee3c1f81..34129f57 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -11,7 +11,7 @@ env: clusterctl_ver: "1.2.0" apptestctl_ver: "0.18.0" kind_ver: "0.12.0" - GITOPS_FLUX_APP_VERSION: "1.4.0" + GITOPS_FLUX_APP_VERSION: "1.10.0" GITOPS_INIT_NAMESPACES: "default,org-org-name" GITOPS_IGNORED_OBJECTS: "org-org-name/clusters-mapi-out-of-band-no-flux-direct" diff --git a/bases/environments/stages/dev/hello_app_cluster/automatic_updates/imageupdate.yaml b/bases/environments/stages/dev/hello_app_cluster/automatic_updates/imageupdate.yaml index 92e487e8..56985a8b 100644 --- a/bases/environments/stages/dev/hello_app_cluster/automatic_updates/imageupdate.yaml +++ b/bases/environments/stages/dev/hello_app_cluster/automatic_updates/imageupdate.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: ${cluster_name}-image-updates diff --git a/bases/environments/stages/dev/hello_app_cluster/imagepolicies.yaml b/bases/environments/stages/dev/hello_app_cluster/imagepolicies.yaml index af74eef1..439c56ce 100644 --- a/bases/environments/stages/dev/hello_app_cluster/imagepolicies.yaml +++ b/bases/environments/stages/dev/hello_app_cluster/imagepolicies.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-hello-app @@ -13,7 +13,7 @@ spec: semver: range: '>=0.1.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-simple-db-app diff --git a/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml b/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml index d568618a..09e380ef 100644 --- a/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml +++ b/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-hello-app @@ -8,7 +8,7 @@ spec: image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app interval: 10m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-simple-db-app diff --git a/bases/environments/stages/staging/hello_app_cluster/automatic_updates/imageupdate.yaml b/bases/environments/stages/staging/hello_app_cluster/automatic_updates/imageupdate.yaml index 92e487e8..56985a8b 100644 --- a/bases/environments/stages/staging/hello_app_cluster/automatic_updates/imageupdate.yaml +++ b/bases/environments/stages/staging/hello_app_cluster/automatic_updates/imageupdate.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: ${cluster_name}-image-updates diff --git a/bases/environments/stages/staging/hello_app_cluster/imagepolicies.yaml b/bases/environments/stages/staging/hello_app_cluster/imagepolicies.yaml index b3a94374..07a89778 100644 --- a/bases/environments/stages/staging/hello_app_cluster/imagepolicies.yaml +++ b/bases/environments/stages/staging/hello_app_cluster/imagepolicies.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-hello-app @@ -11,7 +11,7 @@ spec: semver: range: '>=0.1.0 <1.0.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-simple-db-app diff --git a/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml b/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml index d568618a..09e380ef 100644 --- a/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml +++ b/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-hello-app @@ -8,7 +8,7 @@ spec: image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app interval: 10m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-simple-db-app diff --git a/docs/add_wc_environments.md b/docs/add_wc_environments.md index 1a8f423e..188e410a 100644 --- a/docs/add_wc_environments.md +++ b/docs/add_wc_environments.md @@ -183,7 +183,7 @@ EOF # Let' create the image update automation for Flux cat < automatic_updates/imageupdate.yaml -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: \${cluster_name}-image-updates @@ -228,7 +228,7 @@ in the `giantswarmpublic.azurecr.io/giantswarm-catalog` registry every 10 minute ```sh cat < imagerepositories.yaml --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: \${cluster_name}-hello-app @@ -237,7 +237,7 @@ spec: image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app interval: 10m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: \${cluster_name}-simple-db-app @@ -257,7 +257,7 @@ Let's have Flux automatically roll out all `-dev` releases that are of at least ```sh cat < imagepolicies.yaml --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: \${cluster_name}-hello-app @@ -271,7 +271,7 @@ spec: semver: range: '>=0.1.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: \${cluster_name}-simple-db-app @@ -347,7 +347,7 @@ to automatically introduce possibly breaking changes in major version bump, so l ```sh cat < imagepolicies.yaml --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: \${cluster_name}-hello-app @@ -359,7 +359,7 @@ spec: semver: range: '>=0.1.0 <1.0.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: \${cluster_name}-simple-db-app diff --git a/docs/apps/automatic_updates_appcr.md b/docs/apps/automatic_updates_appcr.md index 5931e9ad..2666efeb 100644 --- a/docs/apps/automatic_updates_appcr.md +++ b/docs/apps/automatic_updates_appcr.md @@ -62,7 +62,7 @@ export APP_IMAGE_REGISTRY=APP_IMAGE_REGISTRY ```sh cat < imageupdate.yaml - apiVersion: image.toolkit.fluxcd.io/v1beta1 + apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: ${WC_NAME}-updates @@ -100,7 +100,7 @@ scan for new tags: ```sh cat < imagerepository.yaml - apiVersion: image.toolkit.fluxcd.io/v1beta1 + apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${APP_NAME} @@ -115,7 +115,7 @@ scan for new tags: ```sh cat < imagepolicy.yaml - apiVersion: image.toolkit.fluxcd.io/v1beta1 + apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${APP_NAME} diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml index 6ded52bb..fbeb5089 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-hello-world diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml index b89a19d1..3adbfade 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-hello-world diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/imageupdate.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/imageupdate.yaml index a185d5cf..c6ef6577 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/imageupdate.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/imageupdate.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: ${cluster_name}-updates diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml index 6ded52bb..fbeb5089 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagepolicy.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: ${cluster_name}-hello-world diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml index b89a19d1..3adbfade 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: ${cluster_name}-hello-world diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/imageupdate.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/imageupdate.yaml index a185d5cf..c6ef6577 100644 --- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/imageupdate.yaml +++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/imageupdate.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: ${cluster_name}-updates diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagepolicies.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagepolicies.yaml index f599715e..4b73ff43 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagepolicies.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagepolicies.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: hello-app-dev-1-hello-app @@ -13,7 +13,7 @@ spec: semver: range: '>=0.1.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: hello-app-dev-1-simple-db-app diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml index cc6a52d2..fdfa0bb8 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: hello-app-dev-1-hello-app @@ -8,7 +8,7 @@ spec: image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app interval: 10m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: hello-app-dev-1-simple-db-app diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imageupdateautomations.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imageupdateautomations.yaml index 68072a0b..e9e5f965 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imageupdateautomations.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imageupdateautomations.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: hello-app-dev-1-image-updates diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagepolicies.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagepolicies.yaml index 49e5167e..9fd126de 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagepolicies.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagepolicies.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: hello-app-staging-1-hello-app @@ -11,7 +11,7 @@ spec: semver: range: '>=0.1.0 <1.0.0' --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImagePolicy metadata: name: hello-app-staging-1-simple-db-app diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml index 13df70b3..5f5bba3e 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: hello-app-staging-1-hello-app @@ -8,7 +8,7 @@ spec: image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app interval: 10m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository metadata: name: hello-app-staging-1-simple-db-app diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imageupdateautomations.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imageupdateautomations.yaml index 7e56d048..1a25657e 100644 --- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imageupdateautomations.yaml +++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imageupdateautomations.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: hello-app-staging-1-image-updates