Skip to content
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

Jump to bottom

Make config write maintain comments #615

Merged
merged 3 commits into from
Jun 3, 2020
Merged

Make config write maintain comments #615

merged 3 commits into from
Jun 3, 2020

Conversation

hickeyma
Copy link
Contributor

This PR maintains comments in the crictl config file when writing to file.

Closes #605

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 27, 2020
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 27, 2020
@hickeyma
Copy link
Contributor Author

/assign @runcom

saschagrunert
saschagrunert reviewed May 28, 2020
View reviewed changes
pkg/common/file.go Outdated Show resolved Hide resolved
pkg/common/file.go Outdated Show resolved Hide resolved
pkg/common/file.go Show resolved Hide resolved
hickeyma added a commit to hickeyma/cri-tools that referenced this pull request May 28, 2020
@hickeyma
Update of review comments
95f2dd4 
Review:
- kubernetes-sigs#615 (comment)
- kubernetes-sigs#615 (comment)
- kubernetes-sigs#615 (comment)

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
@hickeyma hickeyma marked this pull request as draft May 28, 2020 16:29
@hickeyma
Copy link
Contributor Author

@saschagrunert Thanks for reviewing. I am still working on the empty YAML node comment. Setting PR to draft until resolve the issue explained in #615 (comment).

@saschagrunert
Copy link
Member

@saschagrunert Thanks for reviewing. I am still working on the empty YAML node comment. Setting PR to draft until resolve the issue explained in #615 (comment).

Sounds good, thank you for the notice.

hickeyma added 2 commits June 3, 2020 12:04
@hickeyma
Make config write maintain comments
180e523 
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
@hickeyma
Update of review comments
acac4ad 
Review:
- kubernetes-sigs#615 (comment)
- kubernetes-sigs#615 (comment)
- kubernetes-sigs#615 (comment)

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
@hickeyma hickeyma force-pushed the hickeyma/fix-config-file-persistence branch from 95f2dd4 to acac4ad Compare June 3, 2020 12:05
@hickeyma
Fix tags written to file
55612c2 
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
@hickeyma hickeyma marked this pull request as ready for review June 3, 2020 15:46
@hickeyma
Copy link
Contributor Author

hickeyma commented Jun 3, 2020

Ready for review.

saschagrunert
saschagrunert approved these changes Jun 3, 2020
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

🙂

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2020
@saschagrunert
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hickeyma, saschagrunert

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2020
@k8s-ci-robot k8s-ci-robot merged commit dcf2a73 into kubernetes-sigs:master Jun 3, 2020
mikebrow
mikebrow reviewed Jun 3, 2020
View reviewed changes
Copy link
Contributor

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Thanks @hickeyma I manually tested it out works perfect!

@hickeyma
Copy link
Contributor Author

hickeyma commented Jun 3, 2020

Thanks for the reviews @saschagrunert and @mikebrow. Thanks for merging also @saschagrunert

@hickeyma hickeyma mentioned this pull request Aug 28, 2020
Closed
6 tasks
This was referenced Aug 31, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikebrow mikebrow mikebrow left review comments

@saschagrunert saschagrunert saschagrunert approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

Assignees

@saschagrunert saschagrunert

@runcom runcom

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

config command overwrites config
5 participants
@hickeyma @saschagrunert @k8s-ci-robot @mikebrow @runcom