Skip to content

Commit ac17e15

Browse files
author
Mengqi Yu
authored
upgrade to kyaml 0.13.0+ (#2603)
* upgrade to kyaml 0.13.0+ * use the latest kyaml
1 parent cbd93fa commit ac17e15

File tree

26 files changed

+75
-100
lines changed

26 files changed

+75
-100
lines changed

e2e/testdata/fn-eval/error-in-pipe/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ stdErr: |
1717
[RUNNING] "gcr.io/kpt-fn/set-namespace:v0.1.3"
1818
[FAIL] "gcr.io/kpt-fn/set-namespace:v0.1.3" in 0s
1919
Results:
20-
[ERROR] failed to configure function: input namespace cannot be empty
20+
[error]: failed to configure function: input namespace cannot be empty
2121
Stderr:
2222
"[error] /// : failed to configure function: input namespace cannot be empty"
2323
Exit code: 1

e2e/testdata/fn-eval/out-of-place-fnchain-stdout/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ stdErr: |
66
[RUNNING] "gcr.io/kpt-fn/set-labels:v0.1.3"
77
[PASS] "gcr.io/kpt-fn/set-labels:v0.1.3" in 0s
88
stdOut: |
9-
apiVersion: config.kubernetes.io/v1alpha1
9+
apiVersion: config.kubernetes.io/v1
1010
kind: ResourceList
1111
items:
1212
# Copyright 2021 Google LLC

e2e/testdata/fn-eval/output-to-stdout/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
stdOut: |
16-
apiVersion: config.kubernetes.io/v1alpha1
16+
apiVersion: config.kubernetes.io/v1
1717
kind: ResourceList
1818
items:
1919
- # Copyright 2021 Google LLC

e2e/testdata/fn-eval/structured-results-in-stdout/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ testType: eval
2020
image: gcr.io/kpt-fn/search-replace:v0.1
2121
fnConfig: ../search-replace-conf.yaml
2222
# Non-error messages should be printed to stderr
23-
stdErr: "[INFO]"
23+
stdErr: "[info]"

e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# non-zero exit code and no changes in the resources.
1717
exitCode: 1
1818
disableOutputTruncate: true
19-
stdErr: '[ERROR] Invalid type. Expected: [integer,null], given: string in object "apps/v1/Deployment/nginx-deployment" in file "resources.yaml" in field "spec.replicas"'
19+
stdErr: '[error] apps/v1/Deployment/nginx-deployment spec.replicas: Invalid type. Expected: [integer,null], given: string'

e2e/testdata/fn-render/fn-failure/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ stdErr: |
1919
[RUNNING] "gcr.io/kpt-fn/starlark:v0.2.1"
2020
[FAIL] "gcr.io/kpt-fn/starlark:v0.2.1" in 0s
2121
Results:
22-
[ERROR] httpbin-gen:4:1: got newline, want primary expression
22+
[error]: httpbin-gen:4:1: got newline, want primary expression
2323
Stderr:
2424
"[error] : httpbin-gen:4:1: got newline, want primary expression"

e2e/testdata/fn-render/fnresult-fn-failure/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# One of the functions in the pipeline fails resulting in
1616
# non-zero exit code and no changes in the resources.
1717
exitCode: 1
18-
stdErr: '[ERROR] Invalid type. Expected: [integer,null], given: string in object "apps/v1/Deployment/nginx-deployment" in file "resources.yaml" in field "spec.replicas"'
18+
stdErr: '[error] apps/v1/Deployment/nginx-deployment spec.replicas: Invalid type. Expected: [integer,null], given: string'

e2e/testdata/fn-render/kubeval-failure/.expected/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
# One of the functions in the pipeline fails resulting in
1616
# non-zero exit code and no changes in the resources.
1717
exitCode: 1
18-
stdErr: '[ERROR] selector is required in object "apps/v1/Deployment/nginx-deployment" in file "resources.yaml" in field "selector"'

e2e/testdata/fn-render/out-of-place-fnchain-stdout-results/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
stdOut: |
2-
apiVersion: config.kubernetes.io/v1alpha1
2+
apiVersion: config.kubernetes.io/v1
33
kind: ResourceList
44
items:
55
# Copyright 2021 Google LLC

e2e/testdata/fn-render/out-of-place-fnchain-stdout/.expected/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stdErr: |
88
[PASS] "gcr.io/kpt-fn/set-labels:v0.1.3" in 0s
99
1010
stdOut: |
11-
apiVersion: config.kubernetes.io/v1alpha1
11+
apiVersion: config.kubernetes.io/v1
1212
kind: ResourceList
1313
items:
1414
# Copyright 2021 Google LLC

0 commit comments

Comments
 (0)