Bug 1614660 - Network diagnostic will auto detect runtime #20647
Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom Aug 15, 2018
Merged
Bug 1614660 - Network diagnostic will auto detect runtime #20647openshift-merge-robot merged 2 commits intoopenshift:masterfrom
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
Conversation
added 2 commits
August 14, 2018 20:08
Don't default to crio runtime when crio and docker binaries are installed. Node object has the container runtime version, so now we fetch the runtime info from there.
…iags This seems fallout from 1.11 rebase (openshift#20033)
openshift-ci-robot
added
the
size/M
Author
|
@openshift/sig-network-edge PTAL |
openshift-ci-robot
added
sig/network-edge
approved
Contributor
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Miciah, pravisankar The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
|
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
Contributor
|
/retest Please review the full test history for this PR and help us cut down flakes. |
ironcladlou
reviewed
Aug 15, 2018
|
|
||
| "github.com/golang/glog" | ||
|
|
||
| kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" |
Contributor
There was a problem hiding this comment.
For future reference, I'm pretty sure we should be using the public client APIs in k8s.io/client-go.
pravisankar
pushed a commit
to pravisankar/origin
that referenced
this pull request
Aug 15, 2018
Follow up of openshift#20647 We could have some nodes running crio and others with docker runtime. Starter clusters are doing this but this could change with 4.0+ release. Fetch the runtime info from the local node object so that it works on all cases.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Don't default to crio runtime when crio and docker binaries are installed.
Node object has the container runtime version, so now we fetch the runtime
info from there.
Fix provided options object is not a PodLogOptions error in network diags
This seems fallout from 1.11 rebase (#20033)