Skip to content

Commit 292abc1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#1735 from Nordix/mquhuy/fix-kustomize-syntax
✨ Use kustomize new syntax for patches
2 parents f28da18 + 83f22d4 commit 292abc1

File tree

26 files changed

+102
-79
lines changed

26 files changed

+102
-79
lines changed

‎hack/ensure-kustomize.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -o pipefail
2121
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
BIN_ROOT="${KUBE_ROOT}/hack/tools/bin"
2323

24-
kustomize_version=3.9.1
24+
kustomize_version=5.2.1
2525

2626
goarch=amd64
2727
goos="unknown"

‎hack/tools/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ require (
1111
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
1212
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
1313
sigs.k8s.io/controller-tools v0.13.0
14-
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1
14+
sigs.k8s.io/kustomize/kustomize/v5 v5.2.1
1515
)
1616

1717
require (
1818
github.com/blang/semver v3.5.1+incompatible // indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
21-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2221
github.com/fatih/color v1.15.0 // indirect
2322
github.com/go-errors/errors v1.4.2 // indirect
2423
github.com/go-logr/logr v1.2.4 // indirect
@@ -64,6 +63,7 @@ require (
6463
golang.org/x/tools v0.13.0 // indirect
6564
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
6665
google.golang.org/protobuf v1.30.0 // indirect
66+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
6767
gopkg.in/inf.v0 v0.9.1 // indirect
6868
gopkg.in/yaml.v2 v2.4.0 // indirect
6969
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -76,9 +76,9 @@ require (
7676
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
7777
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7878
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
79-
sigs.k8s.io/kustomize/api v0.14.0 // indirect
80-
sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect
81-
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
79+
sigs.k8s.io/kustomize/api v0.15.0 // indirect
80+
sigs.k8s.io/kustomize/cmd/config v0.12.0 // indirect
81+
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
8282
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8383
sigs.k8s.io/yaml v1.3.0 // indirect
8484
)

‎hack/tools/go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
6565
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
6666
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
6767
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
68-
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
69-
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
7068
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
7169
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
7270
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
586584
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
587585
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
588586
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
587+
gopkg.in/evanphx/json-patch.v5 v5.6.0 h1:BMT6KIwBD9CaU91PJCZIe46bDmBWa9ynTQgJIOpfQBk=
588+
gopkg.in/evanphx/json-patch.v5 v5.6.0/go.mod h1:/kvTRh1TVm5wuM6OkHxqXtE/1nUZZpihg29RtuIyfvk=
589589
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
590590
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
591591
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
635635
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
636636
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d h1:KLiQzLW3RZJR19+j4pw2h5iioyAyqCkDBEAFdnGa3N8=
637637
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d/go.mod h1:NRdZafr4zSCseLQggdvIMXa7umxf+Q+PJzrj3wFwiGE=
638-
sigs.k8s.io/kustomize/api v0.14.0 h1:6+QLmXXA8X4eDM7ejeaNUyruA1DDB3PVIjbpVhDOJRA=
639-
sigs.k8s.io/kustomize/api v0.14.0/go.mod h1:vmOXlC8BcmcUJQjiceUbcyQ75JBP6eg8sgoyzc+eLpQ=
640-
sigs.k8s.io/kustomize/cmd/config v0.11.3 h1:QLukJoe/0sjhUrtylmBS1MXhvkdLtbpHJvAClXDra54=
641-
sigs.k8s.io/kustomize/cmd/config v0.11.3/go.mod h1:ENTZ8Ds12gewUpdxF5PJq/9qPVQFd5VPvMIL11wrBIU=
642-
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1 h1:iq+1k9LaQupKcbUVLX8yvE62W6u0B5bXtyCmF5YUcH8=
643-
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1/go.mod h1:7kno0pHkt7k3Vg4/0IjpMxx1bzCi08gziU2CTa6UuvM=
644-
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
645-
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
638+
sigs.k8s.io/kustomize/api v0.15.0 h1:6Ca88kEOBVotHDw+y2IsIMYtg9Pvv7MKpW9JMyF/OH4=
639+
sigs.k8s.io/kustomize/api v0.15.0/go.mod h1:p19kb+E14gN7zcIBR/nhByJDAfUa7N8mp6ZdH/mMXbg=
640+
sigs.k8s.io/kustomize/cmd/config v0.12.0 h1:EXkXg7Bq/wPaEe5sdNbLRI5J6eG+WarKNo5LRD+gCWU=
641+
sigs.k8s.io/kustomize/cmd/config v0.12.0/go.mod h1:Ct/f74OFOVCO4KQ8PVGUXHQDjZO6yqwxhrvL/b/DkBM=
642+
sigs.k8s.io/kustomize/kustomize/v5 v5.2.1 h1:bI0UnT+UJiEEl1BaomL71ESl3w5rJo2Aw6CpqxX4aS4=
643+
sigs.k8s.io/kustomize/kustomize/v5 v5.2.1/go.mod h1:qzRni4VPV6LxTEY5eC5qH3+995Atdi9E46jiwArROik=
644+
sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=
645+
sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=
646646
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
647647
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
648648
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

‎kustomize/v1alpha5/default/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- cluster-template.yaml

‎kustomize/v1alpha5/external-cloud-provider/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-ccm.yaml
5+
patches:
6+
- path: patch-ccm.yaml

‎kustomize/v1alpha5/without-lb/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-without-lb.yaml
5+
patches:
6+
- path: patch-without-lb.yaml

‎kustomize/v1alpha6/default/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- cluster-template.yaml

‎kustomize/v1alpha6/external-cloud-provider-flatcar/kustomization.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-ccm.yaml
6-
- patch-flatcar.yaml
5+
patches:
6+
- path: patch-ccm.yaml
7+
- path: patch-flatcar.yaml

‎kustomize/v1alpha6/external-cloud-provider/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-ccm.yaml
5+
patches:
6+
- path: patch-ccm.yaml

‎kustomize/v1alpha6/flatcar/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-flatcar.yaml
5+
patches:
6+
- path: patch-flatcar.yaml

‎kustomize/v1alpha6/without-lb/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-without-lb.yaml
5+
patches:
6+
- path: patch-without-lb.yaml

‎kustomize/v1alpha7/default/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- cluster-template.yaml

‎kustomize/v1alpha7/flatcar/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-flatcar.yaml
5+
patches:
6+
- path: patch-flatcar.yaml

‎kustomize/v1alpha7/without-lb/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- ../default
3-
4-
patchesStrategicMerge:
5-
- patch-without-lb.yaml
5+
patches:
6+
- path: patch-without-lb.yaml

‎test/e2e/data/kustomize/default/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../../../../../kustomize/v1alpha7/default
4-
55
components:
66
- ../common-patches/cni
77
- ../upgrade-patches

‎test/e2e/data/kustomize/flatcar/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../../../../../kustomize/v1alpha7/flatcar
45

‎test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45
- upgrade-from-template.yaml

‎test/e2e/data/kustomize/kcp-remediation/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45
- mhc.yaml

‎test/e2e/data/kustomize/md-remediation/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45
- mhc.yaml
56

6-
patchesStrategicMerge:
7-
- md.yaml
7+
patches:
8+
- path: md.yaml

‎test/e2e/data/kustomize/multi-az/kustomization.yaml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45

56
patches:
6-
- target:
7+
- path: patch-control-plane.yaml
8+
target:
79
kind: OpenStackCluster
810
name: \${CLUSTER_NAME}
9-
path: patch-control-plane.yaml
10-
- target:
11+
- path: patch-machine-deployment.yaml
12+
target:
1113
kind: MachineDeployment
1214
name: \${CLUSTER_NAME}-md-0
13-
path: patch-machine-deployment.yaml
14-
- target:
15+
- path: patch-machine-template-control-plane.yaml
16+
target:
1517
kind: OpenStackMachineTemplate
1618
name: \${CLUSTER_NAME}-control-plane
17-
path: patch-machine-template-control-plane.yaml
18-
- target:
19+
- path: patch-machine-template-worker.yaml
20+
target:
1921
kind: OpenStackMachineTemplate
2022
name: \${CLUSTER_NAME}-md-0
21-
path: patch-machine-template-worker.yaml

‎test/e2e/data/kustomize/multi-network/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45

56
patches:
6-
- target:
7+
- path: patch-machine-template-networks.yaml
8+
target:
79
kind: OpenStackMachineTemplate
8-
path: patch-machine-template-networks.yaml

‎test/e2e/data/kustomize/upgrade-patches/kustomization.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Modifications to release templates for clusterctl upgrade scenarios
2-
---
32
apiVersion: kustomize.config.k8s.io/v1alpha1
43
kind: Component
54

65
patches:
7-
- target:
6+
- path: ci-hack-kcp.yaml
7+
target:
88
kind: KubeadmControlPlane
99
name: \${CLUSTER_NAME}-control-plane
10-
path: ci-hack-kcp.yaml
11-
- target:
10+
- path: ci-hack-kct.yaml
11+
target:
1212
kind: KubeadmConfigTemplate
1313
name: \${CLUSTER_NAME}-md-0
14-
path: ci-hack-kct.yaml

‎test/e2e/data/kustomize/v1alpha5/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../../../../../kustomize/v1alpha5/external-cloud-provider
45

‎test/e2e/data/kustomize/v1alpha6/kustomization.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../../../../../kustomize/v1alpha6/external-cloud-provider
45

@@ -7,9 +8,7 @@ components:
78
- ../common-patches/ccm
89

910
patches:
10-
- target:
11-
kind: OpenStackMachineTemplate
12-
patch: |-
11+
- patch: |-
1312
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha6
1413
kind: OpenStackMachineTemplate
1514
metadata:
@@ -19,3 +18,5 @@ patches:
1918
spec:
2019
networks:
2120
- {}
21+
target:
22+
kind: OpenStackMachineTemplate

‎test/e2e/data/kustomize/with-tags/kustomization.yaml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../default
45

56
patches:
6-
- target:
7+
- path: patch-cluster.yaml
8+
target:
79
kind: OpenStackCluster
810
name: \${CLUSTER_NAME}
9-
path: patch-cluster.yaml
10-
- target:
11+
- path: patch-machine-template-control-plane.yaml
12+
target:
1113
kind: OpenStackMachineTemplate
1214
name: \${CLUSTER_NAME}-control-plane
13-
path: patch-machine-template-control-plane.yaml
14-
- target:
15+
- path: patch-machine-template-worker.yaml
16+
target:
1517
kind: OpenStackMachineTemplate
1618
name: \${CLUSTER_NAME}-md-0
17-
path: patch-machine-template-worker.yaml

‎test/e2e/data/kustomize/without-lb/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
---
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
23
resources:
34
- ../../../../../kustomize/v1alpha7/without-lb
45

0 commit comments

Comments
 (0)