diff --git a/build/BUILD b/build/BUILD index 2469ad3a347..9aec8d12a2e 100644 --- a/build/BUILD +++ b/build/BUILD @@ -32,17 +32,10 @@ docker_build( ) docker_build( - name = "busybox-libc", + name = "busybox-net", base = ":busybox", debs = [ "@libc_deb//file", - ], -) - -docker_build( - name = "busybox-net", - base = ":busybox-libc", - debs = [ "@iptables_deb//file", "@iproute2_deb//file", "@libnetlink_deb//file", @@ -52,15 +45,15 @@ docker_build( DOCKERIZED_BINARIES = { "kube-apiserver": { - "base": ":busybox-libc", + "base": ":busybox", "target": "//cmd/kube-apiserver:kube-apiserver", }, "kube-controller-manager": { - "base": ":busybox-libc", + "base": ":busybox", "target": "//cmd/kube-controller-manager:kube-controller-manager", }, "kube-scheduler": { - "base": ":busybox-libc", + "base": ":busybox", "target": "//plugin/cmd/kube-scheduler:kube-scheduler", }, "kube-proxy": { diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index e6cbb218a3e..fc3284c570d 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -10,7 +10,14 @@ load( go_binary( name = "cloud-controller-manager", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", + linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], ) diff --git a/cmd/kube-apiserver/BUILD b/cmd/kube-apiserver/BUILD index 5676f81da60..25065474ade 100644 --- a/cmd/kube-apiserver/BUILD +++ b/cmd/kube-apiserver/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kube-apiserver", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD index a13697e24b8..9554727c378 100644 --- a/cmd/kube-controller-manager/BUILD +++ b/cmd/kube-controller-manager/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kube-controller-manager", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index 26a19c4a4ce..639aadf1b61 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kube-proxy", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD index 436ef0b6211..0bbf605f3df 100644 --- a/cmd/kubeadm/BUILD +++ b/cmd/kubeadm/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kubeadm", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD index 7ba7b9a6524..fae5b02cf10 100644 --- a/cmd/kubectl/BUILD +++ b/cmd/kubectl/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kubectl", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/plugin/cmd/kube-scheduler/BUILD b/plugin/cmd/kube-scheduler/BUILD index 398fc06b70e..a2c84ed9b43 100644 --- a/plugin/cmd/kube-scheduler/BUILD +++ b/plugin/cmd/kube-scheduler/BUILD @@ -10,6 +10,12 @@ load( go_binary( name = "kube-scheduler", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], diff --git a/staging/src/k8s.io/kube-aggregator/BUILD b/staging/src/k8s.io/kube-aggregator/BUILD index 5f1c4fdb071..3a110c98b3d 100644 --- a/staging/src/k8s.io/kube-aggregator/BUILD +++ b/staging/src/k8s.io/kube-aggregator/BUILD @@ -10,7 +10,14 @@ load( go_binary( name = "kube-aggregator", + gc_linkopts = [ + "-linkmode", + "external", + "-extldflags", + "-static", + ], library = ":go_default_library", + linkstamp = "k8s.io/kubernetes/pkg/version", tags = ["automanaged"], )