diff --git a/hack/gen-test-flavors.sh b/hack/gen-test-flavors.sh index 87dece70c7..89f25863b6 100755 --- a/hack/gen-test-flavors.sh +++ b/hack/gen-test-flavors.sh @@ -34,11 +34,9 @@ mkdir -p "${generated_dir}" # Ignore non kustomized find "${src_dir}"* -maxdepth 1 -type d \ - -print0 | xargs -0 -I {} basename {} | grep -vx -E '(patches|addons|cni|csi|ccm|base)' | xargs -t -I {} ${kustomize} build --load-restrictor LoadRestrictionsNone --reorder none ${src_dir}{} -o ${generated_dir}/cluster-template-{}.yaml - + -print0 | xargs -0 -I {} basename {} | grep -vx -E '(patches|addons|cni|csi|ccm|base)' | xargs -t -I {} ${kustomize} build --load-restrictor LoadRestrictionsNone ${src_dir}{} -o ${generated_dir}/cluster-template-{}.yaml ## move the default template to the default file expected by clusterctl in case of withoutclusterclass -if [ "${sub_dir_path}" == "withoutclusterclass" ] -then +if [ "${sub_dir_path}" == "withoutclusterclass" ]; then mv "${generated_dir}/cluster-template-default.yaml" "${generated_dir}/cluster-template.yaml" fi diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/external-vpc-clusterclass/kustomization.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/external-vpc-clusterclass/kustomization.yaml index c7a2e87bcb..0816b12fd7 100644 --- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/external-vpc-clusterclass/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/external-vpc-clusterclass/kustomization.yaml @@ -1,28 +1,28 @@ resources: - - ../topology/cluster-template.yaml +- ../topology/cluster-template.yaml patches: - - path: ./byo-infra-variables.yaml - target: - group: cluster.x-k8s.io - version: v1beta1 - kind: Cluster - - path: ./limited-az-variable.yaml - target: - group: cluster.x-k8s.io - version: v1beta1 - kind: Cluster +- path: ./byo-infra-variables.yaml + target: + group: cluster.x-k8s.io + kind: Cluster + version: v1beta1 +- path: ./limited-az-variable.yaml + target: + group: cluster.x-k8s.io + kind: Cluster + version: v1beta1 configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated - - +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/kustomization.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/kustomization.yaml index 16daf6ad4a..ff32e8812d 100644 --- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/kustomization.yaml @@ -1,16 +1,18 @@ resources: - - cluster-template.yaml - - role.yaml +- cluster-template.yaml +- role.yaml configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../../../withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../../../withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/self-hosted-clusterclass/kustomization.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/self-hosted-clusterclass/kustomization.yaml index 46eac83490..66825292c2 100644 --- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/self-hosted-clusterclass/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/self-hosted-clusterclass/kustomization.yaml @@ -1,26 +1,28 @@ resources: - - ../topology/cluster-template.yaml +- ../topology/cluster-template.yaml patches: - - path: ./self-hosted-variable.yaml - target: - group: cluster.x-k8s.io - version: v1beta1 - kind: Cluster - - path: ./limited-az-variable.yaml - target: - group: cluster.x-k8s.io - version: v1beta1 - kind: Cluster +- path: ./self-hosted-variable.yaml + target: + group: cluster.x-k8s.io + kind: Cluster + version: v1beta1 +- path: ./limited-az-variable.yaml + target: + group: cluster.x-k8s.io + kind: Cluster + version: v1beta1 configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/topology/kustomization.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/topology/kustomization.yaml index 58483691cd..2edbba5030 100644 --- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/topology/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/topology/kustomization.yaml @@ -1,16 +1,17 @@ resources: - - cluster-template.yaml +- cluster-template.yaml configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../../..//withoutclusterclass/kustomize_sources/addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../../../withoutclusterclass/kustomize_sources/addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated - +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/base/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/base/kustomization.yaml index d5709d2ab3..bc7ab04c05 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/base/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/base/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cluster-template.yaml +- cluster-template.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/csimigration-off/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/csimigration-off/kustomization.yaml index 1002eb881e..dfc9955066 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/csimigration-off/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/csimigration-off/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../intree-cloud-provider -patchesStrategicMerge: - - patches/csimigration-off.yaml +- ../intree-cloud-provider +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/csimigration-off.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/default/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/default/kustomization.yaml index 7935269ea4..4fd7b522d6 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/default/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/default/kustomization.yaml @@ -1,25 +1,26 @@ # default template enables external ccm and csi resources: - - ../base - - machine-deployment.yaml - - ../addons/cni/resources/cni-resource-set.yaml - - ../addons/ccm/resources/ccm-resource-set.yaml - - ../addons/csi/resources/csi-resource-set.yaml -patchesStrategicMerge: - - ../addons/cni/patches/cluster-cni.yaml - - ../addons/ccm/patches/external-cloud-provider.yaml - - ../addons/csi/patches/external-csi-provider.yaml +- ../base +- machine-deployment.yaml +- ../addons/cni/resources/cni-resource-set.yaml +- ../addons/ccm/resources/ccm-resource-set.yaml +- ../addons/csi/resources/csi-resource-set.yaml configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated - +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: ../addons/cni/patches/cluster-cni.yaml +- path: ../addons/ccm/patches/external-cloud-provider.yaml +- path: ../addons/csi/patches/external-csi-provider.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/efs-support/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/efs-support/kustomization.yaml index 6affa4e815..abd7672208 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/efs-support/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/efs-support/kustomization.yaml @@ -1,25 +1,26 @@ resources: - - ../base - - machine-deployment.yaml - - ../addons/cni/resources/cni-resource-set.yaml - - ../addons/ccm/resources/ccm-resource-set.yaml - - csi-resource-set.yaml -patchesStrategicMerge: - - ../addons/cni/patches/cluster-cni.yaml - - ../addons/ccm/patches/external-cloud-provider.yaml - - patches/efs-support.yaml - - patches/limit-az.yaml +- ../base +- machine-deployment.yaml +- ../addons/cni/resources/cni-resource-set.yaml +- ../addons/ccm/resources/ccm-resource-set.yaml +- csi-resource-set.yaml configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../addons/ccm/data/aws-ccm-external.yaml - - name: aws-efs-csi-driver-addon - files: - - aws-efs-csi-external.yaml +- files: + - ../addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - aws-efs-csi-external.yaml + name: aws-efs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated - +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: ../addons/cni/patches/cluster-cni.yaml +- path: ../addons/ccm/patches/external-cloud-provider.yaml +- path: patches/efs-support.yaml +- path: patches/limit-az.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-csi/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-csi/kustomization.yaml index 6bbe28dc2e..246323e6d8 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-csi/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-csi/kustomization.yaml @@ -1,16 +1,18 @@ # internal ccm and external csi installed resources: - - ../intree-cloud-provider - - ../addons/csi/resources/csi-resource-set.yaml -patchesStrategicMerge: - - ../addons/csi/patches/external-csi-provider.yaml +- ../intree-cloud-provider +- ../addons/csi/resources/csi-resource-set.yaml configMapGenerator: - - name: aws-ebs-csi-driver-addon - files: - - ../addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: ../addons/csi/patches/external-csi-provider.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-securitygroups/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-securitygroups/kustomization.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/gpu/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/gpu/kustomization.yaml index f759f934ac..bef5f3583e 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/gpu/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/gpu/kustomization.yaml @@ -1,19 +1,21 @@ resources: - - ../default - - gpu-resource-set.yaml -patchesStrategicMerge: - - patches/gpu-label.yaml - - patches/gpu-instance-type.yaml +- ../default +- gpu-resource-set.yaml configMapGenerator: - - name: nvidia-clusterpolicy-crd - files: - - clusterpolicy-crd.yaml - - name: nvidia-gpu-operator-components - files: - - gpu-operator-components.yaml +- files: + - clusterpolicy-crd.yaml + name: nvidia-clusterpolicy-crd +- files: + - gpu-operator-components.yaml + name: nvidia-gpu-operator-components generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/gpu-label.yaml +- path: patches/gpu-instance-type.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ignition/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ignition/kustomization.yaml index f110b7516e..93d2eaeb75 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ignition/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ignition/kustomization.yaml @@ -1,8 +1,10 @@ resources: - ../default -patchesStrategicMerge: -- patches/control-plane-ami.yaml -- patches/control-plane-ignition.yaml -- patches/s3bucket.yaml -- patches/worker-ami.yaml -- patches/worker-ignition.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/control-plane-ami.yaml +- path: patches/control-plane-ignition.yaml +- path: patches/s3bucket.yaml +- path: patches/worker-ami.yaml +- path: patches/worker-ignition.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/internal-elb/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/internal-elb/kustomization.yaml index afac1ffcc1..f17d127342 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/internal-elb/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/internal-elb/kustomization.yaml @@ -1,6 +1,7 @@ resources: - - ../remote-management-cluster -patchesStrategicMerge: - - patches/internal-elb.yaml - - patches/az-select.yaml - +- ../remote-management-cluster +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/internal-elb.yaml +- path: patches/az-select.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/intree-cloud-provider/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/intree-cloud-provider/kustomization.yaml index 7848d7d973..35ce10a1fe 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/intree-cloud-provider/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/intree-cloud-provider/kustomization.yaml @@ -1,6 +1,8 @@ resources: - - ../base - - machine-deployment.yaml - - ../addons/cni/resources/cni-resource-set.yaml -patchesStrategicMerge: - - ../addons/cni/patches/cluster-cni.yaml +- ../base +- machine-deployment.yaml +- ../addons/cni/resources/cni-resource-set.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: ../addons/cni/patches/cluster-cni.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-remediation/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-remediation/kustomization.yaml index bd515385e1..b6e05a90b8 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-remediation/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-remediation/kustomization.yaml @@ -1,3 +1,5 @@ resources: - - ../limit-az - - mhc.yaml +- ../limit-az +- mhc.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-scale-in/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-scale-in/kustomization.yaml index 061568d34e..6776c5e5d1 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-scale-in/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/kcp-scale-in/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../limit-az -patchesStrategicMerge: - - patches/kcp-surge.yaml +- ../limit-az +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/kcp-surge.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/limit-az/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/limit-az/kustomization.yaml index e5399ad3a5..a697e4e4a0 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/limit-az/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/limit-az/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../default -patchesStrategicMerge: - - patches/limit-az.yaml +- ../default +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/limit-az.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/machine-pool/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/machine-pool/kustomization.yaml index d3383fb72b..7a9939bb7e 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/machine-pool/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/machine-pool/kustomization.yaml @@ -1,25 +1,27 @@ resources: - - ../base - - machine-pool.yaml - - spot-instance-machine-pool.yaml - - ../addons/cni/resources/cni-resource-set.yaml - - ../addons/ccm/resources/ccm-resource-set.yaml - - ../addons/csi/resources/csi-resource-set.yaml -patchesStrategicMerge: - - ../addons/cni/patches/cluster-cni.yaml - - patches/external-csi-provider-controlplane.yaml - - ../addons/csi/patches/external-csi-provider.yaml - - patches/limit-az.yaml +- ../base +- machine-pool.yaml +- spot-instance-machine-pool.yaml +- ../addons/cni/resources/cni-resource-set.yaml +- ../addons/ccm/resources/ccm-resource-set.yaml +- ../addons/csi/resources/csi-resource-set.yaml configMapGenerator: - - name: cloud-controller-manager-addon - files: - - ../addons/ccm/data/aws-ccm-external.yaml - - name: aws-ebs-csi-driver-addon - files: - - ../addons/csi/data/aws-ebs-csi-external.yaml +- files: + - ../addons/ccm/data/aws-ccm-external.yaml + name: cloud-controller-manager-addon +- files: + - ../addons/csi/data/aws-ebs-csi-external.yaml + name: aws-ebs-csi-driver-addon generatorOptions: + annotations: + note: generated disableNameSuffixHash: true labels: type: generated - annotations: - note: generated \ No newline at end of file +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: ../addons/cni/patches/cluster-cni.yaml +- path: patches/external-csi-provider-controlplane.yaml +- path: ../addons/csi/patches/external-csi-provider.yaml +- path: patches/limit-az.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/md-remediation/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/md-remediation/kustomization.yaml index 9f17dae605..ca8310c1d9 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/md-remediation/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/md-remediation/kustomization.yaml @@ -1,5 +1,7 @@ resources: - - ../limit-az - - mhc.yaml -patchesStrategicMerge: - - patches/mhc-label.yaml +- ../limit-az +- mhc.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/mhc-label.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/multi-az/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/multi-az/kustomization.yaml index 9cc991fcd9..1810ac26b5 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/multi-az/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/multi-az/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../default -patchesStrategicMerge: - - patches/multi-az.yaml +- ../default +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/multi-az.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/kustomization.yaml index 4feec18fb9..9a596300d0 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/kustomization.yaml @@ -1,9 +1,11 @@ resources: - - ../limit-az - - role.yaml -patchesStrategicMerge: - - patches/role-identity.yaml +- ../limit-az +- role.yaml # This manifest is added to test bastion host creation. - - patches/bastion-enabled.yaml # This manifest is added to test subnet with filters in AWSMachineTemplate. - - patches/subnet-with-filters.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/role-identity.yaml +- path: patches/bastion-enabled.yaml +- path: patches/subnet-with-filters.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/peered-remote/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/peered-remote/kustomization.yaml index 40cfeb8089..8400c43888 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/peered-remote/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/peered-remote/kustomization.yaml @@ -1,8 +1,10 @@ resources: - - ../remote-management-cluster -patchesStrategicMerge: - - patches/management.yaml - - patches/az-select.yaml - - patches/external-securitygroups.yaml +- ../remote-management-cluster # This manifest is added to test additionalSecurityGroups with filters in AWSMachineTemplate. - - patches/additional-security-group.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/management.yaml +- path: patches/az-select.yaml +- path: patches/external-securitygroups.yaml +- path: patches/additional-security-group.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/remote-management-cluster/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/remote-management-cluster/kustomization.yaml index ff418c4d75..635f8b9fce 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/remote-management-cluster/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/remote-management-cluster/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../limit-az -patchesStrategicMerge: - - patches/image-injection.yaml +- ../limit-az +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/image-injection.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/kustomization.yaml index 2c6774b391..6a7da480ef 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/kustomization.yaml @@ -1,5 +1,7 @@ resources: - - ../limit-az - - role.yaml -patchesStrategicMerge: - - patches/role-identity.yaml +- ../limit-az +- role.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/role-identity.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/spot-instances/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/spot-instances/kustomization.yaml index b20d07ac50..1ef748872a 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/spot-instances/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/spot-instances/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../default -patchesStrategicMerge: - - patches/spot-instances.yaml +- ../default +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/spot-instances.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ssm/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ssm/kustomization.yaml index 6c806fe6bd..8c9f211b5b 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ssm/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/ssm/kustomization.yaml @@ -1,5 +1,7 @@ resources: - - ../default -patchesStrategicMerge: - - patches/ssm.yaml - - patches/elb-health-check-protocol.yaml +- ../default +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/ssm.yaml +- path: patches/elb-health-check-protocol.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-external-cloud-provider/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-external-cloud-provider/kustomization.yaml index 280c43ebd4..84c35d29ff 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-external-cloud-provider/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-external-cloud-provider/kustomization.yaml @@ -1,4 +1,6 @@ resources: - - ../default -patchesStrategicMerge: - - patches/upgrade-external-ccm.yaml \ No newline at end of file +- ../default +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patches/upgrade-external-ccm.yaml diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-main/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-main/kustomization.yaml index 925ed55e09..b2137a2d72 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-main/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrade-to-main/kustomization.yaml @@ -1,3 +1,5 @@ resources: - - ../default - - machinetemplates.yaml +- ../default +- machinetemplates.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrades/kustomization.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrades/kustomization.yaml index 78a780c629..400e90956f 100644 --- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrades/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/upgrades/kustomization.yaml @@ -1,3 +1,5 @@ resources: - - ../default - - machine-pool.yaml +- ../default +- machine-pool.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization