remove --reorder none flag from the kustomize command

nawazkh · nawazkh · commit 464f7febe5e3 · 2024-05-16T15:15:43.000-07:00
- add sortOption:legacy to flavors folder
- add sortOption:legacy to test/ci folder
- add sortOption:legacy to test/dev folder
diff --git a/hack/gen-flavors.sh b/hack/gen-flavors.sh
@@ -29,15 +29,15 @@ ci_dir="${REPO_ROOT}/templates/test/ci/"
 dev_dir="${REPO_ROOT}/templates/test/dev/"
 
 for name in $(find "${flavors_dir}"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v base); do
-  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone --reorder none "${flavors_dir}${name}" > "${REPO_ROOT}/templates/cluster-template-${name}.yaml"
+  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone "${flavors_dir}${name}" > "${REPO_ROOT}/templates/cluster-template-${name}.yaml"
 done
 # move the default template to the default file expected by clusterctl
 mv "${REPO_ROOT}/templates/cluster-template-default.yaml" "${REPO_ROOT}/templates/cluster-template.yaml"
 
 for name in $(find "${ci_dir}"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v patches); do
-  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone --reorder none "${ci_dir}${name}" > "${ci_dir}cluster-template-${name}.yaml"
+  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone "${ci_dir}${name}" > "${ci_dir}cluster-template-${name}.yaml"
 done
 
 for name in $(find "${dev_dir}"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v patches); do
