Upgrade CAPVC

Makefile

@@ -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)
+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)

api/v1alpha1/vcluster_webhook.go

@@ -2,6 +2,7 @@ package v1alpha1
 
 import (
 	"fmt"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -33,25 +34,25 @@ func (r *VCluster) Default() {
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *VCluster) ValidateCreate() error {
+func (r *VCluster) ValidateCreate() (admission.Warnings, error) {
 	vclusterlog.Info("validate create", "name", r.Name)
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *VCluster) ValidateUpdate(old runtime.Object) error {
+func (r *VCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	vclusterlog.Info("validate update", "name", r.Name)
 	oldVcluster := old.(*VCluster)
 
 	if r.Name != oldVcluster.Name {
-		return apierrors.NewBadRequest(fmt.Sprintf("vcluster name change is not allowed, old=%s, new=%s", oldVcluster.Name, r.Name))
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("vcluster name change is not allowed, old=%s, new=%s", oldVcluster.Name, r.Name))
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *VCluster) ValidateDelete() error {
+func (r *VCluster) ValidateDelete() (admission.Warnings, error) {
 	vclusterlog.Info("validate delete", "name", r.Name)
-	return nil
+	return nil, nil
 }

api/v1alpha1/webhook_suite_test.go

@@ -18,8 +18,6 @@ import (
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
@@ -36,9 +34,8 @@ var cancel context.CancelFunc
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Webhook Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t,
+		"Webhook Suite")
 }
 
 var _ = BeforeSuite(func() {