retain quotes in namespace transformer filter #4421

shanalily · 2022-01-25T23:42:15Z

should fix #4386

k8s-ci-robot · 2022-01-25T23:42:16Z

@shanalily: This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot · 2022-01-25T23:42:22Z

Welcome @shanalily!

It looks like this is your first PR to kubernetes-sigs/kustomize 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kustomize has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

linux-foundation-easycla · 2022-01-25T23:42:23Z

The committers are authorized under a signed CLA.

✅ Shoshana Malfatto (7041d40, a36cf1d, 306048e, 66b5668, a3ca300, c988fe6, 9424955, ae04c12, 72fa14a, 4860d74, e5656e7, 5bb7f83, 07e1112, 3b0a9a1, 7beb686, f4008c0, 4899c16, 8ef9cfa, 52517d0, 19dbdd8)

k8s-ci-robot · 2022-01-25T23:42:23Z

Hi @shanalily. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot · 2022-01-25T23:42:36Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: login-issues@jira.linuxfoundation.org

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

api/filters/labels/example_test.go

api/filters/namespace/example_test.go

api/filters/filtersutil/setters.go

natasha41575 · 2022-01-26T00:14:12Z

/ok-to-test

Thank you for working on this! Please sign the CLA

shanalily · 2022-01-26T00:36:16Z

/label tide/merge-method-squash

shanalily · 2022-01-26T00:38:15Z

