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

Add namespaces{-_}dir CLI and config option #3093

Merged
merged 1 commit into from
Jan 10, 2020
Merged

Add namespaces{-_}dir CLI and config option #3093

merged 1 commit into from
Jan 10, 2020

Conversation

saschagrunert
Copy link
Member

This makes the namespaces dir configurable in its location.

@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 9, 2020
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 9, 2020
@haircommander
Copy link
Member

I would mention that we only use it when we're managing ns lifecycle in all the docs, otherwise LGTM

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 9, 2020
@openshift-ci-robot openshift-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 9, 2020
@saschagrunert
Copy link
Member Author

I would mention that we only use it when we're managing ns lifecycle in all the docs, otherwise LGTM

Sure, I added this as well and rebased on top of the latest master branch.

giuseppe
giuseppe approved these changes Jan 10, 2020
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, 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:
  • OWNERS [giuseppe,saschagrunert]

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 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 10, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 10, 2020
@saschagrunert
Add namespaces{-_}dir CLI and config option
36b73a8 
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
@saschagrunert
Copy link
Member Author

Had to rebase to resolve the conflicts.

@saschagrunert
Copy link
Member Author

saschagrunert commented Jan 10, 2020 •
edited
Loading

/test e2e_fedora

@haircommander
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit 56660c0 into cri-o:master Jan 10, 2020
@haircommander
Copy link
Member

/cherrypick release-1.17

@openshift-cherrypick-robot
Copy link

@haircommander: #3093 failed to apply on top of branch "release-1.17":
```Applying: Add namespaces{-_}dir CLI and config option
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M internal/lib/sandbox/namespaces_linux.go
Falling back to patching base and 3-way merge...
Auto-merging internal/lib/sandbox/namespaces_linux.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces_linux.go
Patch failed at 0001 Add `namespaces{-_}dir` CLI and config option


<details>

In response to [this](https://github.com/cri-o/cri-o/pull/3093#issuecomment-573140706):

>/cherrypick release-1.17


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

1 similar comment
@openshift-cherrypick-robot
Copy link

@haircommander: #3093 failed to apply on top of branch "release-1.17":
```Applying: Add namespaces{-_}dir CLI and config option
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M internal/lib/sandbox/namespaces_linux.go
Falling back to patching base and 3-way merge...
Auto-merging internal/lib/sandbox/namespaces_linux.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces_linux.go
Patch failed at 0001 Add `namespaces{-_}dir` CLI and config option


<details>

In response to [this](https://github.com/cri-o/cri-o/pull/3093#issuecomment-573140706):

>/cherrypick release-1.17


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

@saschagrunert saschagrunert deleted the namespace-config branch January 10, 2020 18:41
@openshift-cherrypick-robot
Copy link

@haircommander: #3093 failed to apply on top of branch "release-1.17":
```Applying: Add namespaces{-_}dir CLI and config option
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M internal/lib/sandbox/namespaces_linux.go
Falling back to patching base and 3-way merge...
Auto-merging internal/lib/sandbox/namespaces_linux.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces_linux.go
Patch failed at 0001 Add `namespaces{-_}dir` CLI and config option


<details>

In response to [this](https://github.com/cri-o/cri-o/pull/3093#issuecomment-573140706):

>/cherrypick release-1.17


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

1 similar comment
@openshift-cherrypick-robot
Copy link

@haircommander: #3093 failed to apply on top of branch "release-1.17":
```Applying: Add namespaces{-_}dir CLI and config option
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M internal/lib/sandbox/namespaces_linux.go
Falling back to patching base and 3-way merge...
Auto-merging internal/lib/sandbox/namespaces_linux.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/namespaces_linux.go
Patch failed at 0001 Add `namespaces{-_}dir` CLI and config option


<details>

In response to [this](https://github.com/cri-o/cri-o/pull/3093#issuecomment-573140706):

>/cherrypick release-1.17


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

@saschagrunert saschagrunert restored the namespace-config branch January 13, 2020 09:08
@saschagrunert saschagrunert deleted the namespace-config branch January 13, 2020 09:09
@saschagrunert saschagrunert mentioned this pull request Jan 13, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@giuseppe giuseppe giuseppe approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@sameo sameo Awaiting requested review from sameo

@sboeuf sboeuf Awaiting requested review from sboeuf

@rhatdan rhatdan Awaiting requested review from rhatdan

Assignees

@haircommander haircommander

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. lgtm Indicates that a PR is ready to be merged. release-1.17 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@saschagrunert @haircommander @openshift-ci-robot @openshift-cherrypick-robot @giuseppe @openshift-merge-robot