Thanks to visit codestin.com
Credit goes to github.com

Skip to content

config: set internal RootConfig to default storage if not specified #4131

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
Merged
openshift-merge-robot merged 1 commit into from
Sep 3, 2020
Merged

config: set internal RootConfig to default storage if not specified #4131

openshift-merge-robot merged 1 commit into from
Sep 3, 2020

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Aug 28, 2020

What type of PR is this?

/kind bug

What this PR does / why we need it:

After we pull in the initial config, it is our source of truth for telling the world where our container storage is
in particular, if we, say, have an empty storage entry, we will return StorageDriver: "" on an Inspect request

the problem is, that is a lie. c/storage populates defaults for us, so we actually use overlay in that scenerio.

we don't encounter this normally, because if the toml field isn't specified (as it isn't by default), then we inherit the information from the default config
However, if a user (or an ignition config) overrides those fields to empty, we will listen to it as the source of truth, and never update to what is actually being used

Fix this by inheriting the values from c/storage on the validation step.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix bug where empty config fields having to do with storage cause `/info` requests to return incorrect information (which causes cadvisor to fail to read imageFs information)

@openshift-ci-robot openshift-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Aug 28, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2020
@haircommander haircommander force-pushed the override-storage-opt branch 2 times, most recently from fc3dbcd to 8798ffa Compare August 28, 2020 19:34
@haircommander
config: set internal RootConfig to default storage if not specified
8152e00 
After we pull in the initial config, it is our source of truth for telling the world where our container storage is
in particular, if we, say, have an empty `storage` entry, we will return `StorageDriver: ""` on an Inspect request

the problem is, that is a lie. c/storage populates defaults for us, so we actually use overlay in that scenerio.

we don't encounter this normally, because if the toml field isn't specified (as it isn't by default), then we inherit the information from the default config
However, if a user (or an ignition config) overrides those fields to empty, we will listen to it as the source of truth, and never update to what is actually being used

Fix this by inheriting the values from c/storage on the validation step.

Signed-off-by: Peter Hunt <[email protected]>
@codecov
Copy link

codecov bot commented Aug 29, 2020

Codecov Report

Merging #4131 into master will increase coverage by 0.09%.
The diff coverage is 75.00%.

@@            Coverage Diff             @@
##           master    #4131      +/-   ##
==========================================
+ Coverage   40.42%   40.52%   +0.09%     
==========================================
  Files         110      110              
  Lines        9331     9338       +7     
==========================================
+ Hits         3772     3784      +12     
+ Misses       5209     5203       -6     
- Partials      350      351       +1

@haircommander
Copy link
Member Author

haircommander commented Aug 31, 2020

/retest

@haircommander
Copy link
Member Author

haircommander commented Aug 31, 2020

PTAL @umohnani8 @mrunalp @saschagrunert

@umohnani8
Copy link
Member

umohnani8 commented Aug 31, 2020

LGTM

@haircommander
Copy link
Member Author

haircommander commented Aug 31, 2020

/retest

1 similar comment
@haircommander
Copy link
Member Author

haircommander commented Aug 31, 2020

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 31, 2020 •
edited
Loading

@haircommander: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2 8152e00 link /test e2e_cgroupv2
ci/prow/e2e-aws 8152e00 link /test e2e-aws

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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 3, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp

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 [haircommander,mrunalp]

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

@mrunalp
Copy link
Member

mrunalp commented Sep 3, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 3, 2020
@haircommander
Copy link
Member Author

haircommander commented Sep 3, 2020

/cherry-pick release-1.19

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 3, 2020

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.19 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.19

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.

@openshift-merge-robot openshift-merge-robot merged commit 0806cf3 into cri-o:master Sep 3, 2020
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 3, 2020
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 3, 2020

@haircommander: new pull request created: #4161

Details

In response to this:

/cherry-pick release-1.19

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.

@haircommander
Copy link
Member Author

haircommander commented Sep 8, 2020

/cherry-pick release-1.18

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 8, 2020
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 8, 2020

@haircommander: new pull request created: #4176

Details

In response to this:

/cherry-pick release-1.18

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.

@haircommander
Copy link
Member Author

haircommander commented Sep 8, 2020

/cherry-pick release-1.17

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 8, 2020

@haircommander: #4131 failed to apply on top of branch "release-1.17":

Applying: config: set internal RootConfig to default storage if not specified
Using index info to reconstruct a base tree...
M	pkg/config/config.go
M	pkg/config/config_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/config_test.go
Auto-merging pkg/config/config.go
CONFLICT (content): Merge conflict in pkg/config/config.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 config: set internal RootConfig to default storage if not specified
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.17

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp approved these changes

@runcom runcom Awaiting requested review from runcom

@rhatdan rhatdan Awaiting requested review from rhatdan

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@mrunalp mrunalp

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@haircommander @umohnani8 @openshift-ci-robot @mrunalp @openshift-cherrypick-robot @openshift-merge-robot