From dc1cc36c75aa36fba70042f99dd468b0c81e38e8 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 21 Nov 2024 10:08:59 -0600 Subject: [PATCH] fix: resolve Kustomize deprecations Kustomize has deprecated the use of a couple feature flags and we need to make adjustments to ensure that we're maintaining the environment in expected ways. * remove the CLI option from `kustomize.sh` to disable automatic reordering * add the `sortOptions` keyword to the base kustomization files to ensure resource sorting is handled as fifo. * replace the `bases` keyword with the `resources` keyword Signed-off-by: Kevin Carter --- base-kustomize/argocd/base/kustomization.yaml | 2 ++ base-kustomize/backups/etcd/kustomization.yaml | 2 ++ base-kustomize/barbican/aio/kustomization.yaml | 4 +++- base-kustomize/barbican/base/kustomization.yaml | 2 ++ base-kustomize/ceilometer/aio/kustomization.yaml | 4 +++- base-kustomize/ceilometer/base/kustomization.yaml | 2 ++ base-kustomize/cinder/aio/kustomization.yaml | 4 +++- base-kustomize/cinder/base/kustomization.yaml | 2 ++ base-kustomize/cinder/netapp/kustomization.yaml | 2 ++ base-kustomize/designate/aio/kustomization.yaml | 4 +++- base-kustomize/designate/base/kustomization.yaml | 2 ++ base-kustomize/envoyproxy-gateway/base/kustomization.yaml | 2 ++ base-kustomize/gateway/base/kustomization.yaml | 2 ++ base-kustomize/gateway/envoyproxy/kustomization.yaml | 2 ++ .../gateway/nginx-gateway-fabric/kustomization.yaml | 2 ++ base-kustomize/glance/aio/kustomization.yaml | 4 +++- base-kustomize/glance/base/kustomization.yaml | 2 ++ base-kustomize/gnocchi/aio/kustomization.yaml | 4 +++- base-kustomize/gnocchi/base/kustomization.yaml | 2 ++ base-kustomize/grafana/base/kustomization.yaml | 2 ++ base-kustomize/heat/aio/kustomization.yaml | 4 +++- base-kustomize/heat/base/kustomization.yaml | 2 ++ base-kustomize/horizon/aio/kustomization.yaml | 4 +++- base-kustomize/horizon/base/kustomization.yaml | 2 ++ base-kustomize/k8s-dashboard/kustomization.yaml | 2 ++ base-kustomize/keystone/aio/kustomization.yaml | 4 +++- base-kustomize/keystone/base/kustomization.yaml | 2 ++ base-kustomize/kustomize.sh | 2 +- base-kustomize/magnum/aio/kustomization.yaml | 4 +++- base-kustomize/magnum/base/kustomization.yaml | 2 ++ base-kustomize/mariadb-cluster/aio/kustomization.yaml | 4 +++- base-kustomize/mariadb-cluster/base/kustomization.yaml | 2 ++ base-kustomize/mariadb-cluster/galera/kustomization.yaml | 4 +++- base-kustomize/mariadb-operator/kustomization.yaml | 2 ++ base-kustomize/memcached/aio/kustomization.yaml | 2 ++ base-kustomize/memcached/base-monitoring/kustomization.yaml | 2 ++ base-kustomize/memcached/base/kustomization.yaml | 2 ++ base-kustomize/neutron/aio/kustomization.yaml | 4 +++- base-kustomize/neutron/base/kustomization.yaml | 2 ++ base-kustomize/nova/aio/kustomization.yaml | 4 +++- base-kustomize/nova/base/kustomization.yaml | 2 ++ base-kustomize/octavia/aio/kustomization.yaml | 4 +++- base-kustomize/octavia/base/kustomization.yaml | 2 ++ base-kustomize/openstack/kustomization.yaml | 2 ++ base-kustomize/ovn-backup/base/kustomization.yaml | 2 ++ base-kustomize/ovn/kustomization.yaml | 2 ++ base-kustomize/placement/aio/kustomization.yaml | 4 +++- base-kustomize/placement/base/kustomization.yaml | 2 ++ base-kustomize/postgres-cluster/aio/kustomization.yaml | 2 ++ base-kustomize/postgres-cluster/base/kustomization.yaml | 2 ++ base-kustomize/postgres-operator/kustomization.yaml | 2 ++ base-kustomize/prometheus-mysql-exporter/kustomization.yaml | 2 ++ base-kustomize/prometheus/base/kustomization.yaml | 2 ++ base-kustomize/rabbitmq-cluster/aio/kustomization.yaml | 4 +++- base-kustomize/rabbitmq-cluster/base/kustomization.yaml | 2 ++ base-kustomize/rabbitmq-operator/kustomization.yaml | 2 ++ base-kustomize/rabbitmq-topology-operator/kustomization.yaml | 2 ++ base-kustomize/rook-cluster-external-pvc/kustomization.yaml | 2 ++ base-kustomize/rook-cluster/kustomization.yaml | 2 ++ base-kustomize/rook-defaults-external-pvc/kustomization.yaml | 2 ++ base-kustomize/rook-defaults/kustomization.yaml | 2 ++ base-kustomize/rook-operator/kustomization.yaml | 2 ++ base-kustomize/sealed-secrets/base/kustomization.yaml | 2 ++ base-kustomize/skyline/aio/kustomization.yaml | 4 +++- base-kustomize/skyline/base/kustomization.yaml | 2 ++ base-kustomize/topolvm/general/kustomization.yaml | 2 ++ base-kustomize/vault-secrets-operator/base/kustomization.yaml | 2 ++ base-kustomize/vault/base/kustomization.yaml | 2 ++ base-kustomize/vault/base/local_storage/kustomization.yaml | 2 ++ base-kustomize/vault/base/ssl/kustomization.yaml | 2 ++ 70 files changed, 157 insertions(+), 19 deletions(-) diff --git a/base-kustomize/argocd/base/kustomization.yaml b/base-kustomize/argocd/base/kustomization.yaml index 270eb890..38a69102 100644 --- a/base-kustomize/argocd/base/kustomization.yaml +++ b/base-kustomize/argocd/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - namespace.yaml diff --git a/base-kustomize/backups/etcd/kustomization.yaml b/base-kustomize/backups/etcd/kustomization.yaml index 824ee0a7..4d15887f 100644 --- a/base-kustomize/backups/etcd/kustomization.yaml +++ b/base-kustomize/backups/etcd/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - etcd-backup.yaml diff --git a/base-kustomize/barbican/aio/kustomization.yaml b/base-kustomize/barbican/aio/kustomization.yaml index a2dc0d69..662c67b7 100644 --- a/base-kustomize/barbican/aio/kustomization.yaml +++ b/base-kustomize/barbican/aio/kustomization.yaml @@ -1,2 +1,4 @@ -bases: +sortOptions: + order: fifo +resources: - ../base diff --git a/base-kustomize/barbican/base/kustomization.yaml b/base-kustomize/barbican/base/kustomization.yaml index 62728a7f..da34adee 100644 --- a/base-kustomize/barbican/base/kustomization.yaml +++ b/base-kustomize/barbican/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - barbican-mariadb-database.yaml - barbican-rabbitmq-queue.yaml diff --git a/base-kustomize/ceilometer/aio/kustomization.yaml b/base-kustomize/ceilometer/aio/kustomization.yaml index 6c0fd71e..b392767f 100644 --- a/base-kustomize/ceilometer/aio/kustomization.yaml +++ b/base-kustomize/ceilometer/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/ceilometer/base/kustomization.yaml b/base-kustomize/ceilometer/base/kustomization.yaml index 835940c0..0528b982 100644 --- a/base-kustomize/ceilometer/base/kustomization.yaml +++ b/base-kustomize/ceilometer/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - all.yaml - hpa-ceilometer-notification.yaml diff --git a/base-kustomize/cinder/aio/kustomization.yaml b/base-kustomize/cinder/aio/kustomization.yaml index c0368891..b0965301 100644 --- a/base-kustomize/cinder/aio/kustomization.yaml +++ b/base-kustomize/cinder/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/cinder/base/kustomization.yaml b/base-kustomize/cinder/base/kustomization.yaml index 9c6b8c2b..1e409514 100644 --- a/base-kustomize/cinder/base/kustomization.yaml +++ b/base-kustomize/cinder/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - cinder-mariadb-database.yaml - cinder-rabbitmq-queue.yaml diff --git a/base-kustomize/cinder/netapp/kustomization.yaml b/base-kustomize/cinder/netapp/kustomization.yaml index 571b02b0..91f2e9c4 100644 --- a/base-kustomize/cinder/netapp/kustomization.yaml +++ b/base-kustomize/cinder/netapp/kustomization.yaml @@ -12,6 +12,8 @@ images: newName: ghcr.io/rackerlabs/genestack/cinder-volume-rxt newTag: 2024.1-ubuntu_jammy +sortOptions: + order: fifo resources: - configmap-etc.yaml - deploy-volume-netapp.yaml diff --git a/base-kustomize/designate/aio/kustomization.yaml b/base-kustomize/designate/aio/kustomization.yaml index 64d1224c..86ed3d10 100644 --- a/base-kustomize/designate/aio/kustomization.yaml +++ b/base-kustomize/designate/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/designate/base/kustomization.yaml b/base-kustomize/designate/base/kustomization.yaml index a67aeb43..f664424a 100644 --- a/base-kustomize/designate/base/kustomization.yaml +++ b/base-kustomize/designate/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - designate-mariadb-database.yaml - designate-rabbitmq-queue.yaml diff --git a/base-kustomize/envoyproxy-gateway/base/kustomization.yaml b/base-kustomize/envoyproxy-gateway/base/kustomization.yaml index f93d9d5c..a3e01b75 100644 --- a/base-kustomize/envoyproxy-gateway/base/kustomization.yaml +++ b/base-kustomize/envoyproxy-gateway/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - './namespace.yaml' - './gatewayclass.yaml' diff --git a/base-kustomize/gateway/base/kustomization.yaml b/base-kustomize/gateway/base/kustomization.yaml index b241b027..a095a621 100644 --- a/base-kustomize/gateway/base/kustomization.yaml +++ b/base-kustomize/gateway/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - all.yaml patches: diff --git a/base-kustomize/gateway/envoyproxy/kustomization.yaml b/base-kustomize/gateway/envoyproxy/kustomization.yaml index 4815d5a6..86ef2192 100644 --- a/base-kustomize/gateway/envoyproxy/kustomization.yaml +++ b/base-kustomize/gateway/envoyproxy/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - './gateway.yaml' # namespace: envoy-gateway-system (common gateway) diff --git a/base-kustomize/gateway/nginx-gateway-fabric/kustomization.yaml b/base-kustomize/gateway/nginx-gateway-fabric/kustomization.yaml index 9ec6f3b4..00225f23 100644 --- a/base-kustomize/gateway/nginx-gateway-fabric/kustomization.yaml +++ b/base-kustomize/gateway/nginx-gateway-fabric/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - internal-gateway-api.yaml # namespace: nginx-gateway (common gateway) - internal-gateway-issuer.yaml #namespace: nginx-gateway diff --git a/base-kustomize/glance/aio/kustomization.yaml b/base-kustomize/glance/aio/kustomization.yaml index 4aa4839b..11ddd3b5 100644 --- a/base-kustomize/glance/aio/kustomization.yaml +++ b/base-kustomize/glance/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/glance/base/kustomization.yaml b/base-kustomize/glance/base/kustomization.yaml index ca369db6..a0df4e96 100644 --- a/base-kustomize/glance/base/kustomization.yaml +++ b/base-kustomize/glance/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - glance-mariadb-database.yaml - glance-rabbitmq-queue.yaml diff --git a/base-kustomize/gnocchi/aio/kustomization.yaml b/base-kustomize/gnocchi/aio/kustomization.yaml index b7a7e4a2..2d632765 100644 --- a/base-kustomize/gnocchi/aio/kustomization.yaml +++ b/base-kustomize/gnocchi/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/gnocchi/base/kustomization.yaml b/base-kustomize/gnocchi/base/kustomization.yaml index f20864bd..aead2994 100644 --- a/base-kustomize/gnocchi/base/kustomization.yaml +++ b/base-kustomize/gnocchi/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - gnocchi-temp-keyring.yaml - all.yaml diff --git a/base-kustomize/grafana/base/kustomization.yaml b/base-kustomize/grafana/base/kustomization.yaml index 660fd38a..91fbfc13 100644 --- a/base-kustomize/grafana/base/kustomization.yaml +++ b/base-kustomize/grafana/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - ns-grafana.yaml - azure-client-secret.yaml diff --git a/base-kustomize/heat/aio/kustomization.yaml b/base-kustomize/heat/aio/kustomization.yaml index 38d81214..fa4f8e69 100644 --- a/base-kustomize/heat/aio/kustomization.yaml +++ b/base-kustomize/heat/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/heat/base/kustomization.yaml b/base-kustomize/heat/base/kustomization.yaml index 16534499..4e2127bc 100644 --- a/base-kustomize/heat/base/kustomization.yaml +++ b/base-kustomize/heat/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - heat-mariadb-database.yaml - heat-rabbitmq-queue.yaml diff --git a/base-kustomize/horizon/aio/kustomization.yaml b/base-kustomize/horizon/aio/kustomization.yaml index 97e44317..7e6ab5e0 100644 --- a/base-kustomize/horizon/aio/kustomization.yaml +++ b/base-kustomize/horizon/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/horizon/base/kustomization.yaml b/base-kustomize/horizon/base/kustomization.yaml index 0c677427..18190ab5 100644 --- a/base-kustomize/horizon/base/kustomization.yaml +++ b/base-kustomize/horizon/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - horizon-mariadb-database.yaml - all.yaml diff --git a/base-kustomize/k8s-dashboard/kustomization.yaml b/base-kustomize/k8s-dashboard/kustomization.yaml index e11dfb13..17110acb 100644 --- a/base-kustomize/k8s-dashboard/kustomization.yaml +++ b/base-kustomize/k8s-dashboard/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - dashboard-rbac-default.yaml diff --git a/base-kustomize/keystone/aio/kustomization.yaml b/base-kustomize/keystone/aio/kustomization.yaml index 1233f31f..9d31b365 100644 --- a/base-kustomize/keystone/aio/kustomization.yaml +++ b/base-kustomize/keystone/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/keystone/base/kustomization.yaml b/base-kustomize/keystone/base/kustomization.yaml index 30838c7c..de6538f5 100644 --- a/base-kustomize/keystone/base/kustomization.yaml +++ b/base-kustomize/keystone/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - keystone-mariadb-database.yaml - keystone-rabbitmq-queue.yaml diff --git a/base-kustomize/kustomize.sh b/base-kustomize/kustomize.sh index 335a28a5..ec47fc1d 100755 --- a/base-kustomize/kustomize.sh +++ b/base-kustomize/kustomize.sh @@ -3,5 +3,5 @@ set -e KUSTOMIZE_DIR=${1:-$GENESTACK_KUSTOMIZE_ARG} pushd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null cat <&0 > "${KUSTOMIZE_DIR}"/../base/all.yaml - kubectl kustomize --reorder='none' "${KUSTOMIZE_DIR}" + kubectl kustomize "${KUSTOMIZE_DIR}" popd &>/dev/null diff --git a/base-kustomize/magnum/aio/kustomization.yaml b/base-kustomize/magnum/aio/kustomization.yaml index a2dc0d69..662c67b7 100644 --- a/base-kustomize/magnum/aio/kustomization.yaml +++ b/base-kustomize/magnum/aio/kustomization.yaml @@ -1,2 +1,4 @@ -bases: +sortOptions: + order: fifo +resources: - ../base diff --git a/base-kustomize/magnum/base/kustomization.yaml b/base-kustomize/magnum/base/kustomization.yaml index 1c21a8dc..6358adfd 100644 --- a/base-kustomize/magnum/base/kustomization.yaml +++ b/base-kustomize/magnum/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - magnum-mariadb-database.yaml - magnum-rabbitmq-queue.yaml diff --git a/base-kustomize/mariadb-cluster/aio/kustomization.yaml b/base-kustomize/mariadb-cluster/aio/kustomization.yaml index af0874e4..e19e21f8 100644 --- a/base-kustomize/mariadb-cluster/aio/kustomization.yaml +++ b/base-kustomize/mariadb-cluster/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - "../base" patches: diff --git a/base-kustomize/mariadb-cluster/base/kustomization.yaml b/base-kustomize/mariadb-cluster/base/kustomization.yaml index d1d6323a..d90c40a9 100644 --- a/base-kustomize/mariadb-cluster/base/kustomization.yaml +++ b/base-kustomize/mariadb-cluster/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - mariadb-configmap.yaml - mariadb-replication.yaml diff --git a/base-kustomize/mariadb-cluster/galera/kustomization.yaml b/base-kustomize/mariadb-cluster/galera/kustomization.yaml index fa51b86a..e6e9a8a8 100644 --- a/base-kustomize/mariadb-cluster/galera/kustomization.yaml +++ b/base-kustomize/mariadb-cluster/galera/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - "../base" patches: diff --git a/base-kustomize/mariadb-operator/kustomization.yaml b/base-kustomize/mariadb-operator/kustomization.yaml index 360fcdda..6db4182a 100644 --- a/base-kustomize/mariadb-operator/kustomization.yaml +++ b/base-kustomize/mariadb-operator/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - ns-mariadb.yaml diff --git a/base-kustomize/memcached/aio/kustomization.yaml b/base-kustomize/memcached/aio/kustomization.yaml index 084994f2..f2f30a68 100644 --- a/base-kustomize/memcached/aio/kustomization.yaml +++ b/base-kustomize/memcached/aio/kustomization.yaml @@ -1,6 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +sortOptions: + order: fifo resources: - ../base diff --git a/base-kustomize/memcached/base-monitoring/kustomization.yaml b/base-kustomize/memcached/base-monitoring/kustomization.yaml index 44b9364b..cbb0f7d1 100644 --- a/base-kustomize/memcached/base-monitoring/kustomization.yaml +++ b/base-kustomize/memcached/base-monitoring/kustomization.yaml @@ -1,6 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +sortOptions: + order: fifo resources: - ../base diff --git a/base-kustomize/memcached/base/kustomization.yaml b/base-kustomize/memcached/base/kustomization.yaml index e529e3b9..b59d1dd8 100644 --- a/base-kustomize/memcached/base/kustomization.yaml +++ b/base-kustomize/memcached/base/kustomization.yaml @@ -1,6 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +sortOptions: + order: fifo resources: - all.yaml diff --git a/base-kustomize/neutron/aio/kustomization.yaml b/base-kustomize/neutron/aio/kustomization.yaml index 98d75214..fba33cb9 100644 --- a/base-kustomize/neutron/aio/kustomization.yaml +++ b/base-kustomize/neutron/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/neutron/base/kustomization.yaml b/base-kustomize/neutron/base/kustomization.yaml index ccea29fd..cd1b3042 100644 --- a/base-kustomize/neutron/base/kustomization.yaml +++ b/base-kustomize/neutron/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - neutron-mariadb-database.yaml - neutron-rabbitmq-queue.yaml diff --git a/base-kustomize/nova/aio/kustomization.yaml b/base-kustomize/nova/aio/kustomization.yaml index 43c45de6..5b0a9b48 100644 --- a/base-kustomize/nova/aio/kustomization.yaml +++ b/base-kustomize/nova/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/nova/base/kustomization.yaml b/base-kustomize/nova/base/kustomization.yaml index f13f0026..ddbba74e 100644 --- a/base-kustomize/nova/base/kustomization.yaml +++ b/base-kustomize/nova/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - nova-mariadb-database.yaml - nova-rabbitmq-queue.yaml diff --git a/base-kustomize/octavia/aio/kustomization.yaml b/base-kustomize/octavia/aio/kustomization.yaml index 71c429ce..2c56ac74 100644 --- a/base-kustomize/octavia/aio/kustomization.yaml +++ b/base-kustomize/octavia/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/octavia/base/kustomization.yaml b/base-kustomize/octavia/base/kustomization.yaml index b4f6c326..b5695079 100644 --- a/base-kustomize/octavia/base/kustomization.yaml +++ b/base-kustomize/octavia/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - octavia-mariadb-database.yaml - octavia-rabbitmq-queue.yaml diff --git a/base-kustomize/openstack/kustomization.yaml b/base-kustomize/openstack/kustomization.yaml index 36e5798c..21df36d6 100644 --- a/base-kustomize/openstack/kustomization.yaml +++ b/base-kustomize/openstack/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - ns-openstack.yaml - issuer-kube-system-selfsigned.yaml diff --git a/base-kustomize/ovn-backup/base/kustomization.yaml b/base-kustomize/ovn-backup/base/kustomization.yaml index 1603f82b..f57acdaa 100644 --- a/base-kustomize/ovn-backup/base/kustomization.yaml +++ b/base-kustomize/ovn-backup/base/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - name: ovn-backup-config envs: - ovn-backup.config +sortOptions: + order: fifo resources: - ovn-backup.yaml diff --git a/base-kustomize/ovn/kustomization.yaml b/base-kustomize/ovn/kustomization.yaml index 84a68f18..b48bb155 100644 --- a/base-kustomize/ovn/kustomization.yaml +++ b/base-kustomize/ovn/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - ovn-setup.yaml diff --git a/base-kustomize/placement/aio/kustomization.yaml b/base-kustomize/placement/aio/kustomization.yaml index c1008756..cd33f63d 100644 --- a/base-kustomize/placement/aio/kustomization.yaml +++ b/base-kustomize/placement/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/placement/base/kustomization.yaml b/base-kustomize/placement/base/kustomization.yaml index 5f0a6efd..fb051405 100644 --- a/base-kustomize/placement/base/kustomization.yaml +++ b/base-kustomize/placement/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - placement-mariadb-database.yaml - all.yaml diff --git a/base-kustomize/postgres-cluster/aio/kustomization.yaml b/base-kustomize/postgres-cluster/aio/kustomization.yaml index 88679255..2e91ccf0 100644 --- a/base-kustomize/postgres-cluster/aio/kustomization.yaml +++ b/base-kustomize/postgres-cluster/aio/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - postgres-cluster.yaml diff --git a/base-kustomize/postgres-cluster/base/kustomization.yaml b/base-kustomize/postgres-cluster/base/kustomization.yaml index 88679255..2e91ccf0 100644 --- a/base-kustomize/postgres-cluster/base/kustomization.yaml +++ b/base-kustomize/postgres-cluster/base/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - postgres-cluster.yaml diff --git a/base-kustomize/postgres-operator/kustomization.yaml b/base-kustomize/postgres-operator/kustomization.yaml index 4005669e..2bc902d2 100644 --- a/base-kustomize/postgres-operator/kustomization.yaml +++ b/base-kustomize/postgres-operator/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - ns-postgres.yaml diff --git a/base-kustomize/prometheus-mysql-exporter/kustomization.yaml b/base-kustomize/prometheus-mysql-exporter/kustomization.yaml index 4c5c0f82..2ad796fa 100644 --- a/base-kustomize/prometheus-mysql-exporter/kustomization.yaml +++ b/base-kustomize/prometheus-mysql-exporter/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - monitoring_user_create.yaml - monitoring_user_grant.yaml diff --git a/base-kustomize/prometheus/base/kustomization.yaml b/base-kustomize/prometheus/base/kustomization.yaml index 34f7f9bd..10663bac 100644 --- a/base-kustomize/prometheus/base/kustomization.yaml +++ b/base-kustomize/prometheus/base/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - all.yaml diff --git a/base-kustomize/rabbitmq-cluster/aio/kustomization.yaml b/base-kustomize/rabbitmq-cluster/aio/kustomization.yaml index ec9c1da0..c2c45224 100644 --- a/base-kustomize/rabbitmq-cluster/aio/kustomization.yaml +++ b/base-kustomize/rabbitmq-cluster/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/rabbitmq-cluster/base/kustomization.yaml b/base-kustomize/rabbitmq-cluster/base/kustomization.yaml index 36110d0d..61b40b07 100644 --- a/base-kustomize/rabbitmq-cluster/base/kustomization.yaml +++ b/base-kustomize/rabbitmq-cluster/base/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - rabbitmq-cluster.yaml diff --git a/base-kustomize/rabbitmq-operator/kustomization.yaml b/base-kustomize/rabbitmq-operator/kustomization.yaml index 6df02ed8..4f7a9205 100644 --- a/base-kustomize/rabbitmq-operator/kustomization.yaml +++ b/base-kustomize/rabbitmq-operator/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - cluster-operator.yaml diff --git a/base-kustomize/rabbitmq-topology-operator/kustomization.yaml b/base-kustomize/rabbitmq-topology-operator/kustomization.yaml index 0b0906c7..9c8b61d6 100644 --- a/base-kustomize/rabbitmq-topology-operator/kustomization.yaml +++ b/base-kustomize/rabbitmq-topology-operator/kustomization.yaml @@ -1,2 +1,4 @@ +sortOptions: + order: fifo resources: - messaging-topology-operator-with-certmanager.yaml diff --git a/base-kustomize/rook-cluster-external-pvc/kustomization.yaml b/base-kustomize/rook-cluster-external-pvc/kustomization.yaml index 20251f22..cc9a7175 100644 --- a/base-kustomize/rook-cluster-external-pvc/kustomization.yaml +++ b/base-kustomize/rook-cluster-external-pvc/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - cluster-on-pvc.yaml - toolbox.yaml diff --git a/base-kustomize/rook-cluster/kustomization.yaml b/base-kustomize/rook-cluster/kustomization.yaml index 2ecb7a1e..4aa83120 100644 --- a/base-kustomize/rook-cluster/kustomization.yaml +++ b/base-kustomize/rook-cluster/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - rook-cluster.yaml - toolbox.yaml diff --git a/base-kustomize/rook-defaults-external-pvc/kustomization.yaml b/base-kustomize/rook-defaults-external-pvc/kustomization.yaml index 2e75034d..5eb3f2f8 100644 --- a/base-kustomize/rook-defaults-external-pvc/kustomization.yaml +++ b/base-kustomize/rook-defaults-external-pvc/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - filesystem.yaml - storageclass-cephfs.yaml diff --git a/base-kustomize/rook-defaults/kustomization.yaml b/base-kustomize/rook-defaults/kustomization.yaml index 29ddce29..34af3f3c 100644 --- a/base-kustomize/rook-defaults/kustomization.yaml +++ b/base-kustomize/rook-defaults/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - filesystem.yaml - storageclass-cephfs.yaml diff --git a/base-kustomize/rook-operator/kustomization.yaml b/base-kustomize/rook-operator/kustomization.yaml index ad5ebf62..974ee828 100644 --- a/base-kustomize/rook-operator/kustomization.yaml +++ b/base-kustomize/rook-operator/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - crds.yaml - common.yaml diff --git a/base-kustomize/sealed-secrets/base/kustomization.yaml b/base-kustomize/sealed-secrets/base/kustomization.yaml index d8033add..6d8db75e 100644 --- a/base-kustomize/sealed-secrets/base/kustomization.yaml +++ b/base-kustomize/sealed-secrets/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - './namespace.yaml' namespace: sealed-secrets diff --git a/base-kustomize/skyline/aio/kustomization.yaml b/base-kustomize/skyline/aio/kustomization.yaml index 43514824..fea1ec8f 100644 --- a/base-kustomize/skyline/aio/kustomization.yaml +++ b/base-kustomize/skyline/aio/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +sortOptions: + order: fifo +resources: - ../base patches: diff --git a/base-kustomize/skyline/base/kustomization.yaml b/base-kustomize/skyline/base/kustomization.yaml index 92fa6202..4fe23fcd 100644 --- a/base-kustomize/skyline/base/kustomization.yaml +++ b/base-kustomize/skyline/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - skyline-mariadb-database.yaml - services.yaml diff --git a/base-kustomize/topolvm/general/kustomization.yaml b/base-kustomize/topolvm/general/kustomization.yaml index 1540310d..15bfc5e1 100644 --- a/base-kustomize/topolvm/general/kustomization.yaml +++ b/base-kustomize/topolvm/general/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - ns-topolvm.yaml diff --git a/base-kustomize/vault-secrets-operator/base/kustomization.yaml b/base-kustomize/vault-secrets-operator/base/kustomization.yaml index 0e704edd..da119a33 100644 --- a/base-kustomize/vault-secrets-operator/base/kustomization.yaml +++ b/base-kustomize/vault-secrets-operator/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - './namespace.yaml' diff --git a/base-kustomize/vault/base/kustomization.yaml b/base-kustomize/vault/base/kustomization.yaml index 81d256db..38d1b676 100644 --- a/base-kustomize/vault/base/kustomization.yaml +++ b/base-kustomize/vault/base/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - './namespace.yaml' - './ssl/' diff --git a/base-kustomize/vault/base/local_storage/kustomization.yaml b/base-kustomize/vault/base/local_storage/kustomization.yaml index 085a31f8..7f64518a 100644 --- a/base-kustomize/vault/base/local_storage/kustomization.yaml +++ b/base-kustomize/vault/base/local_storage/kustomization.yaml @@ -1,3 +1,5 @@ +sortOptions: + order: fifo resources: - './local_sc.yaml' - './vault-dwpp.yaml' diff --git a/base-kustomize/vault/base/ssl/kustomization.yaml b/base-kustomize/vault/base/ssl/kustomization.yaml index fd7a7b48..1ebc2c0b 100644 --- a/base-kustomize/vault/base/ssl/kustomization.yaml +++ b/base-kustomize/vault/base/ssl/kustomization.yaml @@ -1,4 +1,6 @@ namespace: vault +sortOptions: + order: fifo resources: - './vault-selfsigned-issuer.yaml' - './vault-selfsigned-ca.yaml'