Comments default values instead of omitting them #5007

wgahnagl · 2021-06-16T21:01:58Z

What type of PR is this?

What this PR does / why we need it:

changes the default crio config to print default config values as comments instead of ommitting them

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

changes default config output to comment default values instead of omitting them

openshift-ci · 2021-06-16T21:02:06Z

Hi @wgahnagl. Thanks for your PR.

I'm waiting for a cri-o 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.

Details

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.

codecov · 2021-06-16T21:09:12Z

Codecov Report

Merging #5007 (b91c4cb) into main (f97e462) will increase coverage by 0.05%.
The diff coverage is 60.86%.

❗ Current head b91c4cb differs from pull request most recent head d7da8b2. Consider uploading reports for the commit d7da8b2 to get more accurate results

@@            Coverage Diff             @@
##             main    #5007      +/-   ##
==========================================
+ Coverage   43.12%   43.17%   +0.05%     
==========================================
  Files         121      123       +2     
  Lines       12145    12177      +32     
==========================================
+ Hits         5237     5258      +21     
- Misses       6405     6415      +10     
- Partials      503      504       +1

saschagrunert

/okt-ot-test

saschagrunert · 2021-06-17T07:01:10Z

I like that one! The integration tests still do not seem to be happy, yet.

haircommander · 2021-06-17T14:03:30Z

