From fd4c947de92213f866e48abd6301a9e055b08e2f Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Mon, 22 Aug 2016 17:30:23 -0700 Subject: [PATCH 1/3] correct typo in kubenet config --- pkg/kubelet/network/kubenet/kubenet_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index 996524f7b26..da8483e0094 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -210,7 +210,7 @@ const NET_CONFIG_TEMPLATE = `{ "addIf": "%s", "isGateway": true, "ipMasq": false, - "hairpin": "%t", + "hairpinMode": %t, "ipam": { "type": "host-local", "subnet": "%s", From 1a484d5585adcf149503e24c2e40170792f327f9 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Wed, 24 Aug 2016 16:58:26 -0700 Subject: [PATCH 2/3] bump debian-iptables version --- build/common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/common.sh b/build/common.sh index 5a9f9e5851c..d2476287ea9 100755 --- a/build/common.sh +++ b/build/common.sh @@ -105,28 +105,28 @@ kube::build::get_docker_wrapped_binaries() { kube-apiserver,busybox kube-controller-manager,busybox kube-scheduler,busybox - kube-proxy,gcr.io/google_containers/debian-iptables-amd64:v3 + kube-proxy,gcr.io/google_containers/debian-iptables-amd64:v4 );; "arm") local targets=( kube-apiserver,armel/busybox kube-controller-manager,armel/busybox kube-scheduler,armel/busybox - kube-proxy,gcr.io/google_containers/debian-iptables-arm:v3 + kube-proxy,gcr.io/google_containers/debian-iptables-arm:v4 );; "arm64") local targets=( kube-apiserver,aarch64/busybox kube-controller-manager,aarch64/busybox kube-scheduler,aarch64/busybox - kube-proxy,gcr.io/google_containers/debian-iptables-arm64:v3 + kube-proxy,gcr.io/google_containers/debian-iptables-arm64:v4 );; "ppc64le") local targets=( kube-apiserver,ppc64le/busybox kube-controller-manager,ppc64le/busybox kube-scheduler,ppc64le/busybox - kube-proxy,gcr.io/google_containers/debian-iptables-ppc64le:v3 + kube-proxy,gcr.io/google_containers/debian-iptables-ppc64le:v4 );; esac From 83ca3504b498666a4c5b777f1b17a62ea6833531 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Fri, 2 Sep 2016 14:29:18 -0700 Subject: [PATCH 3/3] add deprecate message for configure-cbr0 --- cmd/kubelet/app/options/options.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 221bb8fab5e..09deabd85d0 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -173,6 +173,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.RktStage1Image, "rkt-stage1-image", s.RktStage1Image, "image to use as stage1. Local paths and http/https URLs are supported. If empty, the 'stage1.aci' in the same directory as '--rkt-path' will be used.") fs.MarkDeprecated("rkt-stage1-image", "Will be removed in a future version. The default stage1 image will be specified by the rkt configurations, see https://github.com/coreos/rkt/blob/master/Documentation/configuration.md for more details.") fs.BoolVar(&s.ConfigureCBR0, "configure-cbr0", s.ConfigureCBR0, "If true, kubelet will configure cbr0 based on Node.Spec.PodCIDR.") + fs.MarkDeprecated("configure-cbr0", "Will be removed in a future version. Please use kubenet or other network plugins.") fs.StringVar(&s.HairpinMode, "hairpin-mode", s.HairpinMode, "How should the kubelet setup hairpin NAT. This allows endpoints of a Service to loadbalance back to themselves if they should try to access their own Service. Valid values are \"promiscuous-bridge\", \"hairpin-veth\" and \"none\".") fs.BoolVar(&s.BabysitDaemons, "babysit-daemons", s.BabysitDaemons, "If true, the node has babysitter process monitoring docker and kubelet.") fs.MarkDeprecated("babysit-daemons", "Will be removed in a future version.") @@ -205,6 +206,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.Int32Var(&s.KubeAPIBurst, "kube-api-burst", s.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver") fs.BoolVar(&s.SerializeImagePulls, "serialize-image-pulls", s.SerializeImagePulls, "Pull images one at a time. We recommend *not* changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. Issue #10959 has more details. [default=true]") fs.BoolVar(&s.ExperimentalFlannelOverlay, "experimental-flannel-overlay", s.ExperimentalFlannelOverlay, "Experimental support for starting the kubelet with the default overlay network (flannel). Assumes flanneld is already running in client mode. [default=false]") + fs.MarkDeprecated("experimental-flannel-overlay", "Will be removed in a future version.") fs.DurationVar(&s.OutOfDiskTransitionFrequency.Duration, "outofdisk-transition-frequency", s.OutOfDiskTransitionFrequency.Duration, "Duration for which the kubelet has to wait before transitioning out of out-of-disk node condition status. Default: 5m0s") fs.StringVar(&s.NodeIP, "node-ip", s.NodeIP, "IP address of the node. If set, kubelet will use this IP address for the node") fs.BoolVar(&s.EnableCustomMetrics, "enable-custom-metrics", s.EnableCustomMetrics, "Support for gathering custom metrics.")