Skip to content

Commit

Permalink
Bump golang and default metrics-server version
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Davidson <[email protected]>
  • Loading branch information
brandond committed Sep 15, 2021
1 parent aaffbe7 commit 664bdff
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
18 changes: 14 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG UBI_IMAGE=registry.access.redhat.com/ubi7/ubi-minimal:latest
ARG GO_IMAGE=rancher/hardened-build-base:v1.16.4b7
ARG GO_IMAGE=rancher/hardened-build-base:v1.16.7b7
FROM ${UBI_IMAGE} as ubi
FROM ${GO_IMAGE} as builder
# setup required packages
Expand All @@ -14,18 +14,28 @@ RUN set -x \
# setup the build
ARG PKG="github.com/kubernetes-incubator/metrics-server"
ARG SRC="github.com/kubernetes-sigs/metrics-server"
ARG TAG="v0.3.7"
ARG TAG="v0.5.0"
RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
WORKDIR $GOPATH/src/${PKG}
RUN git fetch --all --tags --prune
RUN git checkout tags/${TAG} -b ${TAG}
RUN GO111MODULE=off \
RUN if echo ${TAG} | grep -qE '^v0\.3\.'; then \
GO111MODULE=off \
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr \
-i k8s.io/metrics/pkg/apis/metrics/v1beta1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version \
-p ${PKG}/pkg/generated/openapi/ \
-O zz_generated.openapi \
-h $(pwd)/hack/boilerplate.go.txt \
-r /dev/null
-r /dev/null; \
else \
go install -mod=readonly k8s.io/kube-openapi/cmd/openapi-gen && \
${GOPATH}/bin/openapi-gen --logtostderr \
-i k8s.io/metrics/pkg/apis/metrics/v1beta1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version \
-p ${PKG}/pkg/generated/openapi/ \
-O zz_generated.openapi \
-h $(pwd)/scripts/boilerplate.go.txt \
-r /dev/null; \
fi
RUN GO111MODULE=off \
GO_LDFLAGS="-linkmode=external \
-X ${PKG}/pkg/version.Version=${TAG} \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ORG ?= rancher
# but still refers internally to github.com/kubernetes-incubator/metrics-server packages
PKG ?= github.com/kubernetes-incubator/metrics-server
SRC ?= github.com/kubernetes-sigs/metrics-server
TAG ?= v0.3.7$(BUILD_META)
TAG ?= v0.5.0$(BUILD_META)

ifneq ($(DRONE_TAG),)
TAG := $(DRONE_TAG)
Expand Down

0 comments on commit 664bdff

Please sign in to comment.