Skip to content

Commit c7cd59d

Browse files
author
Mengqi Yu
authored
bump go-yaml to the latest (#222) (#224)
1 parent f819082 commit c7cd59d

File tree

21 files changed

+72
-70
lines changed

21 files changed

+72
-70
lines changed

‎functions/go/apply-setters/apply_setters_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ spec:
9696
template:
9797
spec:
9898
containers:
99-
- name: nginx
100-
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
99+
- name: nginx
100+
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
101101
`,
102102
expectedResources: `apiVersion: apps/v1
103103
kind: Deployment
@@ -108,8 +108,8 @@ spec:
108108
template:
109109
spec:
110110
containers:
111-
- name: nginx
112-
image: ubuntu:1.8.0 # kpt-set: ${image}:${tag}
111+
- name: nginx
112+
image: ubuntu:1.8.0 # kpt-set: ${image}:${tag}
113113
`,
114114
},
115115
{
@@ -127,8 +127,8 @@ spec:
127127
template:
128128
spec:
129129
containers:
130-
- name: nginx
131-
image: nginx:1.7.9 # kpt-set: ${image}:${tag}`,
130+
- name: nginx
131+
image: nginx:1.7.9 # kpt-set: ${image}:${tag}`,
132132
expectedResources: `apiVersion: apps/v1
133133
kind: Deployment
134134
metadata:
@@ -138,8 +138,8 @@ spec:
138138
template:
139139
spec:
140140
containers:
141-
- name: nginx
142-
image: ubuntu:1.7.9 # kpt-set: ${image}:${tag}
141+
- name: nginx
142+
image: ubuntu:1.7.9 # kpt-set: ${image}:${tag}
143143
`,
144144
},
145145
{
@@ -157,8 +157,8 @@ spec:
157157
template:
158158
spec:
159159
containers:
160-
- name: nginx
161-
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
160+
- name: nginx
161+
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
162162
`,
163163
expectedResources: `apiVersion: apps/v1
164164
kind: Deployment
@@ -169,8 +169,8 @@ spec:
169169
template:
170170
spec:
171171
containers:
172-
- name: nginx
173-
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
172+
- name: nginx
173+
image: nginx:1.7.9 # kpt-set: ${image}:${tag}
174174
`,
175175
},
176176
{
@@ -188,8 +188,8 @@ spec:
188188
template:
189189
spec:
190190
containers:
191-
- image: irrelevant_value # kpt-set: ${image}:${tag}
192-
name: nginx
191+
- image: irrelevant_value # kpt-set: ${image}:${tag}
192+
name: nginx
193193
`,
194194
expectedResources: `apiVersion: apps/v1
195195
kind: Deployment
@@ -200,8 +200,8 @@ spec:
200200
template:
201201
spec:
202202
containers:
203-
- image: irrelevant_value # kpt-set: ${image}:${tag}
204-
name: nginx
203+
- image: irrelevant_value # kpt-set: ${image}:${tag}
204+
name: nginx
205205
`,
206206
errMsg: `values for setters [${tag}] must be provided`,
207207
},
@@ -219,17 +219,17 @@ metadata:
219219
name: nginx-deployment
220220
spec:
221221
images: # kpt-set: ${images}
222-
- nginx
223-
- ubuntu
222+
- nginx
223+
- ubuntu
224224
`,
225225
expectedResources: `apiVersion: apps/v1
226226
kind: Deployment
227227
metadata:
228228
name: nginx-deployment
229229
spec:
230230
images: # kpt-set: ${images}
231-
- ubuntu
232-
- hbase
231+
- ubuntu
232+
- hbase
233233
`,
234234
},
235235
{
@@ -244,17 +244,17 @@ metadata:
244244
name: nginx-deployment
245245
spec:
246246
images: # kpt-set: ${images}
247-
- nginx
248-
- ubuntu
247+
- nginx
248+
- ubuntu
249249
`,
250250
expectedResources: `apiVersion: apps/v1
251251
kind: Deployment
252252
metadata:
253253
name: nginx-deployment
254254
spec:
255255
images: # kpt-set: ${images}
256-
- nginx
257-
- ubuntu
256+
- nginx
257+
- ubuntu
258258
`,
259259
errMsg: `input to array setter must be an array of values`,
260260
},
@@ -271,17 +271,17 @@ metadata:
271271
name: nginx-deployment
272272
spec:
273273
images: # kpt-set: ${images}:${tag}
274-
- nginx
275-
- ubuntu
274+
- nginx
275+
- ubuntu
276276
`,
277277
expectedResources: `apiVersion: apps/v1
278278
kind: Deployment
279279
metadata:
280280
name: nginx-deployment
281281
spec:
282282
images: # kpt-set: ${images}:${tag}
283-
- nginx
284-
- ubuntu
283+
- nginx
284+
- ubuntu
285285
`,
286286
errMsg: `invalid setter pattern for array node: "${images}:${tag}"`,
287287
},

‎functions/go/apply-setters/generated/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎functions/go/apply-setters/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ go 1.15
44

55
require (
66
github.com/stretchr/testify v1.6.1
7+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
78
sigs.k8s.io/kustomize/kyaml v0.10.10
89
)

‎functions/go/apply-setters/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,8 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
499499
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
500500
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
501501
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
502+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
503+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
502504
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
503505
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
504506
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

‎functions/go/gatekeeper-validate/generated/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎functions/go/gatekeeper-validate/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.15
55
require (
66
github.com/open-policy-agent/frameworks/constraint v0.0.0-20201020161305-2e11d4556af8
77
github.com/open-policy-agent/gatekeeper v0.0.0-20210128025445-201a78d6096e // This is v3.3.0. It has a semver major version of 2 or higher and is not a Go module yet.
8+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
89
k8s.io/apimachinery v0.18.6
910
sigs.k8s.io/kustomize/kyaml v0.10.13
1011
sigs.k8s.io/yaml v1.2.0

‎functions/go/search-replace/generated/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎functions/go/search-replace/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ go 1.15
44

55
require (
66
github.com/stretchr/testify v1.6.1
7+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
78
sigs.k8s.io/kustomize/kyaml v0.10.10
89
)

‎functions/go/search-replace/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,8 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
499499
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
500500
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
501501
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
502+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
503+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
502504
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
503505
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
504506
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

‎functions/go/search-replace/putcommentcases_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ metadata:
7575
name: nginx-deployment
7676
spec:
7777
images:
78-
- nginx
79-
- ubuntu
78+
- nginx
79+
- ubuntu
8080
`,
8181
out: `${filePath}
8282
fieldPath: spec.images # kpt-set: ${image}
@@ -91,8 +91,8 @@ metadata:
9191
name: nginx-deployment
9292
spec:
9393
images: # kpt-set: ${image}
94-
- nginx
95-
- ubuntu
94+
- nginx
95+
- ubuntu
9696
`,
9797
},
9898
{
@@ -124,8 +124,8 @@ metadata:
124124
name: nginx-deployment
125125
spec:
126126
images: # kpt-set: ${image}
127-
- nginx
128-
- ubuntu
127+
- nginx
128+
- ubuntu
129129
non-matching-list: [foo, bar]
130130
`,
131131
},

0 commit comments

Comments
 (0)