vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #557 from runcom/streamserver-bindaddress

Browse source 
server: do not use localhost for streaming service
This commit is contained in:
Mrunal Patel 2017-06-03 11:01:43 -07:00 committed by GitHub
commit 34357ec7a4
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/server.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net"
"os" "os"
"path/filepath" "path/filepath"
"sync" "sync"
@ -23,6 +24,7 @@ import (
"github.com/kubernetes-incubator/cri-o/server/seccomp" "github.com/kubernetes-incubator/cri-o/server/seccomp"
rspec "github.com/opencontainers/runtime-spec/specs-go" rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
knet "k8s.io/apimachinery/pkg/util/net"
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/server/streaming"
) )
@ -607,9 +609,14 @@ func New(config *Config) (*Server, error) {
s.restore() s.restore()
s.cleanupSandboxesOnShutdown() s.cleanupSandboxesOnShutdown()
bindAddress, err := knet.ChooseBindAddress(net.IP{0, 0, 0, 0})
if err != nil {
return nil, err
}
// Prepare streaming server // Prepare streaming server
streamServerConfig := streaming.DefaultConfig streamServerConfig := streaming.DefaultConfig
streamServerConfig.Addr = "0.0.0.0:10101" streamServerConfig.Addr = bindAddress.String() + ":10101"
s.stream.runtimeServer = s s.stream.runtimeServer = s
s.stream.streamServer, err = streaming.NewServer(streamServerConfig, s.stream) s.stream.streamServer, err = streaming.NewServer(streamServerConfig, s.stream)
if err != nil { if err != nil {