testing/kubernetes: remove obsolete patches

3 files changed, 0 insertions, 164 deletions

diff --git a/testing/kubernetes/build-with-debug-info.patch b/testing/kubernetes/build-with-debug-info.patch
deleted file mode 100644
index 866c640fd6..0000000000
--- a/testing/kubernetes/build-with-debug-info.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7e07ff7120f2c5ed1030ed603f9bd2714c709ed6 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 31 Oct 2016 09:02:37 +0100
-Subject: [PATCH] build with debug info
-
----
- hack/lib/golang.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index ccd6c0a..c29bf85 100755
---- a/hack/lib/golang.sh
-+++ b/hack/lib/golang.sh
-@@ -484,7 +484,7 @@ kube::golang::build_binaries_for_platform() {
-       CGO_ENABLED=0 go build -o "${outfile}" \
-         "${goflags[@]:+${goflags[@]}}" \
-         -gcflags "${gogcflags}" \
--        -ldflags "${goldflags}" \
-+        -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${goldflags}" \
-         "${binary}"
-       kube::log::progress "*"
-     done
-@@ -493,7 +493,7 @@ kube::golang::build_binaries_for_platform() {
-       go build -o "${outfile}" \
-         "${goflags[@]:+${goflags[@]}}" \
-         -gcflags "${gogcflags}" \
--        -ldflags "${goldflags}" \
-+        -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${goldflags}" \
-         "${binary}"
-       kube::log::progress "*"
-     done
--- 
-1.9.3
-
diff --git a/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch b/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch
deleted file mode 100644
index e5542acd01..0000000000
--- a/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d1e796b3e56b6f3237913cc6b57b6d5918bcac63 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Thu, 5 Jan 2017 10:06:38 +0100
-Subject: [PATCH] get rid of the git commands in mungedocs
-
----
- src/k8s.io/kubernetes/hack/update-munge-docs.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hack/update-munge-docs.sh b/hack/update-munge-docs.sh
-index 4fa8d18..ec18685 100755
---- a/hack/update-munge-docs.sh
-+++ b/hack/update-munge-docs.sh
-@@ -21,7 +21,7 @@ set -o pipefail
- KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
- source "${KUBE_ROOT}/hack/lib/init.sh"
- 
--git_upstream=$(kube::util::git_upstream_remote_name)
-+git_upstream=origin
- : ${git_upstream:="upstream"}
- 
- kube::golang::setup_env
--- 
-2.7.4
-
diff --git a/testing/kubernetes/hyperkube-remove-federation-cmds.patch b/testing/kubernetes/hyperkube-remove-federation-cmds.patch
deleted file mode 100644
index 8e3b6021df..0000000000
--- a/testing/kubernetes/hyperkube-remove-federation-cmds.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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
-