From 9edaedd31006112403d1531098741b8c80cac258 Mon Sep 17 00:00:00 2001 From: Beata Skiba Date: Wed, 2 Oct 2019 13:08:53 +0200 Subject: [PATCH] Rebase VPA to distroless --- vertical-pod-autoscaler/pkg/admission-controller/Dockerfile | 6 +++--- vertical-pod-autoscaler/pkg/admission-controller/Makefile | 2 +- vertical-pod-autoscaler/pkg/recommender/Dockerfile | 6 +++--- vertical-pod-autoscaler/pkg/recommender/Makefile | 2 +- vertical-pod-autoscaler/pkg/updater/Dockerfile | 6 +++--- vertical-pod-autoscaler/pkg/updater/Makefile | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile b/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile index bec10526d3c2..768d04316c6b 100644 --- a/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile +++ b/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM k8s.gcr.io/debian-base-amd64:1.0.0 +FROM gcr.io/distroless/static:latest MAINTAINER Tomasz Kulczynski "tkulczynski@google.com" -ADD admission-controller admission-controller +copy admission-controller / -ENTRYPOINT ["./admission-controller"] +ENTRYPOINT ["/admission-controller"] CMD ["--v=4", "--stderrthreshold=info"] diff --git a/vertical-pod-autoscaler/pkg/admission-controller/Makefile b/vertical-pod-autoscaler/pkg/admission-controller/Makefile index a13ddc541b6c..4e851f851dd1 100644 --- a/vertical-pod-autoscaler/pkg/admission-controller/Makefile +++ b/vertical-pod-autoscaler/pkg/admission-controller/Makefile @@ -3,7 +3,7 @@ all: build TAG?=dev REGISTRY?=staging-k8s.gcr.io FLAGS= -ENVVAR= +ENVVAR=CGO_ENABLED=0 LD_FLAGS=-s GOOS?=linux COMPONENT=admission-controller FULL_COMPONENT=vpa-${COMPONENT} diff --git a/vertical-pod-autoscaler/pkg/recommender/Dockerfile b/vertical-pod-autoscaler/pkg/recommender/Dockerfile index 199a9d3b747f..53a065d55566 100644 --- a/vertical-pod-autoscaler/pkg/recommender/Dockerfile +++ b/vertical-pod-autoscaler/pkg/recommender/Dockerfile @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM k8s.gcr.io/debian-base-amd64:1.0.0 +FROM gcr.io/distroless/static:latest MAINTAINER Krzysztof Grygiel "kgrygiel@google.com" -ADD recommender recommender +COPY recommender / -ENTRYPOINT ["./recommender"] +ENTRYPOINT ["/recommender"] CMD ["--v=4", "--stderrthreshold=info", "--prometheus-address=http://prometheus.monitoring.svc"] diff --git a/vertical-pod-autoscaler/pkg/recommender/Makefile b/vertical-pod-autoscaler/pkg/recommender/Makefile index 91c3857698b5..d097a3c6e24f 100644 --- a/vertical-pod-autoscaler/pkg/recommender/Makefile +++ b/vertical-pod-autoscaler/pkg/recommender/Makefile @@ -3,7 +3,7 @@ all: build TAG?=dev REGISTRY?=staging-k8s.gcr.io FLAGS= -ENVVAR= +ENVVAR=CGO_ENABLED=0 LD_FLAGS=-s GOOS?=linux COMPONENT=recommender FULL_COMPONENT=vpa-${COMPONENT} diff --git a/vertical-pod-autoscaler/pkg/updater/Dockerfile b/vertical-pod-autoscaler/pkg/updater/Dockerfile index 3c0a2dddd9ca..8aad9977a01b 100644 --- a/vertical-pod-autoscaler/pkg/updater/Dockerfile +++ b/vertical-pod-autoscaler/pkg/updater/Dockerfile @@ -13,10 +13,10 @@ # limitations under the License. -FROM k8s.gcr.io/debian-base-amd64:1.0.0 +FROM gcr.io/distroless/static:latest MAINTAINER Marcin Wielgus "mwielgus@google.com" -ADD updater updater +COPY updater / -ENTRYPOINT ["./updater"] +ENTRYPOINT ["/updater"] CMD ["--v=4", "--stderrthreshold=info"] diff --git a/vertical-pod-autoscaler/pkg/updater/Makefile b/vertical-pod-autoscaler/pkg/updater/Makefile index 7645088fd4b1..6948bb5737d2 100644 --- a/vertical-pod-autoscaler/pkg/updater/Makefile +++ b/vertical-pod-autoscaler/pkg/updater/Makefile @@ -3,7 +3,7 @@ all: build TAG?=dev REGISTRY?=staging-k8s.gcr.io FLAGS= -ENVVAR= +ENVVAR=CGO_ENABLED=0 LD_FLAGS=-s GOOS?=linux COMPONENT=updater FULL_COMPONENT=vpa-${COMPONENT}