From 7e0362006c232ac1d9d9d905df4ad6bf05b38984 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Fri, 16 Apr 2021 15:38:26 +0200 Subject: [PATCH] Update to Gardener v1.15. (#171) --- Dockerfile | 5 +---- Makefile | 1 - go.mod | 2 +- go.sum | 12 ++++++++++-- hack/gardener-install-requirements.patch | 11 ----------- 5 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 hack/gardener-install-requirements.patch diff --git a/Dockerfile b/Dockerfile index 00f0a3c5b..94b183db5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,9 @@ FROM golang:1.15 AS builder WORKDIR /go/src/github.com/metal-stack/gardener-extension-provider-metal COPY . . -RUN apt-get update -# Patch is only required for patching install-requirements.sh; can remove this once fix is in upstream gardener. -RUN apt-get install patch RUN make install -FROM alpine:3.12 +FROM alpine:3.13 WORKDIR / COPY charts /controllers/provider-metal/charts COPY --from=builder /go/bin/gardener-extension-metal-hyper /gardener-extension-metal-hyper diff --git a/Makefile b/Makefile index e41ae74f3..3e574fc5d 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,6 @@ revendor: @GO111MODULE=on go mod tidy @chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/* @chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/* - @patch -p0 -d $(REPO_ROOT) -f