test: sync save-on-render-failure fixtures with main

Author: SurbhiAgarwal1

e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/config.yaml

@@ -1 +1,2 @@
 exitCode: 1
+StdErrRegEx: "(docker: Error response from daemon: Head.*denied|Error.*initializing source docker)"

e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/diff.patch

@@ -1,18 +1,21 @@
 diff --git a/Kptfile b/Kptfile
-index 03e022b..0676899 100644
+index ec2c042..50c2a18 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -1,18 +1,19 @@
--apiVersion: kpt.dev/v1
--kind: Kptfile
--metadata:
--  annotations:
--    kpt.dev/bfs-rendering: "true"
--    kpt.dev/save-on-render-failure: "true"
+@@ -1,18 +1,28 @@
+ apiVersion: kpt.dev/v1
+ kind: Kptfile
+ metadata:
++  name: save-on-render-failure
++  namespace: staging
+   annotations:
++    app: myapp
+     kpt.dev/bfs-rendering: "true"
+     kpt.dev/save-on-render-failure: "true"
 -  name: save-on-render-failure
--pipeline:
--  mutators:
--  - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:latest
+ pipeline:
+   mutators:
+-  - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
 -    configMap:
 -      namespace: staging
 -  - image: ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.4
@@ -21,45 +24,36 @@ index 03e022b..0676899 100644
 -  - image: invalid-image:v0.0.0
 -    configMap:
 -      tier: backend
-+apiVersion: kpt.dev/v1
-+kind: Kptfile
-+metadata:
-+  annotations:
-+    kpt.dev/bfs-rendering: "true"
-+    kpt.dev/save-on-render-failure: "true"
-+    app: myapp
-+  name: save-on-render-failure
-+pipeline:
-+  mutators:
-+  - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:latest
-+    configMap:
-+      namespace: staging
-+  - image: ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.4
-+    configMap:
-+      app: myapp
-+  - image: invalid-image:v0.0.0
-+    configMap:
-+      tier: backend
++    - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
++      configMap:
++        namespace: staging
++    - image: ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.4
++      configMap:
++        app: myapp
++    - image: invalid-image:v0.0.0
++      configMap:
++        tier: backend
++status:
++  conditions:
++    - type: Rendered
++      status: "False"
++      reason: RenderFailed
++      message: |-
++        pkg.render: pkg .:
++        	pipeline.run: already handled error
 diff --git a/resources.yaml b/resources.yaml
-index 65cd534..7eece9b 100644
+index 0848ba0..7eece9b 100644
 --- a/resources.yaml
 +++ b/resources.yaml
-@@ -1,6 +1,13 @@
--apiVersion: apps/v1
--kind: Deployment
--metadata:
--  name: nginx-deployment
--spec:
--  replicas: 3
-+apiVersion: apps/v1
-+kind: Deployment
-+metadata:
-+  name: nginx-deployment
+@@ -2,5 +2,12 @@ apiVersion: apps/v1
+ kind: Deployment
+ metadata:
+   name: nginx-deployment
 +  annotations:
 +    app: myapp
 +  namespace: staging
-+spec:
-+  replicas: 3
+ spec:
+   replicas: 3
 +  template:
 +    metadata:
 +      annotations:

e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/Kptfile

@@ -7,12 +7,12 @@ metadata:
   name: save-on-render-failure
 pipeline:
   mutators:
-  - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:latest
+  - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
     configMap:
       namespace: staging
   - image: ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.4
     configMap:
       app: myapp
-  - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest
-    configPath: starlark-fn-failure.yaml
-
+  - image: invalid-image:v0.0.0
+    configMap:
+      tier: backend

e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/starlark-fn-failure.yaml

@@ -1 +1,2 @@
 exitCode: 1
+StdErrRegEx: "(docker: Error response from daemon: Head.*denied|Error.*initializing source docker)"

e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/config.yaml

@@ -1,16 +1,34 @@
 diff --git a/Kptfile b/Kptfile
-index dbd6541..f54cd50 100644
+index dbd6541..915dd4b 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -5,6 +5,8 @@ metadata:
-     kpt.dev/bfs-rendering: "true"
-     kpt.dev/save-on-render-failure: "true"
-   name: bfs-deep-nested-middle-fails
+@@ -1,14 +1,24 @@
+ apiVersion: kpt.dev/v1
+ kind: Kptfile
+ metadata:
++  name: bfs-deep-nested-middle-fails
 +  labels:
 +    level: root
+   annotations:
+     kpt.dev/bfs-rendering: "true"
+     kpt.dev/save-on-render-failure: "true"
+-  name: bfs-deep-nested-middle-fails
  info:
    description: BFS - Deep nested, middle level fails
  pipeline:
+   mutators:
+     - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
+       configMap:
+-        level: "root"
++        level: root
++status:
++  conditions:
++    - type: Rendered
++      status: "False"
++      reason: RenderFailed
++      message: |-
++        pkg.render: pkg .:
++        	pipeline.run: pkg ./level1: already handled error
 diff --git a/configmap.yaml b/configmap.yaml
 index 59bb817..19a7ead 100644
 --- a/configmap.yaml
@@ -49,10 +67,10 @@ index 57d3b69..10a2e13 100644
  data:
    level: level1
 diff --git a/level1/level2/Kptfile b/level1/level2/Kptfile
-index 314d402..4e4b342 100644
+index 314d402..29e69db 100644
 --- a/level1/level2/Kptfile
 +++ b/level1/level2/Kptfile
