From 6a090b69524fe69425da24896188dd03c72e0f6c Mon Sep 17 00:00:00 2001
From: Ahmed Kadri <ahmed.kadri@spectrocloud.com>
Date: Fri, 31 May 2024 19:12:21 +0200
Subject: [PATCH 1/2] Revert Vcluster version

---
 Dockerfile                 |  4 ++--
 Makefile                   | 10 +++++-----
 pkg/constants/constants.go |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 663eb4fbc..a7a5be87f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /workspace
 # Copy binaries
 COPY ${HELM} helm
 COPY --from=thirdparty /binaries/helm/latest/$BIN_TYPE/$TARGETARCH/helm helm
-COPY ${HELM_CHART} vcluster-0.18.1.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
@@ -43,7 +43,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.18.1.tgz .
+COPY --from=builder /workspace/vcluster-0.16.4.tgz .
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]
diff --git a/Makefile b/Makefile
index 714b2cb5d..c1e5dacbb 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ BUILDER_3RDPARTY_VERSION ?= $(shell echo $(PROD_VERSION) | cut -d. -f1,2)
 BUILD_DATE:=$(shell date +%Y%m%d)
 IMG_NAME ?= cluster-api-virtual-controller
 # IMG_URL ?= gcr.io/spectro-images-public/release/cluster-api-virtual/
-IMG_URL ?= gcr.io/spectro-dev-public/${USER}/cluster-api-virtual
+IMG_URL ?= gcr.io/spectro-common-dev/${USER}/cluster-api-virtual
 IMG_TAG ?= v0.1.3-spectro-${BUILD_DATE}
 IMG ?= $(IMG_URL)/$(IMG_NAME):$(IMG_TAG)
 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION} --build-arg BUILDER_3RDPARTY_VERSION=${BUILDER_3RDPARTY_VERSION}
@@ -20,7 +20,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.18.1
+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))
@@ -183,6 +183,6 @@ binaries: download-chart ## Download binaries
 HELM=$(BIN_DIR)/helm-$(GOOS)-$(GOARCH)
 
 .PHONY: download-chart
-download-chart: ## Download vcluster chart
-	$(HELM) repo add loft https://charts.loft.sh
-	$(HELM) pull loft/vcluster --version $(VCLUSTER_CHART_VERSION) -d $(BIN_DIR)
\ No newline at end of file
+download-chart: bin-dir ## Download vcluster chart
+	helm repo add loft https://charts.loft.sh
+	helm pull loft/vcluster --version $(VCLUSTER_CHART_VERSION) -d $(BIN_DIR)
\ No newline at end of file
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index 2a5d16526..7a2b37b24 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.19.5"
+	DefaultVClusterVersion = "0.16.4"
 
 	// DefaultVClusterChartName is the default chart name of the virtual cluster to use
 	DefaultVClusterChartName = "vcluster"

From 62e01a09663d1003dcd641cd304be6553a7a15ca Mon Sep 17 00:00:00 2001
From: Ahmed Kadri <ahmed.kadri@spectrocloud.com>
Date: Fri, 31 May 2024 19:21:25 +0200
Subject: [PATCH 2/2] Revert Vcluster version, Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c1e5dacbb..dc3677ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ BUILDER_3RDPARTY_VERSION ?= $(shell echo $(PROD_VERSION) | cut -d. -f1,2)
 BUILD_DATE:=$(shell date +%Y%m%d)
 IMG_NAME ?= cluster-api-virtual-controller
 # IMG_URL ?= gcr.io/spectro-images-public/release/cluster-api-virtual/
-IMG_URL ?= gcr.io/spectro-common-dev/${USER}/cluster-api-virtual
+IMG_URL ?= gcr.io/spectro-dev-public/${USER}/cluster-api-virtual
 IMG_TAG ?= v0.1.3-spectro-${BUILD_DATE}
 IMG ?= $(IMG_URL)/$(IMG_NAME):$(IMG_TAG)
 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION} --build-arg BUILDER_3RDPARTY_VERSION=${BUILDER_3RDPARTY_VERSION}