Merge pull request #2413 from bskiba/vpa-release-0.6

Rebase VPA to distroless
kubernetes · Oct 2, 2019 · 64e8217 · 64e8217
2 parents 9e7048e + 9edaedd
commit 64e8217
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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 "[email protected]"
 
-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
@@ -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
@@ -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 "[email protected]"
 
-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
@@ -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
@@ -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 "[email protected]"
 
-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
@@ -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}