From 7b1656e7b79b44089b0534cf4d4c72d7b372c0d5 Mon Sep 17 00:00:00 2001 From: Aravindhan Ayyanathan Date: Fri, 29 May 2026 16:14:33 +0100 Subject: [PATCH] Migrate custom condition to metav1.conditions Signed-off-by: Aravindhan Ayyanathan --- .../.expected/diff.patch | 7 +++-- .../basicpipeline-semver/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../basicpipeline-wasm/.expected/diff.patch | 7 +++-- .../basicpipeline/.expected/diff.patch | 7 +++-- .../default-runtime/.expected/diff.patch | 7 +++-- .../exec-function-stderr/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../fn-render/fn-failure/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- .../fnconfig-in-subdir/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../fn-render/fnconfig/.expected/diff.patch | 7 +++-- .../fnresult-fn-failure/.expected/diff.patch | 6 ++-- .../fnresult-fn-success/.expected/diff.patch | 7 +++-- .../format-on-success/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../fn-render/generator/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 7 +++-- .../kubeval-failure/.expected/diff.patch | 6 ++-- .../missing-fn-image/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../mutate-path-index/.expected/diff.patch | 7 +++-- .../no-fnconfig/.expected/diff.patch | 6 ++-- .../fn-render/no-op/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../no-resources/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- .../non-krm-resource/.expected/diff.patch | 6 ++-- .../path-index-ancestor/.expected/diff.patch | 6 ++-- .../path-index-current/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../path-index-duplicate/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../preserve-comments/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../resource-deletion/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../bfs-basicpipeline/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../dfs-basicpipeline/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../basicpipeline/.expected/diff.patch | 7 +++-- .../selectors/exclude/.expected/diff.patch | 7 +++-- .../selectors/generator/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../short-image-path/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- .../subpkg-fn-failure/.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 6 ++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../fn-render/subpkgs/.expected/diff.patch | 7 +++-- .../success-stdout/.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 7 +++-- .../.expected/diff.patch | 6 ++-- internal/docs/generated/pkgdocs/docs.go | 7 ----- internal/testutil/pkgbuilder/builder.go | 5 ++-- pkg/api/kptfile/v1/types.go | 30 ++++--------------- pkg/api/kptfile/v1/zz_generated.deepcopy.go | 7 +++-- pkg/kptfile/kptfileutil/util_test.go | 10 +++++++ pkg/lib/kptops/render_executor.go | 13 ++++---- pkg/lib/kptops/render_executor_test.go | 11 +++---- pkg/lib/update/fastforward.go | 3 +- pkg/lib/update/fastforward_test.go | 27 +++++++++-------- 87 files changed, 407 insertions(+), 217 deletions(-) diff --git a/e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch b/e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch index 7d2838c497..2e9d37c458 100644 --- a/e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch +++ b/e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 3c93e9e..5404a5a 100644 +index 3c93e9e..e154048 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 3c93e9e..5404a5a 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest -@@ -12,3 +15,16 @@ pipeline: +@@ -12,3 +15,19 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 3c93e9e..5404a5a 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch b/e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch index e1c701ed7b..6f82d2ff72 100644 --- a/e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch +++ b/e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 2336da4..ca2bcea 100644 +index 2336da4..eed94e0 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,13 +2,34 @@ apiVersion: kpt.dev/v1 +@@ -2,13 +2,37 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app @@ -24,7 +24,10 @@ index 2336da4..ca2bcea 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.4.3 diff --git a/e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch b/e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch index 114ed718fa..0c2dfbdff3 100644 --- a/e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch +++ b/e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch b/e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch index 19a2818f6c..d33d42a7bb 100644 --- a/e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch +++ b/e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 17a7822..98fa855 100644 +index 17a7822..b60071f 100644 --- a/Kptfile +++ b/Kptfile -@@ -12,3 +12,22 @@ pipeline: +@@ -12,3 +12,25 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/wasm/set-labels:v0.2.4 configMap: tier: backend @@ -10,7 +10,10 @@ index 17a7822..98fa855 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/wasm/set-namespace:v0.5.1 diff --git a/e2e/testdata/fn-render/basicpipeline/.expected/diff.patch b/e2e/testdata/fn-render/basicpipeline/.expected/diff.patch index 114ed718fa..0c2dfbdff3 100644 --- a/e2e/testdata/fn-render/basicpipeline/.expected/diff.patch +++ b/e2e/testdata/fn-render/basicpipeline/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/default-runtime/.expected/diff.patch b/e2e/testdata/fn-render/default-runtime/.expected/diff.patch index 114ed718fa..0c2dfbdff3 100644 --- a/e2e/testdata/fn-render/default-runtime/.expected/diff.patch +++ b/e2e/testdata/fn-render/default-runtime/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/exec-function-stderr/.expected/diff.patch b/e2e/testdata/fn-render/exec-function-stderr/.expected/diff.patch index 99cec3474c..44abcd2cf8 100644 --- a/e2e/testdata/fn-render/exec-function-stderr/.expected/diff.patch +++ b/e2e/testdata/fn-render/exec-function-stderr/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 6f2fe11..c0c66f5 100644 +index 6f2fe11..2abfec8 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,4 +4,35 @@ metadata: +@@ -4,4 +4,38 @@ metadata: name: app pipeline: mutators: @@ -12,7 +12,10 @@ index 6f2fe11..c0c66f5 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - exec: ./testdata/fn-render/exec-function-stderr/function.sh diff --git a/e2e/testdata/fn-render/exec-function-with-args/.expected/diff.patch b/e2e/testdata/fn-render/exec-function-with-args/.expected/diff.patch index 04bdc6d2ec..28b94f7af7 100644 --- a/e2e/testdata/fn-render/exec-function-with-args/.expected/diff.patch +++ b/e2e/testdata/fn-render/exec-function-with-args/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0d98dbb..2f7e1c4 100644 +index 0d98dbb..56c714e 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,4 +4,13 @@ metadata: +@@ -4,4 +4,16 @@ metadata: name: app pipeline: mutators: @@ -12,7 +12,10 @@ index 0d98dbb..2f7e1c4 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - exec: sed -e 's/foo/bar/' diff --git a/e2e/testdata/fn-render/exec-without-permissions/.expected/diff.patch b/e2e/testdata/fn-render/exec-without-permissions/.expected/diff.patch index dba0f67c50..96d0012cba 100644 --- a/e2e/testdata/fn-render/exec-without-permissions/.expected/diff.patch +++ b/e2e/testdata/fn-render/exec-without-permissions/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0d98dbb..a70d5e2 100644 +index 0d98dbb..301dfe5 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,4 +4,18 @@ metadata: +@@ -4,4 +4,20 @@ metadata: name: app pipeline: mutators: @@ -12,6 +12,8 @@ index 0d98dbb..a70d5e2 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/diff.patch b/e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/diff.patch index 3f1808152a..c51d0b03be 100644 --- a/e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/diff.patch +++ b/e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0586af9..ff80297 100644 +index 0586af9..fc78162 100644 --- a/Kptfile +++ b/Kptfile -@@ -7,3 +7,59 @@ pipeline: +@@ -7,3 +7,61 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest configMap: strict: "true" @@ -10,6 +10,8 @@ index 0586af9..ff80297 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/fn-failure/.expected/diff.patch b/e2e/testdata/fn-render/fn-failure/.expected/diff.patch index a4b942a5b5..92441c2be1 100644 --- a/e2e/testdata/fn-render/fn-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/fn-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 3447ba3..9127985 100644 +index 3447ba3..6ecf4da 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,12 +4,31 @@ metadata: +@@ -4,12 +4,33 @@ metadata: name: app pipeline: mutators: @@ -27,6 +27,8 @@ index 3447ba3..9127985 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/fn-success-with-stderr/.expected/diff.patch b/e2e/testdata/fn-render/fn-success-with-stderr/.expected/diff.patch index 2c13164fa5..15d3d721ce 100644 --- a/e2e/testdata/fn-render/fn-success-with-stderr/.expected/diff.patch +++ b/e2e/testdata/fn-render/fn-success-with-stderr/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index f591880..1a3d92d 100644 +index f591880..5988a84 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,13 @@ pipeline: +@@ -6,3 +6,16 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark.yaml @@ -10,7 +10,10 @@ index f591880..1a3d92d 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/fnconfig-ancestorfn-not-mutate-subpkg-config/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig-ancestorfn-not-mutate-subpkg-config/.expected/diff.patch index 6d24d30dcf..5bc5fd9275 100644 --- a/e2e/testdata/fn-render/fnconfig-ancestorfn-not-mutate-subpkg-config/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig-ancestorfn-not-mutate-subpkg-config/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index dbab15c..3eab648 100644 +index dbab15c..c3607dd 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,8 +2,20 @@ apiVersion: kpt.dev/v1 +@@ -2,8 +2,23 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-db @@ -16,7 +16,10 @@ index dbab15c..3eab648 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 diff --git a/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/.expected/diff.patch index a5e0287950..c53e70861a 100644 --- a/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0bfdbb0..b4a6160 100644 +index 0bfdbb0..e6bd021 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,13 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configPath: db/labelconfig.yaml @@ -10,6 +10,8 @@ index 0bfdbb0..b4a6160 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: | + pkg.render: pkg .: Kptfile is invalid: diff --git a/e2e/testdata/fn-render/fnconfig-in-subdir/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig-in-subdir/.expected/diff.patch index 55da6d2f41..8aa5eb47d4 100644 --- a/e2e/testdata/fn-render/fnconfig-in-subdir/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig-in-subdir/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0bfdbb0..f4fdf26 100644 +index 0bfdbb0..647a183 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,7 +2,18 @@ apiVersion: kpt.dev/v1 +@@ -2,7 +2,21 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-db @@ -16,7 +16,10 @@ index 0bfdbb0..f4fdf26 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 diff --git a/e2e/testdata/fn-render/fnconfig-pkgfn-refers-subdir/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig-pkgfn-refers-subdir/.expected/diff.patch index d6a1725cb7..5e53742795 100644 --- a/e2e/testdata/fn-render/fnconfig-pkgfn-refers-subdir/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig-pkgfn-refers-subdir/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index c2cf3ba..d0bbc91 100644 +index c2cf3ba..8288eda 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,7 +2,18 @@ apiVersion: kpt.dev/v1 +@@ -2,7 +2,21 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-db @@ -16,7 +16,10 @@ index c2cf3ba..d0bbc91 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 diff --git a/e2e/testdata/fn-render/fnconfig-updated-in-render/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig-updated-in-render/.expected/diff.patch index d67f7198e0..c2aafaa3b6 100644 --- a/e2e/testdata/fn-render/fnconfig-updated-in-render/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig-updated-in-render/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 950565f..d9be19c 100644 +index 950565f..4243723 100644 --- a/Kptfile +++ b/Kptfile @@ -3,7 +3,7 @@ kind: Kptfile @@ -11,7 +11,7 @@ index 950565f..d9be19c 100644 annotations: config.kubernetes.io/local-config: "true" info: -@@ -16,3 +16,19 @@ pipeline: +@@ -16,3 +16,22 @@ pipeline: configPath: update-labels.yaml - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configPath: label-input.yaml @@ -19,7 +19,10 @@ index 950565f..d9be19c 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.4.1 diff --git a/e2e/testdata/fn-render/fnconfig/.expected/diff.patch b/e2e/testdata/fn-render/fnconfig/.expected/diff.patch index 84130da1fc..520bd2ef92 100644 --- a/e2e/testdata/fn-render/fnconfig/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnconfig/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 043dcac..58ddc42 100644 +index 043dcac..334ea47 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 043dcac..58ddc42 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -9,3 +12,18 @@ pipeline: +@@ -9,3 +12,21 @@ pipeline: namespace: staging - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configPath: labelconfig.yaml @@ -20,7 +20,10 @@ index 043dcac..58ddc42 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/fnresult-fn-failure/.expected/diff.patch b/e2e/testdata/fn-render/fnresult-fn-failure/.expected/diff.patch index 3f1808152a..c51d0b03be 100644 --- a/e2e/testdata/fn-render/fnresult-fn-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnresult-fn-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0586af9..ff80297 100644 +index 0586af9..fc78162 100644 --- a/Kptfile +++ b/Kptfile -@@ -7,3 +7,59 @@ pipeline: +@@ -7,3 +7,61 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest configMap: strict: "true" @@ -10,6 +10,8 @@ index 0586af9..ff80297 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/fnresult-fn-success/.expected/diff.patch b/e2e/testdata/fn-render/fnresult-fn-success/.expected/diff.patch index 1b9752610b..29cac1df6a 100644 --- a/e2e/testdata/fn-render/fnresult-fn-success/.expected/diff.patch +++ b/e2e/testdata/fn-render/fnresult-fn-success/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 3c63ab9..775911c 100644 +index 3c63ab9..6d2e709 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,18 @@ pipeline: +@@ -6,3 +6,21 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/search-replace:latest configPath: search-replace-conf.yaml @@ -10,7 +10,10 @@ index 3c63ab9..775911c 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/search-replace:latest diff --git a/e2e/testdata/fn-render/format-on-success/.expected/diff.patch b/e2e/testdata/fn-render/format-on-success/.expected/diff.patch index 998b5cf90b..2a15bca055 100644 --- a/e2e/testdata/fn-render/format-on-success/.expected/diff.patch +++ b/e2e/testdata/fn-render/format-on-success/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index dbab15c..3ab935c 100644 +index dbab15c..8580011 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,8 +2,20 @@ apiVersion: kpt.dev/v1 +@@ -2,8 +2,23 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-db @@ -16,7 +16,10 @@ index dbab15c..3ab935c 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/generator-absolute-path/.expected/diff.patch b/e2e/testdata/fn-render/generator-absolute-path/.expected/diff.patch index 451e75f312..dff6aa0fa5 100644 --- a/e2e/testdata/fn-render/generator-absolute-path/.expected/diff.patch +++ b/e2e/testdata/fn-render/generator-absolute-path/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 714d078..84b97ca 100644 +index 714d078..3539069 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-httpbin.yaml @@ -10,7 +10,10 @@ index 714d078..84b97ca 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/generator/.expected/diff.patch b/e2e/testdata/fn-render/generator/.expected/diff.patch index 93843baaf1..12f000f9c5 100644 --- a/e2e/testdata/fn-render/generator/.expected/diff.patch +++ b/e2e/testdata/fn-render/generator/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 8050168..a201e2b 100644 +index 8050168..b61125d 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 8050168..a201e2b 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,20 @@ pipeline: +@@ -10,3 +13,23 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: db @@ -20,7 +20,10 @@ index 8050168..a201e2b 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/image-pull-policy-never/.expected/diff.patch b/e2e/testdata/fn-render/image-pull-policy-never/.expected/diff.patch index 3333503b50..523eadd3c7 100644 --- a/e2e/testdata/fn-render/image-pull-policy-never/.expected/diff.patch +++ b/e2e/testdata/fn-render/image-pull-policy-never/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 5b7fc74..b2383d6 100644 +index 5b7fc74..680e3a7 100644 --- a/Kptfile +++ b/Kptfile -@@ -5,3 +5,20 @@ metadata: +@@ -5,3 +5,22 @@ metadata: pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/not-exist:latest @@ -10,6 +10,8 @@ index 5b7fc74..b2383d6 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/krm-check-exclude-kustomize/.expected/diff.patch b/e2e/testdata/fn-render/krm-check-exclude-kustomize/.expected/diff.patch index 3c45e99dc8..8f221a0208 100644 --- a/e2e/testdata/fn-render/krm-check-exclude-kustomize/.expected/diff.patch +++ b/e2e/testdata/fn-render/krm-check-exclude-kustomize/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 2985a1a..30b4376 100644 +index 2985a1a..633844f 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,8 +2,19 @@ apiVersion: kpt.dev/v1 +@@ -2,8 +2,22 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app @@ -17,7 +17,10 @@ index 2985a1a..30b4376 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 diff --git a/e2e/testdata/fn-render/kubeval-failure/.expected/diff.patch b/e2e/testdata/fn-render/kubeval-failure/.expected/diff.patch index 10b83ce259..c146acc80c 100644 --- a/e2e/testdata/fn-render/kubeval-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/kubeval-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 2c6e965..481dc83 100644 +index 2c6e965..3cba3fe 100644 --- a/Kptfile +++ b/Kptfile -@@ -7,3 +7,59 @@ pipeline: +@@ -7,3 +7,61 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/kubeconform:latest configMap: strict: "true" @@ -10,6 +10,8 @@ index 2c6e965..481dc83 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/missing-fn-image/.expected/diff.patch b/e2e/testdata/fn-render/missing-fn-image/.expected/diff.patch index c772c52649..a88edcbd9f 100644 --- a/e2e/testdata/fn-render/missing-fn-image/.expected/diff.patch +++ b/e2e/testdata/fn-render/missing-fn-image/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 11012de..a0f4634 100644 +index 11012de..40fec59 100644 --- a/Kptfile +++ b/Kptfile -@@ -7,6 +7,26 @@ pipeline: +@@ -7,6 +7,28 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 configMap: namespace: staging @@ -14,6 +14,8 @@ index 11012de..a0f4634 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/modify-legacy-path-annotation/.expected/diff.patch b/e2e/testdata/fn-render/modify-legacy-path-annotation/.expected/diff.patch index 47f2a43559..66c66d6ba4 100644 --- a/e2e/testdata/fn-render/modify-legacy-path-annotation/.expected/diff.patch +++ b/e2e/testdata/fn-render/modify-legacy-path-annotation/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 5d377d4..4c721ab 100644 +index 5d377d4..468f72a 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,5 +4,14 @@ metadata: +@@ -4,5 +4,17 @@ metadata: name: app pipeline: mutators: @@ -14,7 +14,10 @@ index 5d377d4..4c721ab 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/modify-path-annotation/.expected/diff.patch b/e2e/testdata/fn-render/modify-path-annotation/.expected/diff.patch index 8c70da6113..53ec953759 100644 --- a/e2e/testdata/fn-render/modify-path-annotation/.expected/diff.patch +++ b/e2e/testdata/fn-render/modify-path-annotation/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 5d377d4..4c721ab 100644 +index 5d377d4..468f72a 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,5 +4,14 @@ metadata: +@@ -4,5 +4,17 @@ metadata: name: app pipeline: mutators: @@ -14,7 +14,10 @@ index 5d377d4..4c721ab 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/mutate-legacy-path-index/.expected/diff.patch b/e2e/testdata/fn-render/mutate-legacy-path-index/.expected/diff.patch index 1edd0d8e8c..a8cd8f6072 100644 --- a/e2e/testdata/fn-render/mutate-legacy-path-index/.expected/diff.patch +++ b/e2e/testdata/fn-render/mutate-legacy-path-index/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 894ad57..2b9cbb7 100644 +index 894ad57..362cd95 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-mutate-path-index.yaml @@ -10,7 +10,10 @@ index 894ad57..2b9cbb7 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/mutate-path-index/.expected/diff.patch b/e2e/testdata/fn-render/mutate-path-index/.expected/diff.patch index 1edd0d8e8c..a8cd8f6072 100644 --- a/e2e/testdata/fn-render/mutate-path-index/.expected/diff.patch +++ b/e2e/testdata/fn-render/mutate-path-index/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 894ad57..2b9cbb7 100644 +index 894ad57..362cd95 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-mutate-path-index.yaml @@ -10,7 +10,10 @@ index 894ad57..2b9cbb7 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/no-fnconfig/.expected/diff.patch b/e2e/testdata/fn-render/no-fnconfig/.expected/diff.patch index e2651c15a5..5f0ccbe8a6 100644 --- a/e2e/testdata/fn-render/no-fnconfig/.expected/diff.patch +++ b/e2e/testdata/fn-render/no-fnconfig/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index f2d1249..6772376 100644 +index f2d1249..1e1993d 100644 --- a/Kptfile +++ b/Kptfile -@@ -8,3 +8,25 @@ pipeline: +@@ -8,3 +8,27 @@ pipeline: configMap: namespace: staging - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 @@ -10,6 +10,8 @@ index f2d1249..6772376 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/no-op/.expected/diff.patch b/e2e/testdata/fn-render/no-op/.expected/diff.patch index 36cb50a2e7..163e004a3b 100644 --- a/e2e/testdata/fn-render/no-op/.expected/diff.patch +++ b/e2e/testdata/fn-render/no-op/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index a7a2d0b..3dbfee4 100644 +index a7a2d0b..ad310b0 100644 --- a/Kptfile +++ b/Kptfile -@@ -5,3 +5,12 @@ metadata: +@@ -5,3 +5,15 @@ metadata: pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/no-op @@ -10,7 +10,10 @@ index a7a2d0b..3dbfee4 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/no-op:latest diff --git a/e2e/testdata/fn-render/no-pipeline-in-subpackage/.expected/diff.patch b/e2e/testdata/fn-render/no-pipeline-in-subpackage/.expected/diff.patch index abdd0e61c8..3c11425c71 100644 --- a/e2e/testdata/fn-render/no-pipeline-in-subpackage/.expected/diff.patch +++ b/e2e/testdata/fn-render/no-pipeline-in-subpackage/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/no-resources/.expected/diff.patch b/e2e/testdata/fn-render/no-resources/.expected/diff.patch index 89078f13a1..93461c2e4e 100644 --- a/e2e/testdata/fn-render/no-resources/.expected/diff.patch +++ b/e2e/testdata/fn-render/no-resources/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 714d078..84b97ca 100644 +index 714d078..3539069 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-httpbin.yaml @@ -10,7 +10,10 @@ index 714d078..84b97ca 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/non-krm-resource-no-pipeline/.expected/diff.patch b/e2e/testdata/fn-render/non-krm-resource-no-pipeline/.expected/diff.patch index 16b239070d..432c95422b 100644 --- a/e2e/testdata/fn-render/non-krm-resource-no-pipeline/.expected/diff.patch +++ b/e2e/testdata/fn-render/non-krm-resource-no-pipeline/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index d9e2f05..775d110 100644 +index d9e2f05..28963ce 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,3 +2,9 @@ apiVersion: kpt.dev/v1 +@@ -2,3 +2,11 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app @@ -10,5 +10,7 @@ index d9e2f05..775d110 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: 'pkg.render: pkg .: input resource list must contain only KRM resources: non-krm.yaml: resource must have `apiVersion`' diff --git a/e2e/testdata/fn-render/non-krm-resource/.expected/diff.patch b/e2e/testdata/fn-render/non-krm-resource/.expected/diff.patch index 0bfaf1db32..38362ee73b 100644 --- a/e2e/testdata/fn-render/non-krm-resource/.expected/diff.patch +++ b/e2e/testdata/fn-render/non-krm-resource/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..a5c31bf 100644 +index 1307fb5..52cf581 100644 --- a/Kptfile +++ b/Kptfile -@@ -10,3 +10,17 @@ pipeline: +@@ -10,3 +10,19 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -10,6 +10,8 @@ index 1307fb5..a5c31bf 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/path-index-ancestor/.expected/diff.patch b/e2e/testdata/fn-render/path-index-ancestor/.expected/diff.patch index 813c9082f5..a305c080ab 100644 --- a/e2e/testdata/fn-render/path-index-ancestor/.expected/diff.patch +++ b/e2e/testdata/fn-render/path-index-ancestor/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index ac710dc..7464619 100644 +index ac710dc..712c724 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,3 +2,17 @@ apiVersion: kpt.dev/v1 +@@ -2,3 +2,19 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-generator @@ -10,6 +10,8 @@ index ac710dc..7464619 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./db: diff --git a/e2e/testdata/fn-render/path-index-current/.expected/diff.patch b/e2e/testdata/fn-render/path-index-current/.expected/diff.patch index 23c1ab2538..8fb7687815 100644 --- a/e2e/testdata/fn-render/path-index-current/.expected/diff.patch +++ b/e2e/testdata/fn-render/path-index-current/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0f5d7db..3ac3611 100644 +index 0f5d7db..381e420 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-httpbin-gen.yaml @@ -10,7 +10,10 @@ index 0f5d7db..3ac3611 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/path-index-descendent/.expected/diff.patch b/e2e/testdata/fn-render/path-index-descendent/.expected/diff.patch index 73b4916a12..7d1658e634 100644 --- a/e2e/testdata/fn-render/path-index-descendent/.expected/diff.patch +++ b/e2e/testdata/fn-render/path-index-descendent/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 0f5d7db..3ac3611 100644 +index 0f5d7db..381e420 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,12 @@ pipeline: +@@ -6,3 +6,15 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-httpbin-gen.yaml @@ -10,7 +10,10 @@ index 0f5d7db..3ac3611 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/path-index-duplicate/.expected/diff.patch b/e2e/testdata/fn-render/path-index-duplicate/.expected/diff.patch index 880be0a560..1b63553b7e 100644 --- a/e2e/testdata/fn-render/path-index-duplicate/.expected/diff.patch +++ b/e2e/testdata/fn-render/path-index-duplicate/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index ef99dad..2d02fa0 100644 +index ef99dad..cd212e4 100644 --- a/Kptfile +++ b/Kptfile -@@ -6,3 +6,17 @@ pipeline: +@@ -6,3 +6,19 @@ pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-gen-duplicate-path.yaml @@ -10,6 +10,8 @@ index ef99dad..2d02fa0 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/path-index-outofpackage/.expected/diff.patch b/e2e/testdata/fn-render/path-index-outofpackage/.expected/diff.patch index 9228cbd669..44130271f6 100644 --- a/e2e/testdata/fn-render/path-index-outofpackage/.expected/diff.patch +++ b/e2e/testdata/fn-render/path-index-outofpackage/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index ac710dc..79ba494 100644 +index ac710dc..57fd8e0 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,3 +2,17 @@ apiVersion: kpt.dev/v1 +@@ -2,3 +2,19 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app-with-generator @@ -10,6 +10,8 @@ index ac710dc..79ba494 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./db: diff --git a/e2e/testdata/fn-render/preserve-comments/.expected/diff.patch b/e2e/testdata/fn-render/preserve-comments/.expected/diff.patch index 10a702f706..c62d4b63e9 100644 --- a/e2e/testdata/fn-render/preserve-comments/.expected/diff.patch +++ b/e2e/testdata/fn-render/preserve-comments/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 828d292..7502f3c 100644 +index 828d292..303fb71 100644 --- a/Kptfile +++ b/Kptfile -@@ -5,3 +5,12 @@ metadata: +@@ -5,3 +5,15 @@ metadata: pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/drop-comments:v0.1 @@ -10,7 +10,10 @@ index 828d292..7502f3c 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/drop-comments:v0.1 diff --git a/e2e/testdata/fn-render/preserve-order-null-values/.expected/diff.patch b/e2e/testdata/fn-render/preserve-order-null-values/.expected/diff.patch index 7d2dc06add..b21ee761ce 100644 --- a/e2e/testdata/fn-render/preserve-order-null-values/.expected/diff.patch +++ b/e2e/testdata/fn-render/preserve-order-null-values/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/resource-deletion/.expected/diff.patch b/e2e/testdata/fn-render/resource-deletion/.expected/diff.patch index 04b6c91dd9..b6faaa3015 100644 --- a/e2e/testdata/fn-render/resource-deletion/.expected/diff.patch +++ b/e2e/testdata/fn-render/resource-deletion/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 364e274..f17e769 100644 +index 364e274..d54d399 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 364e274..f17e769 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest -@@ -12,3 +15,16 @@ pipeline: +@@ -12,3 +15,19 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 364e274..f17e769 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/resource-has-pkgname-prefix/.expected/diff.patch b/e2e/testdata/fn-render/resource-has-pkgname-prefix/.expected/diff.patch index 0b6b2bfd84..bdbfcf314c 100644 --- a/e2e/testdata/fn-render/resource-has-pkgname-prefix/.expected/diff.patch +++ b/e2e/testdata/fn-render/resource-has-pkgname-prefix/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 21d9773..da35b9b 100644 +index 21d9773..6fdcb1c 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,8 +2,102 @@ apiVersion: kpt.dev/v1 +@@ -2,8 +2,105 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: wordpress @@ -17,7 +17,10 @@ index 21d9773..da35b9b 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-annotations:latest diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/diff.patch index 402f36c76f..9bcd9032ec 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-basicpipeline/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 8e0454e..f230a89 100644 +index 8e0454e..3110478 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,18 +1,43 @@ +@@ -1,18 +1,45 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -36,6 +36,8 @@ index 8e0454e..f230a89 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/diff.patch index fbcacec6b2..dd2dddc32a 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-deep-nested-middle-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index dbd6541..ad87335 100644 +index dbd6541..0f5be4e 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,14 +1,41 @@ +@@ -1,14 +1,43 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -25,6 +25,8 @@ index dbd6541..ad87335 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-multiple-subpkgs-one-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-multiple-subpkgs-one-fails/.expected/diff.patch index 425955484a..bb2bccc5de 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-multiple-subpkgs-one-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-multiple-subpkgs-one-fails/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index e9fad85..b0d2fb6 100644 +index e9fad85..02e6bce 100644 --- a/Kptfile +++ b/Kptfile @@ -1,10 +1,12 @@ @@ -16,7 +16,7 @@ index e9fad85..b0d2fb6 100644 info: description: BFS - Multiple subpackages, sub2 fails pipeline: -@@ -12,3 +14,30 @@ pipeline: +@@ -12,3 +14,32 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: pkg: root @@ -24,6 +24,8 @@ index e9fad85..b0d2fb6 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-and-subpkg-both-fail/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-and-subpkg-both-fail/.expected/diff.patch index 3512029e33..46addd181e 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-and-subpkg-both-fail/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-and-subpkg-both-fail/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 867a54b..6ccc3b8 100644 +index 867a54b..9349c2e 100644 --- a/Kptfile +++ b/Kptfile @@ -1,10 +1,10 @@ @@ -14,7 +14,7 @@ index 867a54b..6ccc3b8 100644 info: description: BFS - Both parent and subpackage fail pipeline: -@@ -15,3 +15,23 @@ pipeline: +@@ -15,3 +15,25 @@ pipeline: validators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-fn-failure.yaml @@ -22,6 +22,8 @@ index 867a54b..6ccc3b8 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-mutator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-mutator-fails/.expected/diff.patch index 54fb5dc5f4..52fb1ff473 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-mutator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-mutator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 2c67980..0e92246 100644 +index 2c67980..76b2d5e 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,16 +1,40 @@ +@@ -1,16 +1,42 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -27,6 +27,8 @@ index 2c67980..0e92246 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-validator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-validator-fails/.expected/diff.patch index eeb2047bf0..f6eb584e98 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-validator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-parent-validator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 17ef3d8..93810be 100644 +index 17ef3d8..8866133 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,17 +1,42 @@ +@@ -1,17 +1,44 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -28,6 +28,8 @@ index 17ef3d8..93810be 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-mutator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-mutator-fails/.expected/diff.patch index 4d85263c73..d7e71f510f 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-mutator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-mutator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 84b93a6..f9f5122 100644 +index 84b93a6..6b48bcb 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,14 +1,40 @@ +@@ -1,14 +1,42 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -25,6 +25,8 @@ index 84b93a6..f9f5122 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-validator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-validator-fails/.expected/diff.patch index 798c6c5f7a..8f701cb038 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-validator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/bfs-subpkg-validator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 86dbe13..755cbd3 100644 +index 86dbe13..5de22c1 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,15 +1,43 @@ +@@ -1,15 +1,45 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -28,6 +28,8 @@ index 86dbe13..755cbd3 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-basicpipeline/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-basicpipeline/.expected/diff.patch index a493730499..c70c5275c0 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-basicpipeline/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-basicpipeline/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index ed88ddf..a1d57f0 100644 +index ed88ddf..27d2887 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,16 +1,42 @@ +@@ -1,16 +1,44 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -34,6 +34,8 @@ index ed88ddf..a1d57f0 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-deep-nested-middle-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-deep-nested-middle-fails/.expected/diff.patch index ef9119f97b..86b48df541 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-deep-nested-middle-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-deep-nested-middle-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 4047d27..02908a2 100644 +index 4047d27..4ba0706 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,13 +1,38 @@ +@@ -1,13 +1,40 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -22,6 +22,8 @@ index 4047d27..02908a2 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./level1: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-multiple-subpkgs-one-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-multiple-subpkgs-one-fails/.expected/diff.patch index 7512f2967d..c99d773cbf 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-multiple-subpkgs-one-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-multiple-subpkgs-one-fails/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index c47c90d..0ad6086 100644 +index c47c90d..470e173 100644 --- a/Kptfile +++ b/Kptfile @@ -1,9 +1,9 @@ @@ -13,7 +13,7 @@ index c47c90d..0ad6086 100644 info: description: DFS - Multiple subpackages, sub2 fails pipeline: -@@ -11,3 +11,28 @@ pipeline: +@@ -11,3 +11,30 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: pkg: root @@ -21,6 +21,8 @@ index c47c90d..0ad6086 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./sub2: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-and-subpkg-both-fail/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-and-subpkg-both-fail/.expected/diff.patch index 16042c11a8..02f812a1ed 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-and-subpkg-both-fail/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-and-subpkg-both-fail/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 2e71448..1a82d1e 100644 +index 2e71448..95bbb90 100644 --- a/Kptfile +++ b/Kptfile @@ -1,9 +1,9 @@ @@ -13,7 +13,7 @@ index 2e71448..1a82d1e 100644 info: description: DFS - Both parent and subpackage fail pipeline: -@@ -14,3 +14,26 @@ pipeline: +@@ -14,3 +14,28 @@ pipeline: validators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-fn-failure.yaml @@ -21,6 +21,8 @@ index 2e71448..1a82d1e 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./subpkg: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-mutator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-mutator-fails/.expected/diff.patch index 1e8f8a9ac8..9fee84ce5e 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-mutator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-mutator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 207a7ca..c351a54 100644 +index 207a7ca..102262d 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,15 +1,41 @@ +@@ -1,15 +1,43 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -26,6 +26,8 @@ index 207a7ca..c351a54 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-validator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-validator-fails/.expected/diff.patch index 5a2ace3204..dd994472e9 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-validator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-parent-validator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index b402aed..04ef8db 100644 +index b402aed..8b41d8a 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,16 +1,43 @@ +@@ -1,16 +1,45 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -27,6 +27,8 @@ index b402aed..04ef8db 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-mutator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-mutator-fails/.expected/diff.patch index 97fe2e0b95..6e9ba8f161 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-mutator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-mutator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 80aa788..77f5c7b 100644 +index 80aa788..509dc9c 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,13 +1,35 @@ +@@ -1,13 +1,37 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -22,6 +22,8 @@ index 80aa788..77f5c7b 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./subpkg: diff --git a/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-validator-fails/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-validator-fails/.expected/diff.patch index 480b643eef..a8576f4645 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-validator-fails/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/dfs-subpkg-validator-fails/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 7c3b09a..2b496da 100644 +index 7c3b09a..fb2be6a 100644 --- a/Kptfile +++ b/Kptfile -@@ -1,14 +1,37 @@ +@@ -1,14 +1,39 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: @@ -24,6 +24,8 @@ index 7c3b09a..2b496da 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./subpkg: diff --git a/e2e/testdata/fn-render/save-on-render-failure/no-save-on-render-failure/.expected/diff.patch b/e2e/testdata/fn-render/save-on-render-failure/no-save-on-render-failure/.expected/diff.patch index 1bc17362b6..ca4a90c007 100644 --- a/e2e/testdata/fn-render/save-on-render-failure/no-save-on-render-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/save-on-render-failure/no-save-on-render-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 8a2f9e1..49b7fb6 100644 +index 8a2f9e1..b0a0aa4 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,11 +4,35 @@ metadata: +@@ -4,11 +4,37 @@ metadata: name: no-save-on-render-failure pipeline: mutators: @@ -26,6 +26,8 @@ index 8a2f9e1..49b7fb6 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/selectors/basicpipeline/.expected/diff.patch b/e2e/testdata/fn-render/selectors/basicpipeline/.expected/diff.patch index ef1154af5a..7596a087bb 100644 --- a/e2e/testdata/fn-render/selectors/basicpipeline/.expected/diff.patch +++ b/e2e/testdata/fn-render/selectors/basicpipeline/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index abc7b97..251ecc4 100644 +index abc7b97..169e7ae 100644 --- a/Kptfile +++ b/Kptfile -@@ -2,14 +2,27 @@ apiVersion: kpt.dev/v1 +@@ -2,14 +2,30 @@ apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: app @@ -25,7 +25,10 @@ index abc7b97..251ecc4 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/selectors/exclude/.expected/diff.patch b/e2e/testdata/fn-render/selectors/exclude/.expected/diff.patch index 320d1e7658..55df66a3b1 100644 --- a/e2e/testdata/fn-render/selectors/exclude/.expected/diff.patch +++ b/e2e/testdata/fn-render/selectors/exclude/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 266b33a..4be3f73 100644 +index 266b33a..a2d8b79 100644 --- a/Kptfile +++ b/Kptfile -@@ -8,10 +8,21 @@ pipeline: +@@ -8,10 +8,24 @@ pipeline: configMap: namespace: staging selectors: @@ -19,7 +19,10 @@ index 266b33a..4be3f73 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/selectors/generator/.expected/diff.patch b/e2e/testdata/fn-render/selectors/generator/.expected/diff.patch index 79d26c77b0..32544d85ee 100644 --- a/e2e/testdata/fn-render/selectors/generator/.expected/diff.patch +++ b/e2e/testdata/fn-render/selectors/generator/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index eb2f084..10441e5 100644 +index eb2f084..3879576 100644 --- a/Kptfile +++ b/Kptfile -@@ -14,3 +14,20 @@ pipeline: +@@ -14,3 +14,23 @@ pipeline: tier: db selectors: - name: httpbin @@ -10,7 +10,10 @@ index eb2f084..10441e5 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/selectors/selectors-with-exclude/.expected/diff.patch b/e2e/testdata/fn-render/selectors/selectors-with-exclude/.expected/diff.patch index d10b112118..0dd0d9e004 100644 --- a/e2e/testdata/fn-render/selectors/selectors-with-exclude/.expected/diff.patch +++ b/e2e/testdata/fn-render/selectors/selectors-with-exclude/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index c16cdca..1fd5efb 100644 +index c16cdca..fc29263 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,8 @@ apiVersion: kpt.dev/v1 @@ -11,7 +11,7 @@ index c16cdca..1fd5efb 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -15,3 +17,14 @@ pipeline: +@@ -15,3 +17,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -19,7 +19,10 @@ index c16cdca..1fd5efb 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/short-image-path/.expected/diff.patch b/e2e/testdata/fn-render/short-image-path/.expected/diff.patch index 5d0f6b9ea7..ff250453b0 100644 --- a/e2e/testdata/fn-render/short-image-path/.expected/diff.patch +++ b/e2e/testdata/fn-render/short-image-path/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index d4e5935..24022da 100644 +index d4e5935..711071b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index d4e5935..24022da 100644 pipeline: mutators: - image: set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index d4e5935..24022da 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/diff.patch b/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/diff.patch index ca32e656b4..b17bc06088 100644 --- a/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/diff.patch +++ b/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 91828a8..7d7d072 100644 +index 91828a8..bda0ae1 100644 --- a/Kptfile +++ b/Kptfile -@@ -9,3 +9,86 @@ pipeline: +@@ -9,3 +9,88 @@ pipeline: configMap: ignore_missing_schemas: "true" strict: "true" @@ -10,6 +10,8 @@ index 91828a8..7d7d072 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/subpkg-fn-failure/.expected/diff.patch b/e2e/testdata/fn-render/subpkg-fn-failure/.expected/diff.patch index 2a0ae26098..b72a0c2383 100644 --- a/e2e/testdata/fn-render/subpkg-fn-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkg-fn-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 364e274..4e01e27 100644 +index 364e274..81be4ae 100644 --- a/Kptfile +++ b/Kptfile -@@ -12,3 +12,23 @@ pipeline: +@@ -12,3 +12,25 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -10,6 +10,8 @@ index 364e274..4e01e27 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg ./db: diff --git a/e2e/testdata/fn-render/subpkg-has-invalid-kptfile/.expected/diff.patch b/e2e/testdata/fn-render/subpkg-has-invalid-kptfile/.expected/diff.patch index c66b445d9e..a488ad486f 100644 --- a/e2e/testdata/fn-render/subpkg-has-invalid-kptfile/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkg-has-invalid-kptfile/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..15413d2 100644 +index 1307fb5..4433dbf 100644 --- a/Kptfile +++ b/Kptfile -@@ -10,3 +10,11 @@ pipeline: +@@ -10,3 +10,13 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -10,6 +10,8 @@ index 1307fb5..15413d2 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/e2e/testdata/fn-render/subpkg-has-samename-subdir/.expected/diff.patch b/e2e/testdata/fn-render/subpkg-has-samename-subdir/.expected/diff.patch index 031c210bcd..a63f5b3255 100644 --- a/e2e/testdata/fn-render/subpkg-has-samename-subdir/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkg-has-samename-subdir/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 701e0a1..63952e8 100644 +index 701e0a1..2374819 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,3 +4,12 @@ metadata: +@@ -4,3 +4,15 @@ metadata: name: root-pkg info: description: sample description @@ -10,7 +10,10 @@ index 701e0a1..63952e8 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/subpkg-resource-deletion/.expected/diff.patch b/e2e/testdata/fn-render/subpkg-resource-deletion/.expected/diff.patch index aef01a905e..5095516788 100644 --- a/e2e/testdata/fn-render/subpkg-resource-deletion/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkg-resource-deletion/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 364e274..79d669a 100644 +index 364e274..6d7bb2e 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 364e274..79d669a 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest -@@ -12,3 +15,22 @@ pipeline: +@@ -12,3 +15,25 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 364e274..79d669a 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/subpkgs-with-krmignore/.expected/diff.patch b/e2e/testdata/fn-render/subpkgs-with-krmignore/.expected/diff.patch index fa040eaaab..17bcc965ae 100644 --- a/e2e/testdata/fn-render/subpkgs-with-krmignore/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkgs-with-krmignore/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 82686a8..7570107 100644 +index 82686a8..3055cab 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 82686a8..7570107 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,18 @@ pipeline: +@@ -10,3 +13,21 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: db @@ -20,7 +20,10 @@ index 82686a8..7570107 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/subpkgs/.expected/diff.patch b/e2e/testdata/fn-render/subpkgs/.expected/diff.patch index fa040eaaab..17bcc965ae 100644 --- a/e2e/testdata/fn-render/subpkgs/.expected/diff.patch +++ b/e2e/testdata/fn-render/subpkgs/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 82686a8..7570107 100644 +index 82686a8..3055cab 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 82686a8..7570107 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,18 @@ pipeline: +@@ -10,3 +13,21 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: db @@ -20,7 +20,10 @@ index 82686a8..7570107 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/success-stdout/.expected/diff.patch b/e2e/testdata/fn-render/success-stdout/.expected/diff.patch index 114ed718fa..0c2dfbdff3 100644 --- a/e2e/testdata/fn-render/success-stdout/.expected/diff.patch +++ b/e2e/testdata/fn-render/success-stdout/.expected/diff.patch @@ -1,5 +1,5 @@ diff --git a/Kptfile b/Kptfile -index 1307fb5..fee64dc 100644 +index 1307fb5..d18290b 100644 --- a/Kptfile +++ b/Kptfile @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1 @@ -12,7 +12,7 @@ index 1307fb5..fee64dc 100644 pipeline: mutators: - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 -@@ -10,3 +13,14 @@ pipeline: +@@ -10,3 +13,17 @@ pipeline: - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5 configMap: tier: backend @@ -20,7 +20,10 @@ index 1307fb5..fee64dc 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0 diff --git a/e2e/testdata/fn-render/validate-generated-resource/.expected/diff.patch b/e2e/testdata/fn-render/validate-generated-resource/.expected/diff.patch index 8632a3fdd2..b7b78051d0 100644 --- a/e2e/testdata/fn-render/validate-generated-resource/.expected/diff.patch +++ b/e2e/testdata/fn-render/validate-generated-resource/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index b2432a4..aab20f0 100644 +index b2432a4..ce87156 100644 --- a/Kptfile +++ b/Kptfile -@@ -9,3 +9,15 @@ pipeline: +@@ -9,3 +9,18 @@ pipeline: validators: - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest configPath: starlark-httpbin-val.yaml @@ -10,7 +10,10 @@ index b2432a4..aab20f0 100644 + conditions: + - type: Rendered + status: "True" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderSuccess ++ message: "" + renderStatus: + mutationSteps: + - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest diff --git a/e2e/testdata/fn-render/validate-resource-failure/.expected/diff.patch b/e2e/testdata/fn-render/validate-resource-failure/.expected/diff.patch index bb159929e9..2893cce154 100644 --- a/e2e/testdata/fn-render/validate-resource-failure/.expected/diff.patch +++ b/e2e/testdata/fn-render/validate-resource-failure/.expected/diff.patch @@ -1,8 +1,8 @@ diff --git a/Kptfile b/Kptfile -index 8c3173a..526d266 100644 +index 8c3173a..f6b3f42 100644 --- a/Kptfile +++ b/Kptfile -@@ -4,5 +4,25 @@ metadata: +@@ -4,5 +4,27 @@ metadata: name: db pipeline: validators: @@ -13,6 +13,8 @@ index 8c3173a..526d266 100644 + conditions: + - type: Rendered + status: "False" ++ observedgeneration: 0 ++ lasttransitiontime: "0001-01-01T00:00:00Z" + reason: RenderFailed + message: |- + pkg.render: pkg .: diff --git a/internal/docs/generated/pkgdocs/docs.go b/internal/docs/generated/pkgdocs/docs.go index ce23f2c2b0..f41f43cea0 100644 --- a/internal/docs/generated/pkgdocs/docs.go +++ b/internal/docs/generated/pkgdocs/docs.go @@ -211,13 +211,6 @@ var InitExamples = ` var TreeShort = `Display resources, files and packages in a tree structure.` var TreeLong = ` kpt pkg tree [DIR] - -Args: - - DIR: - Path to a local package directory. Defaults to the current directory. - Displays KRM resources with their Kind and Name, and non-KRM text files - as plain filenames. Dotfiles and symlinks are excluded. ` var TreeExamples = ` # Show resources in the current directory. diff --git a/internal/testutil/pkgbuilder/builder.go b/internal/testutil/pkgbuilder/builder.go index 2d72cf8939..64545ebd03 100644 --- a/internal/testutil/pkgbuilder/builder.go +++ b/internal/testutil/pkgbuilder/builder.go @@ -25,6 +25,7 @@ import ( kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1" rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1" "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -391,10 +392,10 @@ func (k *Kptfile) WithUpstreamLockRef(repoRef, dir, ref string, index int) *Kptf } // WithStatusCondition adds a status condition to the Kptfile. -func (k *Kptfile) WithStatusCondition(condition kptfilev1.Condition) *Kptfile { +func (k *Kptfile) WithStatusCondition(condition metav1.Condition) *Kptfile { if k.Status == nil { k.Status = &kptfilev1.Status{ - Conditions: []kptfilev1.Condition{}, + Conditions: []metav1.Condition{}, } } k.Status.Conditions = append(k.Status.Conditions, condition) diff --git a/pkg/api/kptfile/v1/types.go b/pkg/api/kptfile/v1/types.go index 5ad77be005..81020e2fb1 100644 --- a/pkg/api/kptfile/v1/types.go +++ b/pkg/api/kptfile/v1/types.go @@ -20,9 +20,9 @@ package v1 import ( "fmt" - "strings" fnresultv1 "github.com/kptdev/kpt/pkg/api/fnresult/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -409,7 +409,7 @@ func (i Inventory) IsValid() bool { } type Status struct { - Conditions []Condition `yaml:"conditions,omitempty" json:"conditions,omitempty"` + Conditions []metav1.Condition `yaml:"conditions,omitempty" json:"conditions,omitempty"` RenderStatus *RenderStatus `yaml:"renderStatus,omitempty" json:"renderStatus,omitempty"` } @@ -443,21 +443,13 @@ type PipelineStepResult struct { type Condition struct { Type string `yaml:"type" json:"type"` - Status ConditionStatus `yaml:"status" json:"status"` + Status metav1.ConditionStatus `yaml:"status" json:"status"` Reason string `yaml:"reason,omitempty" json:"reason,omitempty"` Message string `yaml:"message,omitempty" json:"message,omitempty"` } -type ConditionStatus string - -const ( - ConditionTrue ConditionStatus = "True" - ConditionFalse ConditionStatus = "False" - ConditionUnknown ConditionStatus = "Unknown" -) - // Rendered condition type and reasons const ( ConditionTypeRendered = "Rendered" @@ -466,8 +458,8 @@ const ( ) // NewRenderedCondition creates a Rendered status condition. -func NewRenderedCondition(status ConditionStatus, reason, message string) Condition { - return Condition{ +func NewRenderedCondition(status metav1.ConditionStatus, reason, message string) metav1.Condition { + return metav1.Condition{ Type: ConditionTypeRendered, Status: status, Reason: reason, @@ -484,15 +476,3 @@ const ( SaveOnRenderFailureAnnotation = "kpt.dev/save-on-render-failure" ) -func ToCondition(value string) ConditionStatus { - switch strings.ToLower(value) { - case strings.ToLower(string(ConditionTrue)): - return ConditionTrue - - case strings.ToLower(string(ConditionFalse)): - return ConditionFalse - - default: - return ConditionUnknown - } -} diff --git a/pkg/api/kptfile/v1/zz_generated.deepcopy.go b/pkg/api/kptfile/v1/zz_generated.deepcopy.go index 9930e7bd0c..793ef83919 100644 --- a/pkg/api/kptfile/v1/zz_generated.deepcopy.go +++ b/pkg/api/kptfile/v1/zz_generated.deepcopy.go @@ -20,6 +20,7 @@ package v1 import ( fnresultv1 "github.com/kptdev/kpt/pkg/api/fnresult/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -384,8 +385,10 @@ func (in *Status) DeepCopyInto(out *Status) { *out = *in if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]Condition, len(*in)) - copy(*out, *in) + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.RenderStatus != nil { in, out := &in.RenderStatus, &out.RenderStatus diff --git a/pkg/kptfile/kptfileutil/util_test.go b/pkg/kptfile/kptfileutil/util_test.go index 9d31b348cf..401a174231 100644 --- a/pkg/kptfile/kptfileutil/util_test.go +++ b/pkg/kptfile/kptfileutil/util_test.go @@ -363,6 +363,8 @@ status: conditions: - type: foo status: "True" + observedgeneration: 0 + lasttransitiontime: "0001-01-01T00:00:00Z" reason: reason message: message `, @@ -432,10 +434,14 @@ status: conditions: - type: foo status: "True" + observedgeneration: 0 + lasttransitiontime: "0001-01-01T00:00:00Z" reason: reason message: message - type: bar status: "False" + observedgeneration: 0 + lasttransitiontime: "0001-01-01T00:00:00Z" reason: reason message: message `, @@ -562,10 +568,14 @@ status: conditions: - type: foo status: "True" + observedgeneration: 0 + lasttransitiontime: "0001-01-01T00:00:00Z" reason: reason message: message - type: zork status: Unknown + observedgeneration: 0 + lasttransitiontime: "0001-01-01T00:00:00Z" reason: reason message: message `, diff --git a/pkg/lib/kptops/render_executor.go b/pkg/lib/kptops/render_executor.go index 0c3e574be1..f415095581 100644 --- a/pkg/lib/kptops/render_executor.go +++ b/pkg/lib/kptops/render_executor.go @@ -34,6 +34,7 @@ import ( "github.com/kptdev/kpt/pkg/lib/types" "github.com/kptdev/kpt/pkg/lib/util/attribution" "github.com/kptdev/kpt/pkg/printer" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/fn/framework" @@ -100,7 +101,7 @@ func (e *Renderer) Execute(ctx context.Context) (*fnresult.ResultList, error) { } // Read save-on-render-failure behavior from Kptfile annotation - if value, exists := kptfile.Annotations[kptfilev1.SaveOnRenderFailureAnnotation]; exists && kptfilev1.ToCondition(value) == kptfilev1.ConditionTrue { + if value, exists := kptfile.Annotations[kptfilev1.SaveOnRenderFailureAnnotation]; exists && strings.EqualFold(value, string(metav1.ConditionTrue)) { hctx.saveOnRenderFailure = true } @@ -108,7 +109,7 @@ func (e *Renderer) Execute(ctx context.Context) (*fnresult.ResultList, error) { // If the annotation "kpt.dev/bfs-rendering" is set to "true", use hydrateBfsOrder // otherwise use the default hydrate function in depth-first post-order. hydrateFn := hydrate - if value, exists := kptfile.Annotations[kptfilev1.BFSRenderAnnotation]; exists && kptfilev1.ToCondition(value) == kptfilev1.ConditionTrue { + if value, exists := kptfile.Annotations[kptfilev1.BFSRenderAnnotation]; exists && strings.EqualFold(value, string(metav1.ConditionTrue)) { hydrateFn = hydrateBfsOrder } @@ -226,11 +227,11 @@ func updateRenderStatus(hctx *hydrationContext, hydErr error) { } rootPath := hctx.root.pkg.UniquePath.String() - conditionStatus := kptfilev1.ConditionTrue + conditionStatus := metav1.ConditionTrue reason := kptfilev1.ReasonRenderSuccess message := "" if hydErr != nil { - conditionStatus = kptfilev1.ConditionFalse + conditionStatus = metav1.ConditionFalse reason = kptfilev1.ReasonRenderFailed message = strings.ReplaceAll(hydErr.Error(), rootPath, ".") } @@ -279,7 +280,7 @@ func stepName(s kptfilev1.PipelineStepResult) string { } // setRenderStatus reads the Kptfile at pkgPath, sets the Rendered condition and RenderStatus, and writes it back. -func setRenderStatus(fs filesys.FileSystem, pkgPath string, condition kptfilev1.Condition, renderStatus *kptfilev1.RenderStatus) { +func setRenderStatus(fs filesys.FileSystem, pkgPath string, condition metav1.Condition, renderStatus *kptfilev1.RenderStatus) { fsOrDisk := filesys.FileSystemOrOnDisk{FileSystem: fs} kf, err := kptfileutil.ReadKptfile(fsOrDisk, pkgPath) if err != nil { @@ -290,7 +291,7 @@ func setRenderStatus(fs filesys.FileSystem, pkgPath string, condition kptfilev1. kf.Status = &kptfilev1.Status{} } // Replace any existing Rendered condition - kf.Status.Conditions = slices.DeleteFunc(kf.Status.Conditions, func(c kptfilev1.Condition) bool { + kf.Status.Conditions = slices.DeleteFunc(kf.Status.Conditions, func(c metav1.Condition) bool { return c.Type == kptfilev1.ConditionTypeRendered }) kf.Status.Conditions = append(kf.Status.Conditions, condition) diff --git a/pkg/lib/kptops/render_executor_test.go b/pkg/lib/kptops/render_executor_test.go index 87c4c0fedd..1b94b395e3 100644 --- a/pkg/lib/kptops/render_executor_test.go +++ b/pkg/lib/kptops/render_executor_test.go @@ -30,6 +30,7 @@ import ( "github.com/kptdev/kpt/pkg/lib/types" "github.com/kptdev/kpt/pkg/printer" "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/kio" @@ -607,7 +608,7 @@ metadata: assert.NotNil(t, rootKf.Status) assert.Len(t, rootKf.Status.Conditions, 1) assert.Equal(t, kptfilev1.ConditionTypeRendered, rootKf.Status.Conditions[0].Type) - assert.Equal(t, kptfilev1.ConditionTrue, rootKf.Status.Conditions[0].Status) + assert.Equal(t, metav1.ConditionTrue, rootKf.Status.Conditions[0].Status) assert.Equal(t, kptfilev1.ReasonRenderSuccess, rootKf.Status.Conditions[0].Reason) } @@ -639,7 +640,7 @@ metadata: assert.NoError(t, err) assert.NotNil(t, rootKf.Status) assert.Len(t, rootKf.Status.Conditions, 1) - assert.Equal(t, kptfilev1.ConditionFalse, rootKf.Status.Conditions[0].Status) + assert.Equal(t, metav1.ConditionFalse, rootKf.Status.Conditions[0].Status) assert.Equal(t, kptfilev1.ReasonRenderFailed, rootKf.Status.Conditions[0].Reason) assert.Contains(t, rootKf.Status.Conditions[0].Message, "set-annotations failed") } @@ -679,7 +680,7 @@ status: assert.NoError(t, err) assert.NotNil(t, rootKf.Status) assert.Len(t, rootKf.Status.Conditions, 1) - assert.Equal(t, kptfilev1.ConditionTrue, rootKf.Status.Conditions[0].Status) + assert.Equal(t, metav1.ConditionTrue, rootKf.Status.Conditions[0].Status) assert.Equal(t, kptfilev1.ReasonRenderSuccess, rootKf.Status.Conditions[0].Reason) assert.Empty(t, rootKf.Status.Conditions[0].Message) } @@ -725,7 +726,7 @@ metadata: assert.NoError(t, err) assert.NotNil(t, rootKf.Status) assert.Len(t, rootKf.Status.Conditions, 1) - assert.Equal(t, kptfilev1.ConditionTrue, rootKf.Status.Conditions[0].Status) + assert.Equal(t, metav1.ConditionTrue, rootKf.Status.Conditions[0].Status) // Subpackage should NOT have any condition subKf, err := kptfileutil.ReadKptfile(mockFS, subPkgPath) @@ -901,7 +902,7 @@ metadata: // Condition should be set assert.Len(t, rootKf.Status.Conditions, 1) - assert.Equal(t, kptfilev1.ConditionFalse, rootKf.Status.Conditions[0].Status) + assert.Equal(t, metav1.ConditionFalse, rootKf.Status.Conditions[0].Status) // RenderStatus should be populated rs := rootKf.Status.RenderStatus diff --git a/pkg/lib/update/fastforward.go b/pkg/lib/update/fastforward.go index fd43a24cec..6287702a55 100644 --- a/pkg/lib/update/fastforward.go +++ b/pkg/lib/update/fastforward.go @@ -27,6 +27,7 @@ import ( "github.com/kptdev/kpt/pkg/lib/pkg/diff" "github.com/kptdev/kpt/pkg/lib/types" "github.com/kptdev/kpt/pkg/lib/update/updatetypes" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/sets" ) @@ -178,7 +179,7 @@ func clearRenderStatus(kf *kptfilev1.KptFile) { } kf.Status.RenderStatus = nil - kf.Status.Conditions = slices.DeleteFunc(kf.Status.Conditions, func(condition kptfilev1.Condition) bool { + kf.Status.Conditions = slices.DeleteFunc(kf.Status.Conditions, func(condition metav1.Condition) bool { return condition.Type == kptfilev1.ConditionTypeRendered }) if len(kf.Status.Conditions) == 0 { diff --git a/pkg/lib/update/fastforward_test.go b/pkg/lib/update/fastforward_test.go index 079a2540eb..c958d7c275 100644 --- a/pkg/lib/update/fastforward_test.go +++ b/pkg/lib/update/fastforward_test.go @@ -25,6 +25,7 @@ import ( "github.com/kptdev/kpt/pkg/lib/update" "github.com/kptdev/kpt/pkg/lib/update/updatetypes" "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const setLabelsImageV01 = "ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1" @@ -174,7 +175,7 @@ func TestUpdate_FastForward(t *testing.T) { WithUpstream(kptRepo, "/", "master", "fast-forward"). WithUpstreamLock(kptRepo, "/", "master", "abc123"). WithStatusCondition(kptfilev1.NewRenderedCondition( - kptfilev1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). + metav1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). WithStatusRenderStatus( []kptfilev1.PipelineStepResult{{Image: setLabelsImageV01, ExitCode: 0}}, nil, ""), @@ -197,9 +198,9 @@ func TestUpdate_FastForward(t *testing.T) { origin: pkgbuilder.NewRootPkg(). WithKptfile( pkgbuilder.NewKptfile(). - WithStatusCondition(kptfilev1.Condition{ + WithStatusCondition(metav1.Condition{ Type: "Ready", - Status: kptfilev1.ConditionTrue, + Status: metav1.ConditionTrue, Reason: "AllReady", }), ). @@ -209,13 +210,13 @@ func TestUpdate_FastForward(t *testing.T) { pkgbuilder.NewKptfile(). WithUpstream(kptRepo, "/", "master", "fast-forward"). WithUpstreamLock(kptRepo, "/", "master", "abc123"). - WithStatusCondition(kptfilev1.Condition{ + WithStatusCondition(metav1.Condition{ Type: "Ready", - Status: kptfilev1.ConditionTrue, + Status: metav1.ConditionTrue, Reason: "AllReady", }). WithStatusCondition(kptfilev1.NewRenderedCondition( - kptfilev1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). + metav1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). WithStatusRenderStatus( []kptfilev1.PipelineStepResult{{Image: setLabelsImageV01, ExitCode: 0}}, nil, ""), @@ -224,9 +225,9 @@ func TestUpdate_FastForward(t *testing.T) { updated: pkgbuilder.NewRootPkg(). WithKptfile( pkgbuilder.NewKptfile(). - WithStatusCondition(kptfilev1.Condition{ + WithStatusCondition(metav1.Condition{ Type: "Ready", - Status: kptfilev1.ConditionTrue, + Status: metav1.ConditionTrue, Reason: "AllReady", }), ). @@ -238,9 +239,9 @@ func TestUpdate_FastForward(t *testing.T) { pkgbuilder.NewKptfile(). WithUpstream(kptRepo, "/", "master", "fast-forward"). WithUpstreamLock(kptRepo, "/", "master", "abc123"). - WithStatusCondition(kptfilev1.Condition{ + WithStatusCondition(metav1.Condition{ Type: "Ready", - Status: kptfilev1.ConditionTrue, + Status: metav1.ConditionTrue, Reason: "AllReady", }), ). @@ -261,7 +262,7 @@ func TestUpdate_FastForward(t *testing.T) { WithKptfile( pkgbuilder.NewKptfile(). WithStatusCondition(kptfilev1.NewRenderedCondition( - kptfilev1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). + metav1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). WithStatusRenderStatus( []kptfilev1.PipelineStepResult{{Image: setLabelsImageV01, ExitCode: 0}}, nil, ""), @@ -287,7 +288,7 @@ func TestUpdate_FastForward(t *testing.T) { WithUpstream(kptRepo, "/", "master", "fast-forward"). WithUpstreamLock(kptRepo, "/", "master", "abc123"). WithStatusCondition(kptfilev1.NewRenderedCondition( - kptfilev1.ConditionFalse, kptfilev1.ReasonRenderFailed, "function failed")). + metav1.ConditionFalse, kptfilev1.ReasonRenderFailed, "function failed")). WithStatusRenderStatus( []kptfilev1.PipelineStepResult{{Image: setLabelsImageV01, ExitCode: 1, ExecutionError: "validation error"}}, nil, "render failed"), @@ -351,7 +352,7 @@ func TestFastForward_RenderStatusDoesNotMaskLocalEdits(t *testing.T) { WithUpstreamLock(kptRepo, "/", "master", "abc123"). WithPipeline(pkgbuilder.NewFunction(setLabelsImageV01)). WithStatusCondition(kptfilev1.NewRenderedCondition( - kptfilev1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). + metav1.ConditionTrue, kptfilev1.ReasonRenderSuccess, "")). WithStatusRenderStatus( []kptfilev1.PipelineStepResult{{Image: setLabelsImageV01, ExitCode: 0}}, nil, ""),