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

Skip to content

[1.20] config: pre-create pinns directories #4538

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
Feb 3, 2021
Merged

[1.20] config: pre-create pinns directories #4538

openshift-merge-robot merged 1 commit into from
Feb 3, 2021

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Feb 3, 2021

as well as remove any file that exists in that spot
as well as create nsmgr package to mirror release-1.21 structure (only holding the NSType right now)

Signed-off-by: Peter Hunt [email protected]

What type of PR is this?

/kind api-change
/kind bug
/kind ci
/kind cleanup
/kind dependency-change
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

as well as remove any file that exists in that spot
and introduce a skeleton of nsmgr package. We'd have to introduce a new package regardless (if we wanted to keep NSType and SupportedNamespacsForPinning() together) as we get a cyclical import importing sandbox from the config

Which issue(s) this PR fixes:

Special notes for your reviewer:

pick of #4532

Does this PR introduce a user-facing change?

none

@haircommander
config: pre-create pinns directories
69c9211 
as well as remove any file that exists in that spot
as well as create nsmgr package to mirror release-1.21 structure (only holding the NSType right now)

Signed-off-by: Peter Hunt <[email protected]>
@openshift-ci-robot openshift-ci-robot added 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. release-note-none Denotes a PR that doesn't merit a release note. labels Feb 3, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2021
@codecov
Copy link

codecov bot commented Feb 3, 2021

Codecov Report

Merging #4538 (69c9211) into release-1.20 (4a37b4e) will decrease coverage by 0.02%.
The diff coverage is 55.76%.

@@               Coverage Diff                @@
##           release-1.20    #4538      +/-   ##
================================================
- Coverage         40.63%   40.60%   -0.03%     
================================================
  Files               117      117              
  Lines              9436     9446      +10     
================================================
+ Hits               3834     3836       +2     
- Misses             5172     5177       +5     
- Partials            430      433       +3

@mrunalp
Copy link
Member

mrunalp commented Feb 3, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2021
@openshift-merge-robot openshift-merge-robot merged commit 18f4ba0 into cri-o:release-1.20 Feb 3, 2021
@haircommander
Copy link
Member Author

haircommander commented Feb 10, 2021

/cherry-pick master

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2021

@haircommander: #4538 failed to apply on top of branch "master":

Applying: config: pre-create pinns directories
Using index info to reconstruct a base tree...
M	internal/lib/sandbox/namespaces.go
A	internal/lib/sandbox/namespaces_linux.go
M	internal/lib/sandbox/namespaces_test.go
M	pkg/config/config.go
M	server/sandbox_run_linux.go
A	test/mocks/sandbox/sandbox.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/mocks/sandbox/sandbox.go deleted in HEAD and modified in config: pre-create pinns directories. Version config: pre-create pinns directories of test/mocks/sandbox/sandbox.go left in tree.
Auto-merging server/sandbox_run_linux.go
CONFLICT (content): Merge conflict in server/sandbox_run_linux.go
Auto-merging pkg/config/config.go
Auto-merging internal/lib/sandbox/namespaces_test.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces_test.go
CONFLICT (modify/delete): internal/lib/sandbox/namespaces_linux.go deleted in HEAD and modified in config: pre-create pinns directories. Version config: pre-create pinns directories of internal/lib/sandbox/namespaces_linux.go left in tree.
Auto-merging internal/lib/sandbox/namespaces.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces.go
CONFLICT (add/add): Merge conflict in internal/config/nsmgr/types.go
Auto-merging internal/config/nsmgr/types.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: pre-create pinns directories
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 master

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 Feb 10, 2021

haha I already made one anyway #4532

@openshift-ci-robot openshift-ci-robot mentioned this pull request Feb 17, 2021
Closed
@openshift-ci-robot openshift-ci-robot mentioned this pull request Mar 13, 2021
Closed
@openshift-ci openshift-ci bot mentioned this pull request Aug 30, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@nalind nalind Awaiting requested review from nalind

@vrothberg vrothberg Awaiting requested review from vrothberg

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-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

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