@natasha41575 thank you for reviewing! I will work on resolving your comments including getting the CLA check passing (I didn't have an LF account before this PR).

shanalily · 2022-01-28T01:21:27Z

I signed it

natasha41575 · 2022-01-28T01:23:47Z

Please make sure that your email is set on your commits correctly. There is a comment from the bot above with more details for how to do this.

shanalily · 2022-01-31T16:57:24Z

I signed it

shanalily · 2022-01-31T16:59:54Z

@natasha41575 I did set the user and email on my commits (to my github username and primary email) when I was first signing with git commit --amend --reset-author for all commits and then git push --force. Just tried name instead of username.
If I keep having issues I'll contact LF support but I assume it's some step I'm missing.

natasha41575 · 2022-02-02T00:47:28Z

@shanalily what is the output if you run the command git config --global user.name?

Also, please squash your commits.

shanalily · 2022-02-02T02:07:04Z

@natasha41575 output is shanalily, which I tried but also tried my full name in github and lf profiles

just squashed (and tests will fail right now because I need to fix the replicacount filter and some other stuff)

shanalily · 2022-03-02T15:33:00Z

Hi @monopole @KnVerey @natasha41575, wondering if someone can take a look, thank you!
Sorry about leaving this PR open in a state without tests passing for so long.

natasha41575 · 2022-03-04T00:02:58Z

Thanks! I will take a look first thing tomorrow.

natasha41575

Overall this looks great! I just have some questions mostly to make sure that I understand the changes.

cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile

kyaml/yaml/rnode.go

cmd/config/internal/commands/e2e/e2econtainerconfig/main.go

api/internal/generators/utils.go

natasha41575 · 2022-03-10T00:01:35Z

api/internal/generators/configmap_test.go

@@ -140,7 +140,7 @@ metadata:
    foo: 'bar'
 data:
  a: x
-  b: y
+  b: "y"


why does "y" get quoted?

I believe this is because LoadMapIntoConfigMapData uses yaml.FieldSetter, so it will have the DoubleQuotedStyle added by the check in to FieldSetter.Filter since it's a yaml1.1 non-string and has the string tag.

I figured it's okay to change this test since this is an invalid config (I shared output in my comment in the linked issue #4386 showing issues with invalid yaml 1.1 values in config map data).

Any data that should be quoted and isn't passed through FieldSetter.Filter won't be corrected.

This won't fix #4472, idk if the env var gets passed through FieldSetter.Filter at all but the env var losing quotes in the example is not an invalid yaml 1.1 string and that config can be applied.

Oh, I see. I had to do some research because I'm not a yaml expert, but TIL that "y" is the equivalent of "true" in yaml 1.1.

natasha41575 · 2022-03-18T18:43:57Z

@shanalily maybe I am missing something but I don't see your replies to my questions above?

#4421 (comment) and #4421 (comment)

kyaml/fn/framework/command/command_test.go

shanalily · 2022-02-28T18:38:10Z

api/filters/namespace/namespace.go

@@ -52,7 +52,7 @@ func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
 	// transformations based on data -- :)
 	err := node.PipeE(fsslice.Filter{
 		FsSlice:    ns.FsSlice,
-		SetValue:   ns.trackableSetter.SetScalar(ns.Namespace),
+		SetValue:   ns.trackableSetter.SetEntry("", ns.Namespace, yaml.NodeTagString),


I removed changes to SetScalar and am using SetEntry("", ns.Namespace, <tag>) where a tag is needed, so as not to make any changes to public functions.
I only added tag to namespace and replicacount filters to minimize changes but could add to other filters (suffix, prefix, etc.) if requested so they don't also remove quotes.

I'm resolving the outdated comments with @natasha41575 but would like to know if using SetEntry is fine in these cases, since that allows moving the addition of the double quotes style to the FieldSetter func in the kyaml package, which should work whenever the scalar type tag is set on the rnode passed to it.

The other problems mentioned in the issue I opened (configmap "true|false" values, a separate env variable issue #4472) are not resolved by this PR.

shanalily · 2022-02-28T18:47:21Z

cmd/config/internal/commands/e2e/e2econtainerconfig/main.go

-	cmd := framework.Command(resourceList, func() error {
-		for i := range resourceList.Items {
-			if err := resourceList.Items[i].PipeE(yaml.SetAnnotation("a-string-value",
+	fn := func(items []*yaml.RNode) ([]*yaml.RNode, error) {


This doesn't impact tests passing or not but I think having this updated helps rule out whether this is the source of a bug in the run fs command unit tests. I can remove if a reviewer doesn't think this should be included.

api/internal/generators/utils.go

cmd/config/internal/commands/e2e/e2econtainerconfig/main.go

cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile

shanalily · 2022-03-10T00:54:56Z

api/internal/generators/configmap_test.go

@@ -140,7 +140,7 @@ metadata:
    foo: 'bar'
 data:
  a: x
-  b: y
+  b: "y"


I believe this is because LoadMapIntoConfigMapData uses yaml.FieldSetter, so it will have the DoubleQuotedStyle added by the check in to FieldSetter.Filter since it's a yaml1.1 non-string and has the string tag.

shanalily · 2022-03-10T15:57:02Z

api/internal/generators/configmap_test.go

@@ -140,7 +140,7 @@ metadata:
    foo: 'bar'
 data:
  a: x
-  b: y
+  b: "y"


I figured it's okay to change this test since this is an invalid config (I shared output in my comment in the linked issue #4386 showing issues with invalid yaml 1.1 values in config map data).

Any data that should be quoted and isn't passed through FieldSetter.Filter won't be corrected.

This won't fix #4472, idk if the env var gets passed through FieldSetter.Filter at all but the env var losing quotes in the example is not an invalid yaml 1.1 string and that config can be applied.

shanalily · 2022-03-19T01:02:58Z

@natasha41575 sorry I didn’t realize that “pending” meant the comment wasn’t posted! Hopefully shows up now

natasha41575

/lgtm
/approve

k8s-ci-robot · 2022-03-23T21:03:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: natasha41575, shanalily

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [natasha41575]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

* check tag values for double quoting * reuse setentry * don't override single quotes in merge and fix cm generator immutable val * get rid of comment * starlark annotation tests * don't commit test image changes * set network to bool * isSet bool * updating e2e config tool * leave createtag * fn command failing unmarshal test * fn command test * don't set style in run-fs * use setentry to set tag * remove e2e test changes and make IsStringValue an RNode method

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 25, 2022

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 25, 2022

k8s-ci-robot requested review from KnVerey and monopole January 25, 2022 23:42

shanalily force-pushed the int-namespace branch from 274667b to 19dbdd8 Compare January 25, 2022 23:53

natasha41575 reviewed Jan 26, 2022

View reviewed changes

api/filters/labels/example_test.go Outdated Show resolved Hide resolved

api/filters/namespace/example_test.go Outdated Show resolved Hide resolved

api/filters/filtersutil/setters.go Outdated Show resolved Hide resolved

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 26, 2022

k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 26, 2022

shanalily force-pushed the int-namespace branch from 5e8a7df to ff186e7 Compare January 31, 2022 16:51

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 2, 2022

shanalily force-pushed the int-namespace branch from 42c3731 to 0c05a1b Compare February 2, 2022 01:52

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 2, 2022

shanalily force-pushed the int-namespace branch from 0c05a1b to bbf5d82 Compare February 2, 2022 02:05

shanalily force-pushed the int-namespace branch from bbf5d82 to c9c982e Compare February 2, 2022 20:48

shanalily added 5 commits February 17, 2022 10:09

set network to bool

5509834

isSet bool

4832510

updating e2e config tool

7ca3615

leave createtag

246d070

fn command failing unmarshal test

c98a310

shanalily force-pushed the int-namespace branch from ad9d019 to c98a310 Compare February 17, 2022 18:22

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 17, 2022

fn command test

99e6c57

shanalily force-pushed the int-namespace branch 2 times, most recently from 12c2453 to ac5f0a9 Compare February 26, 2022 01:58

don't set style in run-fs

71570f8

shanalily force-pushed the int-namespace branch from ac5f0a9 to 71570f8 Compare February 26, 2022 01:59

use setentry to set tag

ec36280

natasha41575 reviewed Mar 4, 2022

View reviewed changes

remove e2e test changes and make IsStringValue an RNode method

dc40cb9

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 4, 2022

natasha41575 reviewed Mar 10, 2022

View reviewed changes

shanalily commented Mar 19, 2022

View reviewed changes

natasha41575 reviewed Mar 23, 2022

View reviewed changes

k8s-ci-robot assigned natasha41575 Mar 23, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 23, 2022

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 23, 2022

k8s-ci-robot merged commit 7b0ec99 into kubernetes-sigs:master Mar 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

retain quotes in namespace transformer filter #4421

retain quotes in namespace transformer filter #4421

shanalily commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

linux-foundation-easycla bot commented Jan 25, 2022 •

edited

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

natasha41575 commented Jan 26, 2022

shanalily commented Jan 26, 2022

shanalily commented Jan 26, 2022

shanalily commented Jan 28, 2022

natasha41575 commented Jan 28, 2022

shanalily commented Jan 31, 2022

shanalily commented Jan 31, 2022

natasha41575 commented Feb 2, 2022 •

edited

shanalily commented Feb 2, 2022 •

edited

shanalily commented Mar 2, 2022

natasha41575 commented Mar 4, 2022

natasha41575 left a comment

natasha41575 Mar 10, 2022

shanalily Mar 10, 2022

shanalily Mar 10, 2022

natasha41575 Mar 23, 2022

natasha41575 commented Mar 18, 2022

shanalily Feb 28, 2022

shanalily Feb 28, 2022

shanalily Mar 10, 2022

shanalily Mar 10, 2022

shanalily commented Mar 19, 2022

natasha41575 left a comment

k8s-ci-robot commented Mar 23, 2022

retain quotes in namespace transformer filter #4421

retain quotes in namespace transformer filter #4421

Conversation

shanalily commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

linux-foundation-easycla bot commented Jan 25, 2022 • edited

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

natasha41575 commented Jan 26, 2022

shanalily commented Jan 26, 2022

shanalily commented Jan 26, 2022

shanalily commented Jan 28, 2022

natasha41575 commented Jan 28, 2022

shanalily commented Jan 31, 2022

shanalily commented Jan 31, 2022

natasha41575 commented Feb 2, 2022 • edited

shanalily commented Feb 2, 2022 • edited

shanalily commented Mar 2, 2022

natasha41575 commented Mar 4, 2022

natasha41575 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

natasha41575 commented Mar 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shanalily commented Mar 19, 2022

natasha41575 left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Mar 23, 2022

linux-foundation-easycla bot commented Jan 25, 2022 •

edited

natasha41575 commented Feb 2, 2022 •

edited

shanalily commented Feb 2, 2022 •

edited