Drop cloud-controller-manager artifacts from k/k release

anshul-harness · Aug 6, 2019 · adbd180 · adbd180
1 parent 7c23e1a
commit adbd180
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 35 deletions.
diff --git a/build/BUILD b/build/BUILD
@@ -30,10 +30,6 @@ filegroup(
 # This list should roughly match kube::build::get_docker_wrapped_binaries()
 # in build/common.sh.
 DOCKERIZED_BINARIES = {
-    "cloud-controller-manager": {
-        "base": "@debian-base-{ARCH}//image",
-        "target": "//cmd/cloud-controller-manager:cloud-controller-manager",
-    },
     "kube-apiserver": {
         "base": "@debian-base-{ARCH}//image",
         "target": "//cmd/kube-apiserver:kube-apiserver",
@@ -139,7 +135,6 @@ release_filegroup(
     name = "server-targets",
     conditioned_srcs = for_platforms(for_server = [
         "//cluster/gce/gci/mounter",
-        "//cmd/cloud-controller-manager",
         "//cmd/hyperkube",
         "//cmd/kube-apiserver",
         "//cmd/kube-controller-manager",

diff --git a/build/common.sh b/build/common.sh
@@ -97,7 +97,6 @@ kube::build::get_docker_wrapped_binaries() {
   ### If you change any of these lists, please also update DOCKERIZED_BINARIES
   ### in build/BUILD. And kube::golang::server_image_targets
   local targets=(
-    cloud-controller-manager,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
     kube-apiserver,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
     kube-controller-manager,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
     kube-scheduler,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"

diff --git a/build/debs/BUILD b/build/debs/BUILD
@@ -85,7 +85,6 @@ genrule(
     goarch = arch,
     tags = ["manual"],
 ) for binary in [
-    "cloud-controller-manager",
     "kube-apiserver",
     "kube-controller-manager",
     "kube-proxy",
@@ -152,14 +151,6 @@ genrule(
     deps = ["@cri_tools_%s//file" % goarch],
 ) for goarch in NODE_PLATFORMS["linux"]]
 
-[k8s_deb(
-    name = "cloud-controller-manager",
-    description = "Kubernetes Cloud Controller Manager",
-    goarch = arch,
-    tags = ["manual"],
-    version_file = "//build:os_package_version",
-) for arch in SERVER_PLATFORMS["linux"]]
-
 [k8s_deb(
     name = "kubectl",
     description = """Kubernetes Command Line Tool

diff --git a/cmd/genkubedocs/BUILD b/cmd/genkubedocs/BUILD
@@ -23,7 +23,6 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/cmd/genkubedocs",
     deps = [
-        "//cmd/cloud-controller-manager/app:go_default_library",
         "//cmd/genutils:go_default_library",
         "//cmd/kube-apiserver/app:go_default_library",
         "//cmd/kube-controller-manager/app:go_default_library",

diff --git a/cmd/genkubedocs/gen_kube_docs.go b/cmd/genkubedocs/gen_kube_docs.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/spf13/cobra/doc"
 	"github.com/spf13/pflag"
-	ccmapp "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
 	"k8s.io/kubernetes/cmd/genutils"
 	apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
 	cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
@@ -59,10 +58,6 @@ func main() {
 		// generate docs for kube-controller-manager
 		controllermanager := cmapp.NewControllerManagerCommand()
 		doc.GenMarkdownTree(controllermanager, outDir)
-	case "cloud-controller-manager":
-		// generate docs for cloud-controller-manager
-		cloudcontrollermanager := ccmapp.NewCloudControllerManagerCommand()
-		doc.GenMarkdownTree(cloudcontrollermanager, outDir)
 	case "kube-proxy":
 		// generate docs for kube-proxy
 		proxy := proxyapp.NewProxyCommand()

diff --git a/cmd/genman/BUILD b/cmd/genman/BUILD
@@ -16,7 +16,6 @@ go_library(
     srcs = ["gen_kube_man.go"],
     importpath = "k8s.io/kubernetes/cmd/genman",
     deps = [
-        "//cmd/cloud-controller-manager/app:go_default_library",
         "//cmd/genutils:go_default_library",
         "//cmd/kube-apiserver/app:go_default_library",
         "//cmd/kube-controller-manager/app:go_default_library",

diff --git a/cmd/genman/gen_kube_man.go b/cmd/genman/gen_kube_man.go
@@ -26,7 +26,6 @@ import (
 	mangen "github.com/cpuguy83/go-md2man/md2man"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	ccmapp "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
 	"k8s.io/kubernetes/cmd/genutils"
 	apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
 	cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
@@ -74,13 +73,6 @@ func main() {
 		for _, c := range controllermanager.Commands() {
 			genMarkdown(c, "kube-controller-manager", outDir)
 		}
-	case "cloud-controller-manager":
-		//generate manpage for cloud-controller-manager
-		controllermanager := ccmapp.NewCloudControllerManagerCommand()
-		genMarkdown(controllermanager, "", outDir)
-		for _, c := range controllermanager.Commands() {
-			genMarkdown(c, "cloud-controller-manager", outDir)
-		}
 	case "kube-proxy":
 		// generate manpage for kube-proxy
 		proxy := proxyapp.NewProxyCommand()

diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -71,7 +71,6 @@ kube::golang::server_targets() {
     cmd/kube-proxy
     cmd/kube-apiserver
     cmd/kube-controller-manager
-    cmd/cloud-controller-manager
     cmd/kubelet
     cmd/kubeadm
     cmd/hyperkube
@@ -90,7 +89,6 @@ readonly KUBE_SERVER_BINARIES=("${KUBE_SERVER_TARGETS[@]##*/}")
 kube::golang::server_image_targets() {
   # NOTE: this contains cmd targets for kube::build::get_docker_wrapped_binaries
   local targets=(
-    cmd/cloud-controller-manager
     cmd/kube-apiserver
     cmd/kube-controller-manager
     cmd/kube-scheduler
@@ -320,7 +318,6 @@ readonly KUBE_ALL_TARGETS=(
 readonly KUBE_ALL_BINARIES=("${KUBE_ALL_TARGETS[@]##*/}")
 
 readonly KUBE_STATIC_LIBRARIES=(
-  cloud-controller-manager
   kube-apiserver
   kube-controller-manager
   kube-scheduler

diff --git a/hack/lib/util.sh b/hack/lib/util.sh
@@ -223,7 +223,6 @@ kube::util::gen-docs() {
   mkdir -p "${dest}/docs/admin/"
   "${genkubedocs}" "${dest}/docs/admin/" "kube-apiserver"
   "${genkubedocs}" "${dest}/docs/admin/" "kube-controller-manager"
-  "${genkubedocs}" "${dest}/docs/admin/" "cloud-controller-manager"
   "${genkubedocs}" "${dest}/docs/admin/" "kube-proxy"
   "${genkubedocs}" "${dest}/docs/admin/" "kube-scheduler"
   "${genkubedocs}" "${dest}/docs/admin/" "kubelet"
@@ -232,7 +231,6 @@ kube::util::gen-docs() {
   mkdir -p "${dest}/docs/man/man1/"
   "${genman}" "${dest}/docs/man/man1/" "kube-apiserver"
   "${genman}" "${dest}/docs/man/man1/" "kube-controller-manager"
-  "${genman}" "${dest}/docs/man/man1/" "cloud-controller-manager"
   "${genman}" "${dest}/docs/man/man1/" "kube-proxy"
   "${genman}" "${dest}/docs/man/man1/" "kube-scheduler"
   "${genman}" "${dest}/docs/man/man1/" "kubelet"