Skip to content

Commit aa3b6cc

Browse files
committed
Update kyaml to v0.13.0
Updating kyaml to match the version we use in other components. This version's most significant change for us would be that kyaml will no longer override indentations in the targeted files. Signed-off-by: Aurel Canciu <[email protected]>
1 parent e023a12 commit aa3b6cc

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

controllers/testdata/appconfig-expected/deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ spec:
66
template:
77
spec:
88
containers:
9-
- name: hello
10-
image: helloworld:1.0.1 # SETTER_SITE
9+
- name: hello
10+
image: helloworld:1.0.1 # SETTER_SITE

controllers/testdata/appconfig-expected2/deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ spec:
66
template:
77
spec:
88
containers:
9-
- name: hello
10-
image: helloworld:1.2.0 # SETTER_SITE
9+
- name: hello
10+
image: helloworld:1.2.0 # SETTER_SITE

controllers/testdata/appconfig-setters-expected/deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ spec:
66
template:
77
spec:
88
containers:
9-
- name: hello
10-
image: helloworld:1.0.1 # SETTER_SITE
9+
- name: hello
10+
image: helloworld:1.0.1 # SETTER_SITE

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,5 @@ require (
125125
sigs.k8s.io/yaml v1.3.0 // indirect
126126
)
127127

128-
// pink kyaml to prevent indent changes
129-
replace sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.10.21
128+
// pin kustomize to v4.4.1
129+
replace sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,8 +1658,8 @@ sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH8
16581658
sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8=
16591659
sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs=
16601660
sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcLwfqwzTRHW3kv5go=
1661-
sigs.k8s.io/kustomize/kyaml v0.10.21 h1:KdoEgz3HzmcaLUTFqs6aaqFpsaA9MVRIwOZbi8vMaD0=
1662-
sigs.k8s.io/kustomize/kyaml v0.10.21/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c=
1661+
sigs.k8s.io/kustomize/kyaml v0.13.0 h1:9c+ETyNfSrVhxvphs+K2dzT3dh5oVPPEqPOE/cUpScY=
1662+
sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
16631663
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
16641664
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
16651665
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=

pkg/update/testdata/replace/expected/cronjob.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
template:
1111
spec:
1212
containers:
13-
- name: c
14-
image: used:v1.1.0
13+
- name: c
14+
image: used:v1.1.0

pkg/update/testdata/replace/expected/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
template:
88
spec:
99
containers:
10-
- name: c
11-
image: used:v1.1.0
10+
- name: c
11+
image: used:v1.1.0

pkg/update/testdata/setters/expected/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
5-
- unimportant.yaml
5+
- unimportant.yaml
66
images:
7-
- name: container
8-
newName: index.repo.fake/updated # {"$imagepolicy": "automation-ns:policy:name"}
9-
newTag: v1.0.1 # {"$imagepolicy": "automation-ns:policy:tag"}
7+
- name: container
8+
newName: index.repo.fake/updated # {"$imagepolicy": "automation-ns:policy:name"}
9+
newTag: v1.0.1 # {"$imagepolicy": "automation-ns:policy:tag"}

pkg/update/testdata/setters/expected/marked.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
template:
1111
spec:
1212
containers:
13-
- name: c
14-
image: index.repo.fake/updated:v1.0.1 # {"$imagepolicy": "automation-ns:policy"}
15-
- name: d
16-
image: image:v1.0.0 # {"$imagepolicy": "automation-ns:unchanged"}
13+
- name: c
14+
image: index.repo.fake/updated:v1.0.1 # {"$imagepolicy": "automation-ns:policy"}
15+
- name: d
16+
image: image:v1.0.0 # {"$imagepolicy": "automation-ns:unchanged"}

0 commit comments

Comments
 (0)