-
Notifications
You must be signed in to change notification settings - Fork 258
Split/fn eval namespace #4444
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
1
commit into
kptdev:main
Choose a base branch
from
SurbhiAgarwal1:split/fn-eval-namespace
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
Split/fn eval namespace #4444
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,9 @@ | ||||||||
| # Set default behavior to automatically normalize line endings | ||||||||
| * text=auto | ||||||||
|
Comment on lines
+1
to
+2
|
||||||||
| # Set default behavior to automatically normalize line endings | |
| * text=auto | |
| # Enforce consistent line endings for script files |
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
57 changes: 57 additions & 0 deletions
57
e2e/testdata/fn-eval/fn-success-with-stderr/pkg/.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,57 @@ | ||
| diff --git a/resources.yaml b/resources.yaml | ||
| index 9d1f786..f2eec52 100644 | ||
| --- a/resources.yaml | ||
| +++ b/resources.yaml | ||
| @@ -1,26 +1,26 @@ | ||
| -# Copyright 2021 The kpt Authors | ||
| -# | ||
| -# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -# you may not use this file except in compliance with the License. | ||
| -# You may obtain a copy of the License at | ||
| -# | ||
| -# http://www.apache.org/licenses/LICENSE-2.0 | ||
| -# | ||
| -# Unless required by applicable law or agreed to in writing, software | ||
| -# distributed under the License is distributed on an "AS IS" BASIS, | ||
| -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -# See the License for the specific language governing permissions and | ||
| -# limitations under the License. | ||
| -apiVersion: apps/v1 | ||
| -kind: Deployment | ||
| -metadata: | ||
| - name: nginx-deployment | ||
| -spec: | ||
| - replicas: 3 | ||
| ---- | ||
| -apiVersion: custom.io/v1 | ||
| -kind: Custom | ||
| -metadata: | ||
| - name: custom | ||
| -spec: | ||
| - image: nginx:1.2.3 | ||
| +# Copyright 2021 The kpt Authors | ||
| +# | ||
| +# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| +# you may not use this file except in compliance with the License. | ||
| +# You may obtain a copy of the License at | ||
| +# | ||
| +# http://www.apache.org/licenses/LICENSE-2.0 | ||
| +# | ||
| +# Unless required by applicable law or agreed to in writing, software | ||
| +# distributed under the License is distributed on an "AS IS" BASIS, | ||
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| +# See the License for the specific language governing permissions and | ||
| +# limitations under the License. | ||
| +apiVersion: apps/v1 | ||
| +kind: Deployment | ||
| +metadata: | ||
| + name: nginx-deployment | ||
| +spec: | ||
| + replicas: 3 | ||
| +--- | ||
| +apiVersion: custom.io/v1 | ||
| +kind: Custom | ||
| +metadata: | ||
| + name: custom | ||
| +spec: | ||
| + image: nginx:1.2.3 |
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
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
57 changes: 57 additions & 0 deletions
57
e2e/testdata/fn-eval/missing-fn-config/.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,57 @@ | ||
| diff --git a/resources.yaml b/resources.yaml | ||
| index 9d1f786..f2eec52 100644 | ||
| --- a/resources.yaml | ||
| +++ b/resources.yaml | ||
| @@ -1,26 +1,26 @@ | ||
| -# Copyright 2021 The kpt Authors | ||
| -# | ||
| -# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -# you may not use this file except in compliance with the License. | ||
| -# You may obtain a copy of the License at | ||
| -# | ||
| -# http://www.apache.org/licenses/LICENSE-2.0 | ||
| -# | ||
| -# Unless required by applicable law or agreed to in writing, software | ||
| -# distributed under the License is distributed on an "AS IS" BASIS, | ||
| -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -# See the License for the specific language governing permissions and | ||
| -# limitations under the License. | ||
| -apiVersion: apps/v1 | ||
| -kind: Deployment | ||
| -metadata: | ||
| - name: nginx-deployment | ||
| -spec: | ||
| - replicas: 3 | ||
| ---- | ||
| -apiVersion: custom.io/v1 | ||
| -kind: Custom | ||
| -metadata: | ||
| - name: custom | ||
| -spec: | ||
| - image: nginx:1.2.3 | ||
| +# Copyright 2021 The kpt Authors | ||
| +# | ||
| +# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| +# you may not use this file except in compliance with the License. | ||
| +# You may obtain a copy of the License at | ||
| +# | ||
| +# http://www.apache.org/licenses/LICENSE-2.0 | ||
| +# | ||
| +# Unless required by applicable law or agreed to in writing, software | ||
| +# distributed under the License is distributed on an "AS IS" BASIS, | ||
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| +# See the License for the specific language governing permissions and | ||
| +# limitations under the License. | ||
| +apiVersion: apps/v1 | ||
| +kind: Deployment | ||
| +metadata: | ||
| + name: nginx-deployment | ||
| +spec: | ||
| + replicas: 3 | ||
| +--- | ||
| +apiVersion: custom.io/v1 | ||
| +kind: Custom | ||
| +metadata: | ||
| + name: custom | ||
| +spec: | ||
| + image: nginx:1.2.3 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| diff --git a/resources.yaml b/resources.yaml | ||
| index c0974f0..60f96f2 100644 | ||
| --- a/resources.yaml | ||
| +++ b/resources.yaml | ||
| @@ -1,82 +1,82 @@ | ||
| -# Copyright 2021 The kpt Authors | ||
| -# | ||
| -# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -# you may not use this file except in compliance with the License. | ||
| -# You may obtain a copy of the License at | ||
| -# | ||
| -# http://www.apache.org/licenses/LICENSE-2.0 | ||
| -# | ||
| -# Unless required by applicable law or agreed to in writing, software | ||
| -# distributed under the License is distributed on an "AS IS" BASIS, | ||
| -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -# See the License for the specific language governing permissions and | ||
| -# limitations under the License. | ||
| -apiVersion: apps/v1 | ||
| -kind: Deployment | ||
| -metadata: | ||
| - name: my-nginx | ||
| - namespace: my-space | ||
| - labels: | ||
| - env: dev | ||
| - foo: bar | ||
| -spec: | ||
| - # comment 1 | ||
| - replicas: 3 | ||
| - selector: | ||
| - # comment 2 | ||
| - matchLabels: # comment 3 | ||
| - # comment 4 | ||
| - app: nginx # comment 5 | ||
| - template: | ||
| - metadata: | ||
| - labels: | ||
| - app: nginx | ||
| - spec: | ||
| - # comment 6 | ||
| - containers: | ||
| - # comment 7 | ||
| - - name: nginx | ||
| - image: 'nginx:1.14.2' # comment 8 | ||
| - ports: | ||
| - # comment 9 | ||
| - - containerPort: 80 # comment 10 | ||
| ---- | ||
| -apiVersion: v1 | ||
| -kind: Service | ||
| -metadata: | ||
| - name: my-service | ||
| -spec: | ||
| - ports: | ||
| - # comment 1 | ||
| - - name: etcd-server-ssl | ||
| - port: 2380 | ||
| - # comment 2 | ||
| - - name: etcd-client-ssl | ||
| - port: 2379 | ||
| ---- | ||
| -apiVersion: constraints.gatekeeper.sh/v1beta1 | ||
| -kind: EnforceFoo | ||
| -metadata: | ||
| - name: enforce-foo | ||
| -spec: | ||
| - parameters: | ||
| - naming_rules: | ||
| - - kind: Folder | ||
| - patterns: | ||
| - # comment 1 | ||
| - - ^(dev|prod|staging|qa|shared)$ | ||
| ---- | ||
| -apiVersion: v1 | ||
| -kind: ConfigMap | ||
| -metadata: | ||
| - name: setters-config | ||
| -data: | ||
| - # This should be the name of your Config Controller instance | ||
| - cluster-name: cluster-name | ||
| - # This should be the project where you deployed Config Controller | ||
| - project-id: project-id | ||
| - project-number: '1234567890123' | ||
| - # You can leave these defaults | ||
| - namespace: config-control | ||
| - deployment-repo: deployment-repo | ||
| - source-repo: source-repo | ||
| +# Copyright 2021 The kpt Authors | ||
| +# | ||
| +# Licensed under the Apache License, Version 2.0 (the "License"); | ||
| +# you may not use this file except in compliance with the License. | ||
| +# You may obtain a copy of the License at | ||
| +# | ||
| +# http://www.apache.org/licenses/LICENSE-2.0 | ||
| +# | ||
| +# Unless required by applicable law or agreed to in writing, software | ||
| +# distributed under the License is distributed on an "AS IS" BASIS, | ||
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| +# See the License for the specific language governing permissions and | ||
| +# limitations under the License. | ||
| +apiVersion: apps/v1 | ||
| +kind: Deployment | ||
| +metadata: | ||
| + name: my-nginx | ||
| + namespace: my-space | ||
| + labels: | ||
| + env: dev | ||
| + foo: bar | ||
| +spec: | ||
| + # comment 1 | ||
| + replicas: 3 | ||
| + selector: | ||
| + # comment 2 | ||
| + matchLabels: # comment 3 | ||
| + # comment 4 | ||
| + app: nginx # comment 5 | ||
| + template: | ||
| + metadata: | ||
| + labels: | ||
| + app: nginx | ||
| + spec: | ||
| + # comment 6 | ||
| + containers: | ||
| + # comment 7 | ||
| + - name: nginx | ||
| + image: 'nginx:1.14.2' # comment 8 | ||
| + ports: | ||
| + # comment 9 | ||
| + - containerPort: 80 # comment 10 | ||
| +--- | ||
| +apiVersion: v1 | ||
| +kind: Service | ||
| +metadata: | ||
| + name: my-service | ||
| +spec: | ||
| + ports: | ||
| + # comment 1 | ||
| + - name: etcd-server-ssl | ||
| + port: 2380 | ||
| + # comment 2 | ||
| + - name: etcd-client-ssl | ||
| + port: 2379 | ||
| +--- | ||
| +apiVersion: constraints.gatekeeper.sh/v1beta1 | ||
| +kind: EnforceFoo | ||
| +metadata: | ||
| + name: enforce-foo | ||
| +spec: | ||
| + parameters: | ||
| + naming_rules: | ||
| + - kind: Folder | ||
| + patterns: | ||
| + # comment 1 | ||
| + - ^(dev|prod|staging|qa|shared)$ | ||
| +--- | ||
| +apiVersion: v1 | ||
| +kind: ConfigMap | ||
| +metadata: | ||
| + name: setters-config | ||
| +data: | ||
| + # This should be the name of your Config Controller instance | ||
| + cluster-name: cluster-name | ||
| + # This should be the project where you deployed Config Controller | ||
| + project-id: project-id | ||
| + project-number: '1234567890123' | ||
| + # You can leave these defaults | ||
| + namespace: config-control | ||
| + deployment-repo: deployment-repo | ||
| + source-repo: source-repo |
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.
The PR description/title focus on splitting
fn evalnamespace behavior and updatingfn evalE2E data, but this diff also removes a very large portion ofe2e/testdata/fn-render/**fixtures and expected outputs (plus a vendored license). If the intent is truly “part 1: fn-eval only”, thesefn-renderdeletions should be moved to a separate PR (or reverted here) to avoid mixing concerns and accidental loss offn rendercoverage/data.