-@@ -2,6 +2,8 @@ apiVersion: kpt.dev/v1
+@@ -2,10 +2,12 @@ apiVersion: kpt.dev/v1
  kind: Kptfile
  metadata:
    name: level2
@@ -61,6 +79,11 @@ index 314d402..4e4b342 100644
  info:
    description: Level2 that succeeds
  pipeline:
+   mutators:
+     - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
+       configMap:
+-        level: "level2"
++        level: level2
 diff --git a/level1/level2/configmap.yaml b/level1/level2/configmap.yaml
 index ab7d3fa..1eeeaed 100644
 --- a/level1/level2/configmap.yaml

e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/diff.patch

@@ -10,5 +10,4 @@ pipeline:
       configMap:
         level: level1
   validators:
-    - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest
-      configPath: starlark-fn-failure.yaml
+    - image: ghcr.io/kptdev/krm-functions-catalog/invalid-image:v0.0.0

e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/level1/Kptfile

@@ -1 +1,2 @@
 exitCode: 1
+StdErrRegEx: "(docker: Error response from daemon: Head.*denied|Error.*initializing source docker)"

e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/level1/starlark-fn-failure.yaml

@@ -1,21 +1,38 @@
 diff --git a/Kptfile b/Kptfile
-index e9fad85..1b08a62 100644
+index e9fad85..48186b1 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -5,6 +5,8 @@ metadata:
-     kpt.dev/bfs-rendering: "true"
-     kpt.dev/save-on-render-failure: "true"
-   name: bfs-multiple-subpkgs-one-fails
+@@ -1,10 +1,12 @@
+ apiVersion: kpt.dev/v1
+ kind: Kptfile
+ metadata:
++  name: bfs-multiple-subpkgs-one-fails
 +  labels:
 +    pkg: root
+   annotations:
+     kpt.dev/bfs-rendering: "true"
+     kpt.dev/save-on-render-failure: "true"
+-  name: bfs-multiple-subpkgs-one-fails
  info:
    description: BFS - Multiple subpackages, sub2 fails
  pipeline:
+@@ -12,3 +14,11 @@ pipeline:
+     - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
+       configMap:
+         pkg: root
++status:
++  conditions:
++    - type: Rendered
++      status: "False"
++      reason: RenderFailed
++      message: |-
++        pkg.render: pkg .:
++        	pipeline.run: pkg ./sub2: already handled error
 diff --git a/service.yaml b/service.yaml
-index 9148b9b..eef89cb 100644
+index 9148b9b..2e551c8 100644
 --- a/service.yaml
 +++ b/service.yaml
-@@ -2,6 +2,8 @@ apiVersion: v1
+@@ -2,6 +2,10 @@ apiVersion: v1
  kind: Service
  metadata:
    name: root-service
@@ -24,6 +41,8 @@ index 9148b9b..eef89cb 100644
  spec:
    ports:
    - port: 80
++  selector:
++    pkg: root
 diff --git a/sub1/Kptfile b/sub1/Kptfile
 index 2d62077..0f03268 100644
 --- a/sub1/Kptfile
@@ -38,17 +57,24 @@ index 2d62077..0f03268 100644
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
 diff --git a/sub1/deployment.yaml b/sub1/deployment.yaml
-index 2f649ba..0dfd629 100644
+index 2f649ba..c2245a9 100644
 --- a/sub1/deployment.yaml
 +++ b/sub1/deployment.yaml
-@@ -2,5 +2,7 @@ apiVersion: apps/v1
+@@ -2,5 +2,14 @@ apiVersion: apps/v1
  kind: Deployment
  metadata:
    name: sub1-deployment
 +  labels:
 +    pkg: sub1
  spec:
    replicas: 1
++  selector:
++    matchLabels:
++      pkg: sub1
++  template:
++    metadata:
++      labels:
++        pkg: sub1
 diff --git a/sub2/Kptfile b/sub2/Kptfile
 index 792277c..6412843 100644
 --- a/sub2/Kptfile
@@ -63,17 +89,24 @@ index 792277c..6412843 100644
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
 diff --git a/sub2/deployment.yaml b/sub2/deployment.yaml
-index 20375ea..2984199 100644
+index 20375ea..7290360 100644
 --- a/sub2/deployment.yaml
 +++ b/sub2/deployment.yaml
-@@ -2,5 +2,7 @@ apiVersion: apps/v1
+@@ -2,5 +2,14 @@ apiVersion: apps/v1
  kind: Deployment
  metadata:
    name: sub2-deployment
 +  labels:
 +    pkg: sub2
  spec:
    replicas: 2
++  selector:
++    matchLabels:
++      pkg: sub2
++  template:
++    metadata:
++      labels:
++        pkg: sub2
 diff --git a/sub3/Kptfile b/sub3/Kptfile
 index ff35b98..958a351 100644
 --- a/sub3/Kptfile
@@ -88,14 +121,21 @@ index ff35b98..958a351 100644
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
 diff --git a/sub3/deployment.yaml b/sub3/deployment.yaml
-index dc257b3..492a43b 100644
+index dc257b3..3a13d11 100644
 --- a/sub3/deployment.yaml
 +++ b/sub3/deployment.yaml
-@@ -2,5 +2,7 @@ apiVersion: apps/v1
+@@ -2,5 +2,14 @@ apiVersion: apps/v1
  kind: Deployment
  metadata:
    name: sub3-deployment
 +  labels:
 +    pkg: root
  spec:
    replicas: 3
++  selector:
++    matchLabels:
++      pkg: root
++  template:
++    metadata:
++      labels:
++        pkg: root