-
Notifications
You must be signed in to change notification settings - Fork 258
feat: Add CEL-based conditional function execution (#4388) #4391
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.
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
Open
SurbhiAgarwal1
wants to merge
20
commits into
kptdev:main
Choose a base branch
from
SurbhiAgarwal1:feat/cel-conditional-execution
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
aec1d1e
feat: Add CEL-based conditional function execution
SurbhiAgarwal1 84e1d94
fix: remove k8s.io/apiserver dependency from CEL evaluator
SurbhiAgarwal1 08742aa
refactor: move CELEnvironment to runneroptions, compile program per E…
SurbhiAgarwal1 df38833
Potential fix for pull request finding
SurbhiAgarwal1 6d13e92
refactor: replace Go unit e2e test with proper fn-render testdata
SurbhiAgarwal1 5573f7a
fix: remove k8s.io/apiserver from go.mod, fix celeval_test.go imports
SurbhiAgarwal1 2f777f8
fix: nil CELEnvironment in cmdeval test struct comparison
SurbhiAgarwal1 259e803
fix: two e2e test failures in condition testdata
SurbhiAgarwal1 728c384
fix: update condition testdata diff.patch with correct expected output
SurbhiAgarwal1 caebfa4
fix: correct e2e testdata and clarify k8s CEL library decision
SurbhiAgarwal1 6d1fb6b
fix: update diff.patch with exact hashes from CI output
SurbhiAgarwal1 1782849
feat: add k8s.io/apiserver CEL library extensions (IP, CIDR, Quantity…
SurbhiAgarwal1 f08fcb8
fix: correct SemVer function name to SemverLib in k8s CEL library
SurbhiAgarwal1 2f3382c
fix: increase reconcile-timeout from 2m to 5m in live-apply e2e tests
SurbhiAgarwal1 bbf9321
fix: address Copilot review comments
SurbhiAgarwal1 ffeadea
fix: address PR review feedback from mozesl-nokia and Copilot
SurbhiAgarwal1 910fbd5
Merge upstream main into feat/cel-conditional-execution
SurbhiAgarwal1 367b250
chore: trigger CI rebuild
SurbhiAgarwal1 19bf57c
chore: Remove unwanted files and fix test expectations
SurbhiAgarwal1 b6f3d8e
docs: add condition field documentation for CEL-based conditional fun…
SurbhiAgarwal1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
e2e/testdata/fn-render/condition/condition-met/.expected/config.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| actualStripLines: | ||
| - " stderr: 'WARNING: The requested image''s platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested'" | ||
|
|
||
| stdErrStripLines: | ||
| - " Stderr:" | ||
| - " \"WARNING: The requested image's platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested\"" | ||
|
|
||
| stdErr: | | ||
| Package: "condition-met" | ||
| [RUNNING] "ghcr.io/kptdev/krm-functions-catalog/no-op" | ||
| [PASS] "ghcr.io/kptdev/krm-functions-catalog/no-op" in 0s | ||
| Successfully executed 1 function(s) in 1 package(s). |
19 changes: 19 additions & 0 deletions
19
e2e/testdata/fn-render/condition/condition-met/.expected/diff.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/Kptfile b/Kptfile | ||
| index eb90ac3..ace574a 100644 | ||
| --- a/Kptfile | ||
| +++ b/Kptfile | ||
| @@ -5,4 +5,12 @@ metadata: | ||
| pipeline: | ||
| mutators: | ||
| - image: ghcr.io/kptdev/krm-functions-catalog/no-op | ||
| - condition: "resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config')" | ||
| + condition: resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config') | ||
| +status: | ||
| + conditions: | ||
| + - type: Rendered | ||
| + status: "True" | ||
| + reason: RenderSuccess | ||
| + renderStatus: | ||
| + mutationSteps: | ||
| + - image: ghcr.io/kptdev/krm-functions-catalog/no-op | ||
| + exitCode: 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .expected |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: kpt.dev/v1 | ||
| kind: Kptfile | ||
| metadata: | ||
| name: app | ||
| pipeline: | ||
| mutators: | ||
| - image: ghcr.io/kptdev/krm-functions-catalog/no-op | ||
| condition: "resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config')" |
13 changes: 13 additions & 0 deletions
13
e2e/testdata/fn-render/condition/condition-met/resources.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: app-config | ||
| data: | ||
| key: value | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: my-app | ||
| spec: | ||
| replicas: 1 |
11 changes: 11 additions & 0 deletions
11
e2e/testdata/fn-render/condition/condition-not-met/.expected/config.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| actualStripLines: | ||
| - " stderr: 'WARNING: The requested image''s platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested'" | ||
|
|
||
| stdErrStripLines: | ||
| - " Stderr:" | ||
| - " \"WARNING: The requested image's platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested\"" | ||
|
|
||
| stdErr: | | ||
| Package: "condition-not-met" | ||
| [SKIPPED] "ghcr.io/kptdev/krm-functions-catalog/no-op" (condition not met) | ||
| Successfully executed 1 function(s) in 1 package(s). |
17 changes: 17 additions & 0 deletions
17
e2e/testdata/fn-render/condition/condition-not-met/.expected/diff.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff --git a/Kptfile b/Kptfile | ||
| index eb90ac3..ace574a 100644 | ||
| --- a/Kptfile | ||
| +++ b/Kptfile | ||
| @@ -5,4 +5,11 @@ metadata: | ||
| pipeline: | ||
| mutators: | ||
| - image: ghcr.io/kptdev/krm-functions-catalog/no-op | ||
| - condition: "resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config')" | ||
| + condition: resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config') | ||
| +status: | ||
| + conditions: | ||
| + - type: Rendered | ||
| + status: "True" | ||
| + reason: RenderSuccess | ||
| + renderStatus: | ||
| + mutationSteps: [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .expected |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: kpt.dev/v1 | ||
| kind: Kptfile | ||
| metadata: | ||
| name: app | ||
| pipeline: | ||
| mutators: | ||
| - image: ghcr.io/kptdev/krm-functions-catalog/no-op | ||
| condition: "resources.exists(r, r.kind == 'ConfigMap' && r.metadata.name == 'app-config')" |
6 changes: 6 additions & 0 deletions
6
e2e/testdata/fn-render/condition/condition-not-met/resources.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: my-app | ||
| spec: | ||
| replicas: 1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the CI failures on this are legitimate. The Kptfile api has been updated to include the renderStatus field
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in commit 19bf57c. I've updated both condition test cases to include the renderStatus field in the expected output. The condition-not-met test now shows empty mutationSteps (function skipped), and condition-met shows the function execution with exitCode 0.