testing/kubernetes: moved from unmaintained, fixed build, upgrade to 1.5.2

1 files changed, 105 insertions, 0 deletions

diff --git a/testing/kubernetes/hyperkube-remove-federation-cmds.patch b/testing/kubernetes/hyperkube-remove-federation-cmds.patch
new file mode 100644
index 0000000000..8e3b6021df
--- /dev/null
+++ b/testing/kubernetes/hyperkube-remove-federation-cmds.patch
@@ -0,0 +1,105 @@
+diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go
+deleted file mode 100644
+index 25c0f20..0000000
+--- a/cmd/hyperkube/federation-apiserver.go
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+-Copyright 2016 The Kubernetes Authors.
+-
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
+-
+-package main
+-
+-import (
+-	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
+-	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
+-)
+-
+-// NewFederationAPIServer creates a new hyperkube Server object that includes the
+-// description and flags.
+-func NewFederationAPIServer() *Server {
+-	s := options.NewServerRunOptions()
+-
+-	hks := Server{
+-		SimpleUsage: "federation-apiserver",
+-		Long:        "The API entrypoint for the federation control plane",
+-		Run: func(_ *Server, args []string) error {
+-			return app.Run(s)
+-		},
+-	}
+-	s.AddFlags(hks.Flags())
+-	return &hks
+-}
+diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go
+deleted file mode 100644
+index e445f87..0000000
+--- a/cmd/hyperkube/federation-controller-manager.go
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+-Copyright 2016 The Kubernetes Authors.
+-
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
+-
+-package main
+-
+-import (
+-	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
+-	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
+-)
+-
+-// NewFederationCMServer creates a new hyperkube Server object that includes the
+-// description and flags.
+-func NewFederationCMServer() *Server {
+-	s := options.NewCMServer()
+-
+-	hks := Server{
+-		SimpleUsage: "federation-controller-manager",
+-		Long:        "Controller manager for federation control plane. Manages federation service endpoints and controllers",
+-		Run: func(_ *Server, args []string) error {
+-			return app.Run(s)
+-		},
+-	}
+-	s.AddFlags(hks.Flags())
+-	return &hks
+-}
+diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
+index 48dea32..24316df 100644
+--- a/cmd/hyperkube/main.go
++++ b/cmd/hyperkube/main.go
+@@ -40,9 +40,5 @@ func main() {
+ 	hk.AddServer(NewKubelet())
+ 	hk.AddServer(NewKubeProxy())
+ 
+-	//Federation servers
+-	hk.AddServer(NewFederationAPIServer())
+-	hk.AddServer(NewFederationCMServer())
+-
+ 	hk.RunToExit(os.Args)
+ }
+-- 
+1.9.3
+