Skip to content

K
k3s
Commit d3f62095 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45154 from luxas/ccm_image

Automatic merge from submit-queue Create a docker image for the cloud controller manager **What this PR does / why we need it**: If you want to test the cloud-controller-manager our currently, you have to grab the binary from the CI or the release builds, put it in a Dockerfile, build the image and possibly upload the image to a registry, only to be able to test the new cloud stuff out. This is overly complex and should just work like any other component like the core controller manager that has its own docker image pushed automatically for it. This PR makes the release scripts create an image for the cloud controller manager. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note Create and push a docker image for the cloud-controller-manager ``` cc @thockin @wlan0 @roberthbailey @mikedanese
parents 70f6f133 4ee9d047
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
build/common.sh
View file @ d3f62095
...@@ -89,6 +89,7 @@ kube::build::get_docker_wrapped_binaries() { ...@@ -89,6 +89,7 @@ kube::build::get_docker_wrapped_binaries() {
case $1 in case $1 in
"amd64") "amd64")
local targets=( local targets=(
cloud-controller-manager,busybox
kube-apiserver,busybox kube-apiserver,busybox
kube-controller-manager,busybox kube-controller-manager,busybox
kube-scheduler,busybox kube-scheduler,busybox
...@@ -97,6 +98,7 @@ kube::build::get_docker_wrapped_binaries() { ...@@ -97,6 +98,7 @@ kube::build::get_docker_wrapped_binaries() {
);; );;
"arm") "arm")
local targets=( local targets=(
cloud-controller-manager,armel/busybox
kube-apiserver,armel/busybox kube-apiserver,armel/busybox
kube-controller-manager,armel/busybox kube-controller-manager,armel/busybox
kube-scheduler,armel/busybox kube-scheduler,armel/busybox
...@@ -105,6 +107,7 @@ kube::build::get_docker_wrapped_binaries() { ...@@ -105,6 +107,7 @@ kube::build::get_docker_wrapped_binaries() {
);; );;
"arm64") "arm64")
local targets=( local targets=(
cloud-controller-manager,aarch64/busybox
kube-apiserver,aarch64/busybox kube-apiserver,aarch64/busybox
kube-controller-manager,aarch64/busybox kube-controller-manager,aarch64/busybox
kube-scheduler,aarch64/busybox kube-scheduler,aarch64/busybox
...@@ -113,6 +116,7 @@ kube::build::get_docker_wrapped_binaries() { ...@@ -113,6 +116,7 @@ kube::build::get_docker_wrapped_binaries() {
);; );;
"ppc64le") "ppc64le")
local targets=( local targets=(
cloud-controller-manager,ppc64le/busybox
kube-apiserver,ppc64le/busybox kube-apiserver,ppc64le/busybox
kube-controller-manager,ppc64le/busybox kube-controller-manager,ppc64le/busybox
kube-scheduler,ppc64le/busybox kube-scheduler,ppc64le/busybox
...@@ -121,6 +125,7 @@ kube::build::get_docker_wrapped_binaries() { ...@@ -121,6 +125,7 @@ kube::build::get_docker_wrapped_binaries() {
);; );;
"s390x") "s390x")
local targets=( local targets=(
cloud-controller-manager,s390x/busybox
kube-apiserver,s390x/busybox kube-apiserver,s390x/busybox
kube-controller-manager,s390x/busybox kube-controller-manager,s390x/busybox
kube-scheduler,s390x/busybox kube-scheduler,s390x/busybox
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment