From 21ce33fe2d53f3c0e38eb961ca1ba117d13c533d Mon Sep 17 00:00:00 2001 From: Ahmed Kadri Date: Mon, 6 Nov 2023 12:01:25 +0100 Subject: [PATCH] PPD-1395: upgrade vcluster to v0.16.4 --- Dockerfile | 6 +++--- Makefile | 2 +- pkg/constants/constants.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68597ed41..54d96a968 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BUILDER_GOLANG_VERSION FROM --platform=linux/amd64 gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as builder ARG HELM=./bin/helm-linux-amd64 -ARG HELM_CHART=./bin/vcluster-0.13.0.tgz +ARG HELM_CHART=./bin/vcluster-0.16.4.tgz ARG TARGETOS ARG TARGETARCH @@ -11,7 +11,7 @@ WORKDIR /workspace # Copy binaries COPY ${HELM} helm -COPY ${HELM_CHART} vcluster-0.13.0.tgz +COPY ${HELM_CHART} vcluster-0.16.4.tgz # Install Delve for debugging RUN if [ "${TARGETARCH}" = "amd64" ]; then go install github.com/go-delve/delve/cmd/dlv@latest; fi @@ -39,7 +39,7 @@ FROM --platform=linux/amd64 gcr.io/distroless/static:nonroot WORKDIR / COPY --from=builder /workspace/manager . COPY --from=builder /workspace/helm . -COPY --from=builder /workspace/vcluster-0.13.0.tgz . +COPY --from=builder /workspace/vcluster-0.16.4.tgz . USER 65532:65532 ENTRYPOINT ["/manager"] diff --git a/Makefile b/Makefile index 5c1b3feec..e72a69350 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VE ENVTEST_K8S_VERSION = 1.23 # HELM_VERSION = 3.12.0 HELM_VERSION = 3.11.2-20230627 -VCLUSTER_CHART_VERSION = 0.13.0 +VCLUSTER_CHART_VERSION = 0.16.4 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 153e26daa..7108a7a84 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -4,7 +4,7 @@ import "os" var ( // DefaultVClusterVersion is the default version of the virtual cluster to use - DefaultVClusterVersion = "0.13.0" + DefaultVClusterVersion = "v0.16.4" // DefaultVClusterChartName is the default chart name of the virtual cluster to use DefaultVClusterChartName = "vcluster"