Skip to content

Switch to glide, update to latest k8s. #59

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

Open
dlorenc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to glide, update to latest k8s. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3,401 changes: 0 additions & 3,401 deletions Godeps/Godeps.json
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
"strings"
"time"

"k8s.io/kubernetes/pkg/storage/storagebackend"

apiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
)

const (
Expand Down Expand Up @@ -50,9 +51,7 @@ func StartAPIServer() {
config.InsecurePort = APIServerPort

// use localkube etcd
config.EtcdConfig = etcdstorage.EtcdConfig{
ServerList: KubeEtcdClientURLs,
}
config.StorageConfig = storagebackend.Config{ServerList: KubeEtcdClientURLs}

// set Service IP range
_, ipnet, err := net.ParseCIDR(ServiceIPRange)
Expand Down
4 changes: 2 additions & 2 deletions dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ func createEndpoint(client *kubeclient.Client, meta kube.ObjectMeta, dnsIP strin
Ports: []kube.EndpointPort{
{
Name: "dns",
Port: dnsPort,
Port: int32(dnsPort),
},
{
Name: "dns-tcp",
Port: dnsPort,
Port: int32(dnsPort),
},
},
},
Expand Down
8 changes: 4 additions & 4 deletions etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package localkube

import (
"crypto/tls"
"fmt"
"net"
"net/http"
"os"
"time"

"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types"
)
Expand Down Expand Up @@ -64,7 +65,6 @@ func NewEtcd(clientURLStrs, peerURLStrs []string, name, dataDirectory string) (*
PeerURLs: peerURLs,
DataDir: dataDirectory,
InitialPeerURLsMap: urlsMap,
Transport: http.DefaultTransport.(*http.Transport),

NewCluster: true,

Expand Down Expand Up @@ -96,7 +96,7 @@ func (e *EtcdServer) Start() {
e.EtcdServer.Start()

// setup client listeners
ch := etcdhttp.NewClientHandler(e.EtcdServer, e.requestTimeout())
ch := v2http.NewClientHandler(e.EtcdServer, e.requestTimeout())
for _, l := range clientListeners {
go func(l net.Listener) {
srv := &http.Server{
Expand Down Expand Up @@ -141,7 +141,7 @@ func createListenersOrPanic(urls types.URLs) (listeners []net.Listener) {
panic(err)
}

l, err = transport.NewKeepAliveListener(l, url.Scheme, transport.TLSInfo{})
l, err = transport.NewKeepAliveListener(l, url.Scheme, &tls.Config{})
if err != nil {
panic(err)
}
Expand Down
Loading