Merge pull request #27 from spectrocloud/PPD-1477

PPD-1477: Include vCluster chart to enable airgap installation

Dockerfile

@@ -14,7 +14,6 @@ WORKDIR /workspace
 
 # Copy binaries
 COPY --from=thirdparty /binaries/helm/latest/$BIN_TYPE/$TARGETARCH/helm helm
-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
@@ -33,6 +32,9 @@ COPY api/ api/
 COPY controllers/ controllers/
 COPY pkg/ pkg/
 
+# Copy vCluster charts
+COPY /charts/ /charts/
+
 # Build
 RUN CGO_ENABLED=0 go build -a -o manager main.go
 
@@ -42,7 +44,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.16.4.tgz .
+COPY --from=builder /charts/ /charts/
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -41,8 +41,10 @@ SHELL = /usr/bin/env bash -o pipefail
 all: build
 
 BIN_DIR ?= ./bin
+CHARTS_DIR ?= ./charts
 bin-dir:
 	test -d $(BIN_DIR) || mkdir $(BIN_DIR)
+	test -d $(CHARTS_DIR) || mkdir $(CHARTS_DIR)
 
 ##@ General
 
@@ -185,4 +187,4 @@ HELM=$(BIN_DIR)/helm-$(GOOS)-$(GOARCH)
 .PHONY: download-chart
 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)
+	helm pull loft/vcluster --version $(VCLUSTER_CHART_VERSION) -d $(CHARTS_DIR)

controllers/vcluster_controller.go

@@ -356,7 +356,7 @@ func (r *VClusterReconciler) redeployIfNeeded(ctx context.Context, vCluster *v1a
 
 	r.Log.Infof("Deploy virtual cluster %s/%s with values: %s", vCluster.Namespace, vCluster.Name, values)
 
-	chartPath := "./" + chartName + "-" + chartVersion + ".tgz"
+	chartPath := "/charts/" + chartName + "-" + chartVersion + ".tgz"
 	_, err = os.Stat(chartPath)
 	if err != nil {
 		// we have to upgrade / install the chart