pkg/config/template.go

 		if group == configItem.group {
-			if displayAll || !configItem.isDefaultValue {
+			if !configItem.isDefaultValue {
+				templateString += strings.Replace(configItem.templateString, "{{ .Comment }} ", "", 1)


I'm not seeing many cases where {{ .Comment }} is followed by a space, we may need to replace this with
strings.Replace(configItem.templateString, "{{ .Comment }}", "", 1)

also we need this to be -1 so it replaces all instances of Comment

pkg/config/template.go

haircommander · 2021-06-21T14:13:32Z

@wgahnagl can you sign off your commit?

hack/validate-config.sh

haircommander · 2022-01-12T21:24:47Z

hack/validate-config.sh

+#!/bin/bash
+output=$(grep 'Comment' pkg/config/template.go | grep -v '{{ $.Comment }}')
+
+if [ -z "$output" ]; then


nit: we can compresss this without saving to $output

hack/validate-config.sh

haircommander · 2022-01-12T21:42:07Z

😎
/approve

thanks for keeping up with this! LGTM

@cri-o/cri-o-maintainers PTAL

saschagrunert · 2022-01-13T08:04:05Z

Makefile

 	./hack/tree_status.sh

+check-config-template: 
+	./hack/validate-config.sh`


Suggested change

./hack/validate-config.sh`

./hack/validate-config.sh

saschagrunert · 2022-01-13T08:04:31Z

hack/validate-config.sh

@@ -0,0 +1,4 @@
+#!/bin/bash


Suggested change

#!/bin/bash

#!/usr/bin/env bash

Signed-off-by: Skyler Clark <[email protected]>

openshift-ci · 2022-01-13T16:24:11Z

@wgahnagl: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2	`d7da8b2`	link	false	`/test integration_cgroupv2`
ci/openshift-jenkins/e2e_crun_cgroupv2	`d7da8b2`	link	false	`/test e2e_cgroupv2`

Full PR test history. Your PR dashboard.

Details

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.

fidencio

lgtm, thanks @wgahnagl!

haircommander · 2022-01-17T21:40:40Z

cc @saschagrunert for the final LGTM?

saschagrunert

/lgtm

openshift-ci · 2022-01-18T08:45:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fidencio, haircommander, saschagrunert, wgahnagl

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [fidencio,haircommander,saschagrunert]

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

wgahnagl requested review from mrunalp and runcom as code owners June 16, 2021 21:01

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Jun 16, 2021

openshift-ci bot requested a review from sboeuf June 16, 2021 21:02

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 16, 2021

wgahnagl force-pushed the fixDefaultComments branch from f5e058a to e5127b7 Compare June 16, 2021 21:02

saschagrunert approved these changes Jun 17, 2021

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2021

wgahnagl force-pushed the fixDefaultComments branch from e5127b7 to b5f3dc9 Compare June 17, 2021 13:45

haircommander reviewed Jun 17, 2021

View reviewed changes

pkg/config/template.go Show resolved Hide resolved

haircommander reviewed Jun 17, 2021

View reviewed changes

pkg/config/template.go Outdated Show resolved Hide resolved

haircommander reviewed Jun 17, 2021

View reviewed changes

pkg/config/template.go Outdated Show resolved Hide resolved

haircommander reviewed Jun 17, 2021

View reviewed changes

pkg/config/template.go Outdated Show resolved Hide resolved

wgahnagl force-pushed the fixDefaultComments branch 2 times, most recently from 3881326 to c3f3408 Compare June 18, 2021 18:05

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2021

wgahnagl force-pushed the fixDefaultComments branch from c3f3408 to bcf35e4 Compare July 2, 2021 18:55

openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 2, 2021

wgahnagl force-pushed the fixDefaultComments branch 4 times, most recently from 000a406 to d8d6c73 Compare July 6, 2021 18:46

wgahnagl force-pushed the fixDefaultComments branch from 346e8c2 to 1340787 Compare January 12, 2022 21:14

openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Jan 12, 2022

haircommander reviewed Jan 12, 2022

View reviewed changes

hack/validate-config.sh Show resolved Hide resolved

haircommander reviewed Jan 12, 2022

View reviewed changes

wgahnagl force-pushed the fixDefaultComments branch 3 times, most recently from 2c86a5f to 41ddba1 Compare January 12, 2022 21:35

haircommander reviewed Jan 12, 2022

View reviewed changes

hack/validate-config.sh Show resolved Hide resolved

wgahnagl force-pushed the fixDefaultComments branch 2 times, most recently from 373cab0 to aa753f4 Compare January 12, 2022 21:40

saschagrunert reviewed Jan 13, 2022

View reviewed changes

wgahnagl force-pushed the fixDefaultComments branch 3 times, most recently from 7042e63 to a2f07e8 Compare January 13, 2022 14:27

adds config template linting

d7da8b2

Signed-off-by: Skyler Clark <[email protected]>

wgahnagl force-pushed the fixDefaultComments branch from a2f07e8 to d7da8b2 Compare January 13, 2022 14:35

wgahnagl requested a review from fidencio January 13, 2022 16:43

fidencio approved these changes Jan 17, 2022

View reviewed changes

saschagrunert approved these changes Jan 18, 2022

View reviewed changes

openshift-ci bot assigned saschagrunert Jan 18, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2022

openshift-merge-robot merged commit 3d39dc3 into cri-o:main Jan 18, 2022

haircommander mentioned this pull request Jan 26, 2022

server: add support for CDI device injection. #5571

Merged

haircommander mentioned this pull request Feb 14, 2022

for release-1.22 "make crio.conf" generates empty crio.conf file... #5631

Closed

wgahnagl mentioned this pull request Feb 15, 2022

REQUEST: New membership for wgahnagl #5649

Closed

4 tasks

Comments default values instead of omitting them #5007

Comments default values instead of omitting them #5007

Uh oh!

Conversation

wgahnagl commented Jun 16, 2021

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jun 16, 2021

Uh oh!

codecov bot commented Jun 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

saschagrunert commented Jun 17, 2021

Uh oh!

haircommander Jun 17, 2021

Choose a reason for hiding this comment

Uh oh!

haircommander Jun 17, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

haircommander commented Jun 21, 2021

Uh oh!

Uh oh!

haircommander Jan 12, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

haircommander commented Jan 12, 2022

Uh oh!

saschagrunert Jan 13, 2022

Choose a reason for hiding this comment

Uh oh!

saschagrunert Jan 13, 2022

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jan 13, 2022

Uh oh!

fidencio left a comment

Choose a reason for hiding this comment

Uh oh!

haircommander commented Jan 17, 2022

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jan 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov bot commented Jun 16, 2021 •

edited

Loading