-  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone --reorder none "${dev_dir}${name}" > "${dev_dir}cluster-template-${name}.yaml"
+  ${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone "${dev_dir}${name}" > "${dev_dir}cluster-template-${name}.yaml"
 done
diff --git a/templates/flavors/aad/kustomization.yaml b/templates/flavors/aad/kustomization.yaml
@@ -8,3 +8,6 @@ resources:
 patches:
 - path: patches/kubeadm-controlplane.yaml
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks-aso-clusterclass/kustomization.yaml b/templates/flavors/aks-aso-clusterclass/kustomization.yaml
@@ -7,3 +7,6 @@ resources:
 - azure-managed-cluster-template.yaml
 - azure-managed-machinepool-template.yaml
 - kubeadm-config-template.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks-aso-topology/kustomization.yaml b/templates/flavors/aks-aso-topology/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
 - cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks-aso/kustomization.yaml b/templates/flavors/aks-aso/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
 - cluster-template.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks-clusterclass/kustomization.yaml b/templates/flavors/aks-clusterclass/kustomization.yaml
@@ -8,3 +8,6 @@ resources:
 - azure-managed-machinepool-template.yaml
 - ../../azure-cluster-identity
 - kubeadm-config-template.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks-topology/kustomization.yaml b/templates/flavors/aks-topology/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
 - cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/aks/kustomization.yaml b/templates/flavors/aks/kustomization.yaml
@@ -6,3 +6,6 @@ resources:
 - ../../azure-cluster-identity
 patches:
 - path: ../../azure-cluster-identity/managedazurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/azure-bastion/kustomization.yaml b/templates/flavors/azure-bastion/kustomization.yaml
@@ -5,3 +5,6 @@ resources:
 - ../default
 patches:
 - path: patches/azure-cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/azure-cni-v1/kustomization.yaml b/templates/flavors/azure-cni-v1/kustomization.yaml
@@ -9,3 +9,6 @@ patches:
 - path: patches/azure-machine-template.yaml
 - path: patches/kubeadm-control-plane.yaml
 - path: patches/kubeadm-worker-node.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/base/kustomization.yaml b/templates/flavors/base/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
 - cluster-template.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/clusterclass/kustomization.yaml b/templates/flavors/clusterclass/kustomization.yaml
@@ -9,3 +9,6 @@ resources:
 - kubeadm-controlplane-template.yaml
 - kubeadm-config-template.yaml
 - ../../azure-cluster-identity
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml
@@ -7,3 +7,6 @@ resources:
 - ../../azure-cluster-identity
 patches:
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/dual-stack/kustomization.yaml b/templates/flavors/dual-stack/kustomization.yaml
@@ -10,3 +10,6 @@ patches:
 - path: patches/kubeadm-controlplane.yaml
 - path: patches/controlplane-azuremachinetemplate.yaml
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/edgezone/kustomization.yaml b/templates/flavors/edgezone/kustomization.yaml
@@ -6,3 +6,6 @@ resources:
 patches:
 - path: patches/azure-extendedlocation.yaml
 - path: patches/azure-remove-natgateway.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/ephemeral/kustomization.yaml b/templates/flavors/ephemeral/kustomization.yaml
@@ -17,3 +17,6 @@ patches:
     kind: AzureMachineTemplate
     name: .*-control-plane
     version: v1beta1
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/flatcar/kustomization.yaml b/templates/flavors/flatcar/kustomization.yaml
@@ -8,3 +8,6 @@ resources:
 patches:
 - path: patches/kubeadm-controlplane.yaml
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/ipv6/kustomization.yaml b/templates/flavors/ipv6/kustomization.yaml
@@ -11,3 +11,6 @@ patches:
 - path: patches/ipv6.yaml
 - path: patches/kubeadm-controlplane.yaml
 - path: patches/controlplane-azuremachinetemplate.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/machinepool-windows/kustomization.yaml b/templates/flavors/machinepool-windows/kustomization.yaml
@@ -6,3 +6,6 @@ resources:
 - machine-pool-deployment-windows.yaml
 patches:
 - path: ../base-windows-containerd/cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/machinepool/kustomization.yaml b/templates/flavors/machinepool/kustomization.yaml
@@ -8,3 +8,6 @@ resources:
 
 patches:
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/nvidia-gpu/kustomization.yaml b/templates/flavors/nvidia-gpu/kustomization.yaml
@@ -15,3 +15,6 @@ generatorOptions:
     type: generated
 patches:
 - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/private/kustomization.yaml b/templates/flavors/private/kustomization.yaml
@@ -11,3 +11,6 @@ patches:
 - path: patches/private-lb.yaml
 - path: patches/apiserver-host-dns.yaml
 - path: patches/azure-bastion.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/topology/kustomization.yaml b/templates/flavors/topology/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
 - cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/flavors/windows/kustomization.yaml b/templates/flavors/windows/kustomization.yaml
@@ -7,3 +7,6 @@ resources:
 
 patches:
 - path: ../base-windows-containerd/cluster.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml
@@ -27,3 +27,6 @@ patches:
       value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
   target:
     kind: AzureASOManagedMachinePool
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
@@ -12,3 +12,6 @@ patches:
 - path: patches/addons.yaml
 - path: patches/kubeadm-config-template.yaml
 - path: patches.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-aks/kustomization.yaml b/templates/test/ci/prow-aks/kustomization.yaml
@@ -9,3 +9,6 @@ patches:
 - path: patches/aks-pool0.yaml
 - path: patches/aks-pool1.yaml
 - path: patches/addons.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml
@@ -10,3 +10,6 @@ patches:
 - path: ../patches/tags.yaml
 - path: ../patches/controller-manager.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml b/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
@@ -28,3 +28,6 @@ patches:
 - path: ../prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml
 - path: patches/machine-deployment.yaml
 - path: ../patches/windows-addons-disabled.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml b/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
@@ -28,3 +28,6 @@ patches:
 - path: ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
 - path: patches/machine-deployment.yaml
 - path: ../patches/windows-addons-disabled.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-ci-version/kustomization.yaml b/templates/test/ci/prow-ci-version/kustomization.yaml
@@ -68,3 +68,6 @@ generatorOptions:
   disableNameSuffixHash: true
   labels:
     type: generated
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-clusterclass-ci-default/kustomization.yaml b/templates/test/ci/prow-clusterclass-ci-default/kustomization.yaml
@@ -12,3 +12,6 @@ resources:
 patches:
 - path: patches.yaml
 - path: variables.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml
@@ -17,3 +17,6 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml
@@ -15,3 +15,6 @@ patches:
 - path: patches/azure-machine-template.yaml
 - path: patches/cluster-label-calico-dual-stack.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml
@@ -19,3 +19,6 @@ patches:
 - path: patches/kubernetes-version.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-flatcar/kustomization.yaml b/templates/test/ci/prow-flatcar/kustomization.yaml
@@ -11,3 +11,6 @@ patches:
 - path: ../patches/controller-manager.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure-flatcar.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-ipv6/kustomization.yaml b/templates/test/ci/prow-ipv6/kustomization.yaml
@@ -13,3 +13,6 @@ patches:
 - path: ../patches/controller-manager.yaml
 - path: patches/cluster-label-calico-ipv6.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-machine-pool-ci-version/kustomization.yaml b/templates/test/ci/prow-machine-pool-ci-version/kustomization.yaml
@@ -34,3 +34,6 @@ configMapGenerator:
   files:
   - kube-proxy-patch=../patches/windows-kubeproxy-ci.yaml
   name: cni-${CLUSTER_NAME}-calico-windows
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-machine-pool-flex/kustomization.yaml b/templates/test/ci/prow-machine-pool-flex/kustomization.yaml
@@ -5,3 +5,6 @@ resources:
 - ../prow-machine-pool
 patches:
 - path: patches/vmss-flex.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-machine-pool/kustomization.yaml b/templates/test/ci/prow-machine-pool/kustomization.yaml
@@ -35,3 +35,6 @@ patches:
 - path: ../patches/windows-containerd-labels.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-nvidia-gpu/kustomization.yaml b/templates/test/ci/prow-nvidia-gpu/kustomization.yaml
@@ -19,3 +19,6 @@ patches:
 - path: ../patches/azurecluster-gpu.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml
@@ -30,3 +30,6 @@ generatorOptions:
   disableNameSuffixHash: true
   labels:
     type: generated
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-spot/kustomization.yaml b/templates/test/ci/prow-spot/kustomization.yaml
@@ -17,3 +17,6 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml
@@ -28,3 +28,6 @@ patches:
 - path: cluster.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow-workload-identity/kustomization.yaml b/templates/test/ci/prow-workload-identity/kustomization.yaml
@@ -16,3 +16,6 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml
@@ -64,3 +64,6 @@ generatorOptions:
   disableNameSuffixHash: true
   labels:
     type: generated
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
diff --git a/templates/test/dev/custom-builds-machine-pool/kustomization.yaml b/templates/test/dev/custom-builds-machine-pool/kustomization.yaml
@@ -31,3 +31,6 @@ generatorOptions:
     type: generated
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
+sortOptions:
+  order: legacy
diff --git a/templates/test/dev/custom-builds/kustomization.yaml b/templates/test/dev/custom-builds/kustomization.yaml
@@ -66,3 +66,6 @@ generatorOptions:
     type: generated
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
+sortOptions:
+  order: legacy
