Skip to content

DRAFT - Migrate custom condition to metav1.conditions #4548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aravindtga wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DRAFT - Migrate custom condition to metav1.conditions #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,15 +12,18 @@ 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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,15 +12,18 @@ 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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/basicpipeline/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,15 +12,18 @@ 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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/default-runtime/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,15 +12,18 @@ 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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/exec-function-stderr/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/exec-function-with-args/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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/'
Expand Down
6 changes: 4 additions & 2 deletions e2e/testdata/fn-render/exec-without-permissions/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 .:
Expand Down
6 changes: 4 additions & 2 deletions e2e/testdata/fn-render/fn-failure-output-no-truncate/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
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"
+status:
+ conditions:
+ - type: Rendered
+ status: "False"
+ observedgeneration: 0
+ lasttransitiontime: "0001-01-01T00:00:00Z"
+ reason: RenderFailed
+ message: |-
+ pkg.render: pkg .:
Expand Down
6 changes: 4 additions & 2 deletions e2e/testdata/fn-render/fn-failure/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 .:
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/fn-success-with-stderr/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
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
+status:
+ 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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/fnconfig-ancestorfn-not-mutate-subpkg-config/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
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
+status:
+ conditions:
+ - type: Rendered
+ status: "False"
+ observedgeneration: 0
+ lasttransitiontime: "0001-01-01T00:00:00Z"
+ reason: RenderFailed
+ message: |
+ pkg.render: pkg .: Kptfile is invalid:
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/fnconfig-in-subdir/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/fnconfig-pkgfn-refers-subdir/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions e2e/testdata/fn-render/fnconfig-updated-in-render/.expected/diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,15 +11,18 @@ 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
+status:
+ 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
Expand Down
Loading
Loading