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.

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

Bug 1614660 - Network diagnostic will auto detect runtime #20647

Merged

Conversation

pravisankar
Copy link

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)

Ravi Sankar Penta 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.
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 15, 2018
@pravisankar
Copy link
Author

@openshift/sig-network-edge PTAL

@openshift-ci-robot openshift-ci-robot added sig/network-edge approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 15, 2018
@Miciah
Copy link
Contributor

Miciah commented Aug 15, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 15, 2018
@openshift-ci-robot
Copy link

[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

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 80abd58 into openshift:master Aug 15, 2018
@@ -7,8 +7,7 @@ import (
"regexp"
"strings"

"github.com/golang/glog"

kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
Copy link
Contributor

Choose a reason for hiding this comment

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

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. sig/network-edge size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants