github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Switch kube-controller-manager to distroless image

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2020-05-21 09:28:26 -04:00
parent bded41a817
commit b1742f19ef
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/BUILD
View File

@ -35,7 +35,7 @@ DOCKERIZED_BINARIES = {
"target": "//cmd/kube-apiserver:kube-apiserver",
},
"kube-controller-manager": {
"base": "@debian-base-{ARCH}//image",
"base": "@go-runner-linux-{ARCH}//image",
"target": "//cmd/kube-controller-manager:kube-controller-manager",
},
"kube-scheduler": {

2
build/common.sh
View File

@ -101,7 +101,7 @@ kube::build::get_docker_wrapped_binaries() {
### in build/BUILD. And kube::golang::server_image_targets
local targets=(
"kube-apiserver,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-controller-manager,${KUBE_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
"kube-controller-manager,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-scheduler,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-proxy,${KUBE_BASE_IMAGE_REGISTRY}/debian-iptables-${arch}:${debian_iptables_version}"
)

1
cluster/gce/gci/configure-helper.sh
View File

@ -1920,6 +1920,7 @@ function start-kube-controller-manager {
container_env="\"env\":[{\"name\": \"KUBE_CACHE_MUTATION_DETECTOR\", \"value\": \"${ENABLE_CACHE_MUTATION_DETECTOR}\"}],"
fi
params="$(convert-manifest-params "${params}")"
local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/kube-controller-manager.manifest"
# Evaluate variables.
sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${DOCKER_REGISTRY}@g" "${src_file}"

6
cluster/gce/manifests/kube-controller-manager.manifest
View File

@ -26,9 +26,9 @@
}
},
"command": [
"/bin/sh",
"-c",
"exec /usr/local/bin/kube-controller-manager {{params}} 1>>/var/log/kube-controller-manager.log 2>&1"
"/go-runner", "--log-file=/var/log/kube-controller-manager.log", "--also-stdout=false", "--redirect-stderr=true",
"/usr/local/bin/kube-controller-manager",
{{params}}
],
{{container_env}}
"livenessProbe": {

2
test/e2e/storage/detach_mounted.go
View File

@ -43,7 +43,7 @@ var (
durationForStuckMount = 110 * time.Second
)
var _ = utils.SIGDescribe("Detaching volumes", func() {
var _ = utils.SIGDescribe("[Feature:Flexvolumes] Detaching volumes", func() {
f := framework.NewDefaultFramework("flexvolume")
// note that namespace deletion is handled by delete-namespace flag

2
test/e2e/storage/flexvolume.go
View File

@ -200,7 +200,7 @@ var _ = utils.SIGDescribe("Flexvolumes", func() {
uninstallFlex(cs, node, "k8s", driverInstallAs)
})
ginkgo.It("should be mountable when attachable", func() {
ginkgo.It("should be mountable when attachable [Feature:Flexvolumes]", func() {
driver := "dummy-attachable"
driverInstallAs := driver + "-" + suffix

2
test/e2e/storage/flexvolume_mounted_volume_resize.go
View File

@ -45,7 +45,7 @@ const (
totalResizeWaitPeriod = 5 * time.Minute
)
var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
var _ = utils.SIGDescribe("[Feature:Flexvolumes] Mounted flexvolume expand[Slow]", func() {
var (
c clientset.Interface
ns string