Skip to content

Commit 6a53c0c

Browse files
r2d4r2d4
authored
Merge pull request #2060 from r2d4/k8s18
K8s 1.8
2 parents 8e02089 + 9dbd396 commit 6a53c0c

File tree

5,599 files changed

+651854
-849823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,599 files changed

+651854
-849823
lines changed

Diff for: ‎Godeps/Godeps.json

+4,051-2,160
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎cmd/minikube/cmd/service_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/olekukonko/tablewriter"
2525
"github.com/spf13/cobra"
26-
"k8s.io/kubernetes/pkg/api/v1"
26+
"k8s.io/api/core/v1"
2727

2828
"k8s.io/minikube/pkg/minikube/machine"
2929
"k8s.io/minikube/pkg/minikube/service"

Diff for: ‎hack/kube-proxy-patch.diff

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
2-
index 8d1ae7774..8745a176f 100644
3-
--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
4-
+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
5-
@@ -422,7 +422,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
1+
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
2+
index b0f0eace5..02b631fb6 100644
3+
--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
4+
+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
5+
@@ -60,7 +60,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
66
if c, err := configz.New("componentconfig"); err == nil {
77
c.Set(config)
88
} else {
99
- return nil, fmt.Errorf("unable to register configz: %s", err)
10-
+ glog.Errorf("unable to register configz: %s", err)
10+
+ glog.Warningf("unable to register configz: %s", err)
1111
}
1212

1313
protocol := utiliptables.ProtocolIpv4

Diff for: ‎pkg/localkube/kubelet.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ func (lk LocalkubeServer) NewKubeletServer() Server {
2828
}
2929

3030
func StartKubeletServer(lk LocalkubeServer) func() error {
31-
config := options.NewKubeletServer()
31+
config, err := options.NewKubeletServer()
32+
if err != nil {
33+
return func() error { return err }
34+
}
3235

3336
// Master details
3437
config.KubeConfig = flag.NewStringFlag(util.DefaultKubeConfigPath)

Diff for: ‎pkg/localkube/storage_provisioner.go

+3-14
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,21 @@ import (
2020
"fmt"
2121
"os"
2222
"path"
23-
"time"
2423

2524
"github.com/golang/glog"
2625
"github.com/pkg/errors"
2726
"github.com/r2d4/external-storage/lib/controller"
28-
"github.com/r2d4/external-storage/lib/leaderelection"
27+
"k8s.io/api/core/v1"
2928
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3029
"k8s.io/apimachinery/pkg/types"
3130
"k8s.io/apimachinery/pkg/util/uuid"
3231
"k8s.io/apimachinery/pkg/util/wait"
3332
"k8s.io/client-go/kubernetes"
34-
"k8s.io/client-go/pkg/api/v1"
3533
"k8s.io/client-go/tools/clientcmd"
3634
"k8s.io/minikube/pkg/util"
3735
)
3836

39-
const (
40-
resyncPeriod = 15 * time.Second
41-
provisionerName = "k8s.io/minikube-hostpath"
42-
exponentialBackOffOnError = false
43-
failedRetryThreshold = 5
44-
leasePeriod = leaderelection.DefaultLeaseDuration
45-
retryPeriod = leaderelection.DefaultRetryPeriod
46-
renewDeadline = leaderelection.DefaultRenewDeadline
47-
termLimit = leaderelection.DefaultTermLimit
48-
)
37+
const provisionerName = "k8s.io/minikube-hostpath"
4938

5039
type hostPathProvisioner struct {
5140
// The directory to create PV-backing directories in
@@ -150,7 +139,7 @@ func StartStorageProvisioner(lk LocalkubeServer) func() error {
150139

151140
// Start the provision controller which will dynamically provision hostPath
152141
// PVs
153-
pc := controller.NewProvisionController(clientset, resyncPeriod, provisionerName, hostPathProvisioner, serverVersion.GitVersion, exponentialBackOffOnError, failedRetryThreshold, leasePeriod, renewDeadline, retryPeriod, termLimit)
142+
pc := controller.NewProvisionController(clientset, provisionerName, hostPathProvisioner, serverVersion.GitVersion)
154143

155144
pc.Run(wait.NeverStop)
156145
return nil

Diff for: ‎pkg/minikube/bootstrapper/kubeadm/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
"html/template"
2323

2424
"github.com/pkg/errors"
25+
clientv1 "k8s.io/api/core/v1"
26+
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
2527
apierrs "k8s.io/apimachinery/pkg/api/errors"
2628
"k8s.io/apimachinery/pkg/apis/meta/v1"
2729
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2830
"k8s.io/apimachinery/pkg/labels"
2931
"k8s.io/apimachinery/pkg/types"
3032
"k8s.io/apimachinery/pkg/util/strategicpatch"
31-
clientv1 "k8s.io/client-go/pkg/api/v1"
32-
rbacv1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
3333
"k8s.io/minikube/pkg/minikube/bootstrapper"
3434
"k8s.io/minikube/pkg/minikube/service"
3535
"k8s.io/minikube/pkg/util"

Diff for: ‎pkg/minikube/service/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"github.com/docker/machine/libmachine"
2828
"github.com/pkg/browser"
2929
"github.com/pkg/errors"
30+
"k8s.io/api/core/v1"
3031
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3132
"k8s.io/client-go/kubernetes"
3233
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
33-
"k8s.io/client-go/pkg/api/v1"
3434
"k8s.io/client-go/tools/clientcmd"
3535

3636
"text/template"

Diff for: ‎pkg/minikube/service/service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"github.com/docker/machine/libmachine"
2626
"github.com/docker/machine/libmachine/host"
2727
"github.com/pkg/errors"
28+
"k8s.io/api/core/v1"
2829
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2930
"k8s.io/client-go/kubernetes"
3031
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
3132
"k8s.io/client-go/kubernetes/typed/core/v1/fake"
32-
"k8s.io/client-go/pkg/api/v1"
3333
"k8s.io/minikube/pkg/minikube/config"
3434
"k8s.io/minikube/pkg/minikube/tests"
3535
)

Diff for: ‎pkg/util/kubernetes.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"k8s.io/apimachinery/pkg/watch"
3232
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
3333

34+
"k8s.io/api/core/v1"
3435
apierrs "k8s.io/apimachinery/pkg/api/errors"
3536
"k8s.io/client-go/kubernetes"
36-
"k8s.io/client-go/pkg/api/v1"
3737

3838
"github.com/golang/glog"
3939
"k8s.io/client-go/tools/cache"
@@ -91,7 +91,7 @@ func NewPodStore(c kubernetes.Interface, namespace string, label labels.Selector
9191
store := cache.NewStore(cache.MetaNamespaceKeyFunc)
9292
stopCh := make(chan struct{})
9393
reflector := cache.NewReflector(lw, &v1.Pod{}, store, 0)
94-
reflector.RunUntil(stopCh)
94+
go reflector.Run(stopCh)
9595
return &PodStore{Store: store, stopCh: stopCh, Reflector: reflector}
9696
}
9797

Diff for: ‎vendor/github.com/Azure/go-ansiterm/README.md

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Azure/go-ansiterm/constants.go

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Azure/go-ansiterm/context.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Azure/go-ansiterm/csi_param_state.go

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go

+13-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)