github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Davanum Srinivas 2019-08-06 13:51:27 -04:00
parent 7c23e1a4ac
commit adbd1800c8
9 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/BUILD
View File

@ -30,10 +30,6 @@ filegroup(
# This list should roughly match kube::build::get_docker_wrapped_binaries() # This list should roughly match kube::build::get_docker_wrapped_binaries()
# in build/common.sh. # in build/common.sh.
DOCKERIZED_BINARIES = { DOCKERIZED_BINARIES = {
"cloud-controller-manager": {
"base": "@debian-base-{ARCH}//image",
"target": "//cmd/cloud-controller-manager:cloud-controller-manager",
},
"kube-apiserver": { "kube-apiserver": {
"base": "@debian-base-{ARCH}//image", "base": "@debian-base-{ARCH}//image",
"target": "//cmd/kube-apiserver:kube-apiserver", "target": "//cmd/kube-apiserver:kube-apiserver",
@ -139,7 +135,6 @@ release_filegroup(
name = "server-targets", name = "server-targets",
conditioned_srcs = for_platforms(for_server = [ conditioned_srcs = for_platforms(for_server = [
"//cluster/gce/gci/mounter", "//cluster/gce/gci/mounter",
"//cmd/cloud-controller-manager",
"//cmd/hyperkube", "//cmd/hyperkube",
"//cmd/kube-apiserver", "//cmd/kube-apiserver",
"//cmd/kube-controller-manager", "//cmd/kube-controller-manager",

1
build/common.sh
View File

@ -97,7 +97,6 @@ kube::build::get_docker_wrapped_binaries() {
### If you change any of these lists, please also update DOCKERIZED_BINARIES ### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets ### in build/BUILD. And kube::golang::server_image_targets
local 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-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-controller-manager,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
kube-scheduler,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}" kube-scheduler,"${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"

9
build/debs/BUILD
View File

@ -85,7 +85,6 @@ genrule(
goarch = arch, goarch = arch,
tags = ["manual"], tags = ["manual"],
) for binary in [ ) for binary in [
"cloud-controller-manager",
"kube-apiserver", "kube-apiserver",
"kube-controller-manager", "kube-controller-manager",
"kube-proxy", "kube-proxy",
@ -152,14 +151,6 @@ genrule(
deps = ["@cri_tools_%s//file" % goarch], deps = ["@cri_tools_%s//file" % goarch],
) for goarch in NODE_PLATFORMS["linux"]] ) 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( [k8s_deb(
name = "kubectl", name = "kubectl",
description = """Kubernetes Command Line Tool description = """Kubernetes Command Line Tool

1
cmd/genkubedocs/BUILD
View File

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

5
cmd/genkubedocs/gen_kube_docs.go
View File

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

1
cmd/genman/BUILD
View File

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

8
cmd/genman/gen_kube_man.go
View File

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

3
hack/lib/golang.sh
View File

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

2
hack/lib/util.sh
View File

@ -223,7 +223,6 @@ kube::util::gen-docs() {
mkdir -p "${dest}/docs/admin/" mkdir -p "${dest}/docs/admin/"
"${genkubedocs}" "${dest}/docs/admin/" "kube-apiserver" "${genkubedocs}" "${dest}/docs/admin/" "kube-apiserver"
"${genkubedocs}" "${dest}/docs/admin/" "kube-controller-manager" "${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-proxy"
"${genkubedocs}" "${dest}/docs/admin/" "kube-scheduler" "${genkubedocs}" "${dest}/docs/admin/" "kube-scheduler"
"${genkubedocs}" "${dest}/docs/admin/" "kubelet" "${genkubedocs}" "${dest}/docs/admin/" "kubelet"
@ -232,7 +231,6 @@ kube::util::gen-docs() {
mkdir -p "${dest}/docs/man/man1/" mkdir -p "${dest}/docs/man/man1/"
"${genman}" "${dest}/docs/man/man1/" "kube-apiserver" "${genman}" "${dest}/docs/man/man1/" "kube-apiserver"
"${genman}" "${dest}/docs/man/man1/" "kube-controller-manager" "${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-proxy"
"${genman}" "${dest}/docs/man/man1/" "kube-scheduler" "${genman}" "${dest}/docs/man/man1/" "kube-scheduler"
"${genman}" "${dest}/docs/man/man1/" "kubelet" "${genman}" "${dest}/docs/man/man1/" "kubelet"