Skip to content

Commit 47255bb

Browse files
aravindtgaaravindtga
authored
update e2e expected outputs for kpt status block changes (#1227)
* update e2e expected outputs for kpt status block changes Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech> * Update E2E tests to support status.renderStatus changes Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech> --------- Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>
1 parent 5a41d88 commit 47255bb

59 files changed

Lines changed: 1503 additions & 9 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contrib/examples/delete-annotations-simple/.expected/diff.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index fee8bad..1dcb34b 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -7,3 +7,19 @@ pipeline:
6+
- image: ghcr.io/kptdev/krm-functions-catalog/krm-fn-contrib/delete-annotations:latest
7+
configMap:
8+
annotationKeys: annotation-to-delete
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ mutationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/krm-fn-contrib/delete-annotations:latest
17+
+ exitCode: 0
18+
+ results:
19+
+ - message: The provided annotations were deleted from 1 resource(s)
20+
+ severity: info
21+
+ - message: 'Annonation: [annotation-to-delete] removed from resource: [the-map]'
22+
+ severity: info
23+
+ file:
24+
+ path: resources.yaml
125
diff --git a/resources.yaml b/resources.yaml
226
index f8ec01d..bcc8f78 100644
327
--- a/resources.yaml

‎examples/apply-replacements-simple/.expected/diff.patch‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index f3843da..334d29f 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -8,3 +8,12 @@ pipeline:
6+
mutators:
7+
- image: ghcr.io/kptdev/krm-functions-catalog/apply-replacements:latest
8+
configPath: replacements.yaml
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ mutationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/apply-replacements:latest
17+
+ exitCode: 0
118
diff --git a/job.yaml b/job.yaml
219
index 4584bb9..66f3ebe 100644
320
--- a/job.yaml

‎examples/apply-setters-simple/.expected/diff.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index 152ea13..6eaff9b 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -8,3 +8,28 @@ pipeline:
6+
mutators:
7+
- image: ghcr.io/kptdev/krm-functions-catalog/apply-setters:latest
8+
configPath: setters.yaml
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ mutationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/apply-setters:latest
17+
+ exitCode: 0
18+
+ results:
19+
+ - message: set field value to "3"
20+
+ field:
21+
+ path: spec.replicas
22+
+ file:
23+
+ path: resources.yaml
24+
+ - message: set field value to "nginx:1.16.2"
25+
+ field:
26+
+ path: spec.template.spec.containers[0].image
27+
+ file:
28+
+ path: resources.yaml
29+
+ - message: set field value to "- prod\n- dev"
30+
+ field:
31+
+ path: environments
32+
+ file:
33+
+ path: resources.yaml
134
diff --git a/resources.yaml b/resources.yaml
235
index b521905..0d10662 100644
336
--- a/resources.yaml

‎examples/create-setters-simple/.expected/config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This is temporary fix. Should be removed once the fix for https://github.com/kptdev/kpt/issues/4462 is released.
2+
diffStripRegEx: "^\\+\\s+(results:|- message:|field:|path:|file:|severity:)"

‎examples/create-setters-simple/.expected/diff.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index 5aa759e..8ac91d5 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -11,3 +11,38 @@ pipeline:
6+
selectors:
7+
- kind: Deployment
8+
- kind: MyKind
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ mutationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/create-setters:latest
17+
+ exitCode: 0
18+
+ results:
19+
+ - message: 'Added line comment "kpt-set: /tmp/kpt-pipeline-e2e-39110${nginx-replicas}1686/create-setters-simple" for field with value "/tmp/kpt-pipeline-e2e-3911041686/create-setters-simple"'
20+
+ field:
21+
+ path: metadata.annotations.internal.config.kubernetes.io/package-path
22+
+ file:
23+
+ path: resources.yaml
24+
+ - message: 'Added line comment "kpt-set: ${nginx-replicas}" for field with value "4"'
25+
+ field:
26+
+ path: spec.replicas
27+
+ file:
28+
+ path: resources.yaml
29+
+ - message: 'Added line comment "kpt-set: nginx:${tag}" for field with value "nginx:1.16.1"'
30+
+ field:
31+
+ path: spec.template.spec.containers[0].image
32+
+ file:
33+
+ path: resources.yaml
34+
+ - message: 'Added line comment "kpt-set: ${env}" for field with value "[dev stage]"'
35+
+ field:
36+
+ path: environments
37+
+ file:
38+
+ path: resources.yaml
39+
+ - message: 'Added line comment "kpt-set: /tmp/kpt-pipeline-e2e-39110${nginx-replicas}1686/create-setters-simple" for field with value "/tmp/kpt-pipeline-e2e-3911041686/create-setters-simple"'
40+
+ field:
41+
+ path: metadata.annotations.internal.config.kubernetes.io/package-path
42+
+ file:
43+
+ path: resources.yaml
144
diff --git a/resources.yaml b/resources.yaml
245
index 716ecb9..b521905 100644
346
--- a/resources.yaml

‎examples/gatekeeper-disallow-root-user/.expected/diff.patch‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index 0d32b6f..b9e2ee6 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -7,3 +7,41 @@ metadata:
6+
pipeline:
7+
validators:
8+
- image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "False"
13+
+ reason: RenderFailed
14+
+ message: |-
15+
+ pkg.render: pkg .:
16+
+ pipeline.run: already handled error
17+
+ renderStatus:
18+
+ validationSteps:
19+
+ - image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
20+
+ stderr: |-
21+
+ [error] apps/v1/Deployment/nginx-deploy : Containers must not run as root
22+
+ violatedConstraint: disallowroot
23+
+ exitCode: 1
24+
+ results:
25+
+ - message: |-
26+
+ Containers must not run as root
27+
+ violatedConstraint: disallowroot
28+
+ severity: error
29+
+ resourceRef:
30+
+ apiVersion: apps/v1
31+
+ kind: Deployment
32+
+ name: nginx-deploy
33+
+ file:
34+
+ path: deployment.yaml
35+
+ errorResults:
36+
+ - message: |-
37+
+ Containers must not run as root
38+
+ violatedConstraint: disallowroot
39+
+ severity: error
40+
+ resourceRef:
41+
+ apiVersion: apps/v1
42+
+ kind: Deployment
43+
+ name: nginx-deploy
44+
+ file:
45+
+ path: deployment.yaml
46+
+ errorSummary: 'ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest: exit code 1'

‎examples/gatekeeper-invalid-configmap/.expected/diff.patch‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index 0d32b6f..9abb071 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -7,3 +7,43 @@ metadata:
6+
pipeline:
7+
validators:
8+
- image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "False"
13+
+ reason: RenderFailed
14+
+ message: |-
15+
+ pkg.render: pkg .:
16+
+ pipeline.run: already handled error
17+
+ renderStatus:
18+
+ validationSteps:
19+
+ - image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
20+
+ stderr: |-
21+
+ [error] v1/ConfigMap/default/super-secret : The following banned keys are being used in the ConfigMap: {"private_key"}
22+
+ violatedConstraint: no-secrets-in-configmap
23+
+ exitCode: 1
24+
+ results:
25+
+ - message: |-
26+
+ The following banned keys are being used in the ConfigMap: {"private_key"}
27+
+ violatedConstraint: no-secrets-in-configmap
28+
+ severity: error
29+
+ resourceRef:
30+
+ apiVersion: v1
31+
+ kind: ConfigMap
32+
+ name: super-secret
33+
+ namespace: default
34+
+ file:
35+
+ path: config-map.yaml
36+
+ errorResults:
37+
+ - message: |-
38+
+ The following banned keys are being used in the ConfigMap: {"private_key"}
39+
+ violatedConstraint: no-secrets-in-configmap
40+
+ severity: error
41+
+ resourceRef:
42+
+ apiVersion: v1
43+
+ kind: ConfigMap
44+
+ name: super-secret
45+
+ namespace: default
46+
+ file:
47+
+ path: config-map.yaml
48+
+ errorSummary: 'ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest: exit code 1'

‎examples/gatekeeper-warning-only/.expected/diff.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index 0d32b6f..5de6d86 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -7,3 +7,24 @@ metadata:
6+
pipeline:
7+
validators:
8+
- image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ validationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/gatekeeper:latest
17+
+ exitCode: 0
18+
+ results:
19+
+ - message: |-
20+
+ The following banned keys are being used in the ConfigMap: {"private_key"}
21+
+ violatedConstraint: no-secrets-in-configmap
22+
+ severity: warning
23+
+ resourceRef:
24+
+ apiVersion: v1
25+
+ kind: ConfigMap
26+
+ name: super-secret
27+
+ namespace: default
28+
+ file:
29+
+ path: config-map.yaml

‎examples/kubeconform-simple/.expected/diff.patch‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index df2db02..2a567e6 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -8,5 +8,61 @@ pipeline:
6+
validators:
7+
- image: ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest
8+
configMap:
9+
- strict: 'true'
10+
skip_kinds: MyCustom
11+
+ strict: "true"
12+
+status:
13+
+ conditions:
14+
+ - type: Rendered
15+
+ status: "False"
16+
+ reason: RenderFailed
17+
+ message: |-
18+
+ pkg.render: pkg .:
19+
+ pipeline.run: already handled error
20+
+ renderStatus:
21+
+ validationSteps:
22+
+ - image: ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest
23+
+ stderr: 'failed to evaluate function: error: function failure'
24+
+ exitCode: 1
25+
+ results:
26+
+ - message: got string, want null or integer
27+
+ severity: error
28+
+ resourceRef:
29+
+ apiVersion: v1
30+
+ kind: ReplicationController
31+
+ name: bob
32+
+ field:
33+
+ path: spec.replicas
34+
+ file:
35+
+ path: resources.yaml
36+
+ - message: additional properties 'templates' not allowed
37+
+ severity: error
38+
+ resourceRef:
39+
+ apiVersion: v1
40+
+ kind: ReplicationController
41+
+ name: bob
42+
+ field:
43+
+ path: spec
44+
+ file:
45+
+ path: resources.yaml
46+
+ errorResults:
47+
+ - message: got string, want null or integer
48+
+ severity: error
49+
+ resourceRef:
50+
+ apiVersion: v1
51+
+ kind: ReplicationController
52+
+ name: bob
53+
+ field:
54+
+ path: spec.replicas
55+
+ file:
56+
+ path: resources.yaml
57+
+ - message: additional properties 'templates' not allowed
58+
+ severity: error
59+
+ resourceRef:
60+
+ apiVersion: v1
61+
+ kind: ReplicationController
62+
+ name: bob
63+
+ field:
64+
+ path: spec
65+
+ file:
66+
+ path: resources.yaml
67+
+ errorSummary: 'ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest: exit code 1'

‎examples/search-replace-simple/.expected/diff.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
diff --git a/Kptfile b/Kptfile
2+
index e7a0baf..c198904 100644
3+
--- a/Kptfile
4+
+++ b/Kptfile
5+
@@ -11,3 +11,18 @@ pipeline:
6+
by-path: metadata.name
7+
by-value: the-deployment
8+
put-value: my-deployment
9+
+status:
10+
+ conditions:
11+
+ - type: Rendered
12+
+ status: "True"
13+
+ reason: RenderSuccess
14+
+ renderStatus:
15+
+ mutationSteps:
16+
+ - image: ghcr.io/kptdev/krm-functions-catalog/search-replace:latest
17+
+ exitCode: 0
18+
+ results:
19+
+ - message: Mutated field value to "my-deployment"
20+
+ field:
21+
+ path: metadata.name
22+
+ file:
23+
+ path: resources.yaml
124
diff --git a/resources.yaml b/resources.yaml
225
index 7481208..1055c0f 100644
326
--- a/resources.yaml

0 commit comments

Comments
 (0)