diff --git a/hack/ensure-kustomize.sh b/hack/ensure-kustomize.sh index 3cf5148d4f..d57e0b5920 100755 --- a/hack/ensure-kustomize.sh +++ b/hack/ensure-kustomize.sh @@ -21,7 +21,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. BIN_ROOT="${KUBE_ROOT}/hack/tools/bin" -kustomize_version=3.9.1 +kustomize_version=5.2.1 goarch=amd64 goos="unknown" diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 2e53fc779d..217dcac765 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -11,14 +11,13 @@ require ( sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e sigs.k8s.io/controller-tools v0.13.0 - sigs.k8s.io/kustomize/kustomize/v5 v5.1.1 + sigs.k8s.io/kustomize/kustomize/v5 v5.2.1 ) require ( github.com/blang/semver v3.5.1+incompatible // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/fatih/color v1.15.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.2.4 // indirect @@ -64,6 +63,7 @@ require ( golang.org/x/tools v0.13.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -76,9 +76,9 @@ require ( k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect - sigs.k8s.io/kustomize/api v0.14.0 // indirect - sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect - sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect + sigs.k8s.io/kustomize/api v0.15.0 // indirect + sigs.k8s.io/kustomize/cmd/config v0.12.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 415e9a4add..db7226f80d 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -65,8 +65,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -586,6 +584,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v5 v5.6.0 h1:BMT6KIwBD9CaU91PJCZIe46bDmBWa9ynTQgJIOpfQBk= +gopkg.in/evanphx/json-patch.v5 v5.6.0/go.mod h1:/kvTRh1TVm5wuM6OkHxqXtE/1nUZZpihg29RtuIyfvk= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= @@ -635,14 +635,14 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d h1:KLiQzLW3RZJR19+j4pw2h5iioyAyqCkDBEAFdnGa3N8= sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d/go.mod h1:NRdZafr4zSCseLQggdvIMXa7umxf+Q+PJzrj3wFwiGE= -sigs.k8s.io/kustomize/api v0.14.0 h1:6+QLmXXA8X4eDM7ejeaNUyruA1DDB3PVIjbpVhDOJRA= -sigs.k8s.io/kustomize/api v0.14.0/go.mod h1:vmOXlC8BcmcUJQjiceUbcyQ75JBP6eg8sgoyzc+eLpQ= -sigs.k8s.io/kustomize/cmd/config v0.11.3 h1:QLukJoe/0sjhUrtylmBS1MXhvkdLtbpHJvAClXDra54= -sigs.k8s.io/kustomize/cmd/config v0.11.3/go.mod h1:ENTZ8Ds12gewUpdxF5PJq/9qPVQFd5VPvMIL11wrBIU= -sigs.k8s.io/kustomize/kustomize/v5 v5.1.1 h1:iq+1k9LaQupKcbUVLX8yvE62W6u0B5bXtyCmF5YUcH8= -sigs.k8s.io/kustomize/kustomize/v5 v5.1.1/go.mod h1:7kno0pHkt7k3Vg4/0IjpMxx1bzCi08gziU2CTa6UuvM= -sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs= -sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA= +sigs.k8s.io/kustomize/api v0.15.0 h1:6Ca88kEOBVotHDw+y2IsIMYtg9Pvv7MKpW9JMyF/OH4= +sigs.k8s.io/kustomize/api v0.15.0/go.mod h1:p19kb+E14gN7zcIBR/nhByJDAfUa7N8mp6ZdH/mMXbg= +sigs.k8s.io/kustomize/cmd/config v0.12.0 h1:EXkXg7Bq/wPaEe5sdNbLRI5J6eG+WarKNo5LRD+gCWU= +sigs.k8s.io/kustomize/cmd/config v0.12.0/go.mod h1:Ct/f74OFOVCO4KQ8PVGUXHQDjZO6yqwxhrvL/b/DkBM= +sigs.k8s.io/kustomize/kustomize/v5 v5.2.1 h1:bI0UnT+UJiEEl1BaomL71ESl3w5rJo2Aw6CpqxX4aS4= +sigs.k8s.io/kustomize/kustomize/v5 v5.2.1/go.mod h1:qzRni4VPV6LxTEY5eC5qH3+995Atdi9E46jiwArROik= +sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84= +sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/kustomize/v1alpha5/default/kustomization.yaml b/kustomize/v1alpha5/default/kustomization.yaml index dbb542a879..bc7ab04c05 100644 --- a/kustomize/v1alpha5/default/kustomization.yaml +++ b/kustomize/v1alpha5/default/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - cluster-template.yaml diff --git a/kustomize/v1alpha5/external-cloud-provider/kustomization.yaml b/kustomize/v1alpha5/external-cloud-provider/kustomization.yaml index 5a18b52ea4..f1239f1c40 100644 --- a/kustomize/v1alpha5/external-cloud-provider/kustomization.yaml +++ b/kustomize/v1alpha5/external-cloud-provider/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-ccm.yaml +patches: +- path: patch-ccm.yaml diff --git a/kustomize/v1alpha5/without-lb/kustomization.yaml b/kustomize/v1alpha5/without-lb/kustomization.yaml index 6eccfcc782..b12f7e5db4 100644 --- a/kustomize/v1alpha5/without-lb/kustomization.yaml +++ b/kustomize/v1alpha5/without-lb/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-without-lb.yaml +patches: +- path: patch-without-lb.yaml diff --git a/kustomize/v1alpha6/default/kustomization.yaml b/kustomize/v1alpha6/default/kustomization.yaml index dbb542a879..bc7ab04c05 100644 --- a/kustomize/v1alpha6/default/kustomization.yaml +++ b/kustomize/v1alpha6/default/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - cluster-template.yaml diff --git a/kustomize/v1alpha6/external-cloud-provider-flatcar/kustomization.yaml b/kustomize/v1alpha6/external-cloud-provider-flatcar/kustomization.yaml index cea562938e..ffb622bfc9 100644 --- a/kustomize/v1alpha6/external-cloud-provider-flatcar/kustomization.yaml +++ b/kustomize/v1alpha6/external-cloud-provider-flatcar/kustomization.yaml @@ -1,6 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-ccm.yaml -- patch-flatcar.yaml +patches: +- path: patch-ccm.yaml +- path: patch-flatcar.yaml diff --git a/kustomize/v1alpha6/external-cloud-provider/kustomization.yaml b/kustomize/v1alpha6/external-cloud-provider/kustomization.yaml index 5a18b52ea4..f1239f1c40 100644 --- a/kustomize/v1alpha6/external-cloud-provider/kustomization.yaml +++ b/kustomize/v1alpha6/external-cloud-provider/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-ccm.yaml +patches: +- path: patch-ccm.yaml diff --git a/kustomize/v1alpha6/flatcar/kustomization.yaml b/kustomize/v1alpha6/flatcar/kustomization.yaml index 1ad5cb6720..7332b6b51f 100644 --- a/kustomize/v1alpha6/flatcar/kustomization.yaml +++ b/kustomize/v1alpha6/flatcar/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-flatcar.yaml +patches: +- path: patch-flatcar.yaml diff --git a/kustomize/v1alpha6/without-lb/kustomization.yaml b/kustomize/v1alpha6/without-lb/kustomization.yaml index 6eccfcc782..b12f7e5db4 100644 --- a/kustomize/v1alpha6/without-lb/kustomization.yaml +++ b/kustomize/v1alpha6/without-lb/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-without-lb.yaml +patches: +- path: patch-without-lb.yaml diff --git a/kustomize/v1alpha7/default/kustomization.yaml b/kustomize/v1alpha7/default/kustomization.yaml index dbb542a879..bc7ab04c05 100644 --- a/kustomize/v1alpha7/default/kustomization.yaml +++ b/kustomize/v1alpha7/default/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - cluster-template.yaml diff --git a/kustomize/v1alpha7/flatcar/kustomization.yaml b/kustomize/v1alpha7/flatcar/kustomization.yaml index 1ad5cb6720..7332b6b51f 100644 --- a/kustomize/v1alpha7/flatcar/kustomization.yaml +++ b/kustomize/v1alpha7/flatcar/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-flatcar.yaml +patches: +- path: patch-flatcar.yaml diff --git a/kustomize/v1alpha7/without-lb/kustomization.yaml b/kustomize/v1alpha7/without-lb/kustomization.yaml index 6eccfcc782..b12f7e5db4 100644 --- a/kustomize/v1alpha7/without-lb/kustomization.yaml +++ b/kustomize/v1alpha7/without-lb/kustomization.yaml @@ -1,5 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - -patchesStrategicMerge: -- patch-without-lb.yaml +patches: +- path: patch-without-lb.yaml diff --git a/test/e2e/data/kustomize/default/kustomization.yaml b/test/e2e/data/kustomize/default/kustomization.yaml index b94b8990e2..9401c28fd2 100644 --- a/test/e2e/data/kustomize/default/kustomization.yaml +++ b/test/e2e/data/kustomize/default/kustomization.yaml @@ -1,7 +1,7 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../../../../../kustomize/v1alpha7/default - components: - ../common-patches/cni - ../upgrade-patches diff --git a/test/e2e/data/kustomize/flatcar/kustomization.yaml b/test/e2e/data/kustomize/flatcar/kustomization.yaml index 22a911e357..2f3f5d1359 100644 --- a/test/e2e/data/kustomize/flatcar/kustomization.yaml +++ b/test/e2e/data/kustomize/flatcar/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../../../../../kustomize/v1alpha7/flatcar diff --git a/test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml b/test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml index 5a9e9011df..46e9bbe720 100644 --- a/test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml +++ b/test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - upgrade-from-template.yaml diff --git a/test/e2e/data/kustomize/kcp-remediation/kustomization.yaml b/test/e2e/data/kustomize/kcp-remediation/kustomization.yaml index 8f3bb9ea03..99e374d157 100644 --- a/test/e2e/data/kustomize/kcp-remediation/kustomization.yaml +++ b/test/e2e/data/kustomize/kcp-remediation/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - mhc.yaml diff --git a/test/e2e/data/kustomize/md-remediation/kustomization.yaml b/test/e2e/data/kustomize/md-remediation/kustomization.yaml index 4e29c81d4b..cf5086c9e2 100644 --- a/test/e2e/data/kustomize/md-remediation/kustomization.yaml +++ b/test/e2e/data/kustomize/md-remediation/kustomization.yaml @@ -1,7 +1,8 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default - mhc.yaml -patchesStrategicMerge: -- md.yaml +patches: +- path: md.yaml diff --git a/test/e2e/data/kustomize/multi-az/kustomization.yaml b/test/e2e/data/kustomize/multi-az/kustomization.yaml index cbb409dd67..2a9ec0e397 100644 --- a/test/e2e/data/kustomize/multi-az/kustomization.yaml +++ b/test/e2e/data/kustomize/multi-az/kustomization.yaml @@ -1,21 +1,22 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default patches: -- target: +- path: patch-control-plane.yaml + target: kind: OpenStackCluster name: \${CLUSTER_NAME} - path: patch-control-plane.yaml -- target: +- path: patch-machine-deployment.yaml + target: kind: MachineDeployment name: \${CLUSTER_NAME}-md-0 - path: patch-machine-deployment.yaml -- target: +- path: patch-machine-template-control-plane.yaml + target: kind: OpenStackMachineTemplate name: \${CLUSTER_NAME}-control-plane - path: patch-machine-template-control-plane.yaml -- target: +- path: patch-machine-template-worker.yaml + target: kind: OpenStackMachineTemplate name: \${CLUSTER_NAME}-md-0 - path: patch-machine-template-worker.yaml diff --git a/test/e2e/data/kustomize/multi-network/kustomization.yaml b/test/e2e/data/kustomize/multi-network/kustomization.yaml index 553a7c0028..b162f712cb 100644 --- a/test/e2e/data/kustomize/multi-network/kustomization.yaml +++ b/test/e2e/data/kustomize/multi-network/kustomization.yaml @@ -1,8 +1,9 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default patches: -- target: +- path: patch-machine-template-networks.yaml + target: kind: OpenStackMachineTemplate - path: patch-machine-template-networks.yaml diff --git a/test/e2e/data/kustomize/upgrade-patches/kustomization.yaml b/test/e2e/data/kustomize/upgrade-patches/kustomization.yaml index e2e0b835f8..678a6a6d7c 100644 --- a/test/e2e/data/kustomize/upgrade-patches/kustomization.yaml +++ b/test/e2e/data/kustomize/upgrade-patches/kustomization.yaml @@ -1,14 +1,13 @@ # Modifications to release templates for clusterctl upgrade scenarios ---- apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component patches: -- target: +- path: ci-hack-kcp.yaml + target: kind: KubeadmControlPlane name: \${CLUSTER_NAME}-control-plane - path: ci-hack-kcp.yaml -- target: +- path: ci-hack-kct.yaml + target: kind: KubeadmConfigTemplate name: \${CLUSTER_NAME}-md-0 - path: ci-hack-kct.yaml diff --git a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml b/test/e2e/data/kustomize/v1alpha5/kustomization.yaml index 882cff4031..d11eead116 100644 --- a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml +++ b/test/e2e/data/kustomize/v1alpha5/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../../../../../kustomize/v1alpha5/external-cloud-provider diff --git a/test/e2e/data/kustomize/v1alpha6/kustomization.yaml b/test/e2e/data/kustomize/v1alpha6/kustomization.yaml index 68a816f8cf..f455c1d60c 100644 --- a/test/e2e/data/kustomize/v1alpha6/kustomization.yaml +++ b/test/e2e/data/kustomize/v1alpha6/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../../../../../kustomize/v1alpha6/external-cloud-provider @@ -7,9 +8,7 @@ components: - ../common-patches/ccm patches: -- target: - kind: OpenStackMachineTemplate - patch: |- +- patch: |- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha6 kind: OpenStackMachineTemplate metadata: @@ -19,3 +18,5 @@ patches: spec: networks: - {} + target: + kind: OpenStackMachineTemplate diff --git a/test/e2e/data/kustomize/with-tags/kustomization.yaml b/test/e2e/data/kustomize/with-tags/kustomization.yaml index e7f7649b0e..712f1033de 100644 --- a/test/e2e/data/kustomize/with-tags/kustomization.yaml +++ b/test/e2e/data/kustomize/with-tags/kustomization.yaml @@ -1,17 +1,18 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../default patches: -- target: +- path: patch-cluster.yaml + target: kind: OpenStackCluster name: \${CLUSTER_NAME} - path: patch-cluster.yaml -- target: +- path: patch-machine-template-control-plane.yaml + target: kind: OpenStackMachineTemplate name: \${CLUSTER_NAME}-control-plane - path: patch-machine-template-control-plane.yaml -- target: +- path: patch-machine-template-worker.yaml + target: kind: OpenStackMachineTemplate name: \${CLUSTER_NAME}-md-0 - path: patch-machine-template-worker.yaml diff --git a/test/e2e/data/kustomize/without-lb/kustomization.yaml b/test/e2e/data/kustomize/without-lb/kustomization.yaml index 47a4f9ea92..76ea83bb0f 100644 --- a/test/e2e/data/kustomize/without-lb/kustomization.yaml +++ b/test/e2e/data/kustomize/without-lb/kustomization.yaml @@ -1,4 +1,5 @@ ---- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - ../../../../../kustomize/v1alpha7/without-lb