More patches for component config.

hack/kube-proxy-patch.diff

@@ -1,13 +1,28 @@
-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
-index 380e83e2a..51bb09fd0 100644
---- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
-+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
-@@ -72,7 +72,7 @@ func newProxyServer(
- 	if c, err := configz.New(proxyconfigapi.GroupName); err == nil {
+diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
+index 2f9ea2eac..35a7c14e5 100644
+--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
++++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
+@@ -318,6 +318,10 @@ func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*ku
+ 	return out, nil
+ }
+ 
++func (o *Options) SetConfig(in *kubeproxyconfig.KubeProxyConfiguration) {
++	o.config = in
++}
++
+ // NewProxyCommand creates a *cobra.Command object with default parameters
+ func NewProxyCommand() *cobra.Command {
+ 	opts := NewOptions()
+diff --git a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
+index 93982f898..a116da41f 100644
+--- a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
++++ b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
+@@ -380,7 +380,7 @@ func NewSchedulerServer(config *componentconfig.KubeSchedulerConfiguration, mast
+ 	if c, err := configz.New("componentconfig"); err == nil {
  		c.Set(config)
  	} else {
 -		return nil, fmt.Errorf("unable to register configz: %s", err)
 +		glog.Warningf("unable to register configz: %s", err)
  	}
  
- 	protocol := utiliptables.ProtocolIpv4
+ 	// Prepare some Kube clients.

vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go

@@ -318,6 +318,10 @@ func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*ku
 	return out, nil
 }
 
+func (o *Options) SetConfig(in *kubeproxyconfig.KubeProxyConfiguration) {
+	o.config = in
+}
+
 // NewProxyCommand creates a *cobra.Command object with default parameters
 func NewProxyCommand() *cobra.Command {
 	opts := NewOptions()

vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go

@@ -380,7 +380,7 @@ func NewSchedulerServer(config *componentconfig.KubeSchedulerConfiguration, mast
 	if c, err := configz.New("componentconfig"); err == nil {
 		c.Set(config)
 	} else {
-		return nil, fmt.Errorf("unable to register configz: %s", err)
+		glog.Warningf("unable to register configz: %s", err)
 	}
 
 	// Prepare some Kube clients.