should work again (hopefully)

kubernetes-sigs · Nov 23, 2021 · 8600de1 · 8600de1
1 parent 8fc9721
commit 8600de1
Show file tree

Hide file tree

Showing 30 changed files with 376 additions and 148 deletions.
diff --git a/api/v1alpha3/suite_test.go b/api/v1alpha3/suite_test.go
@@ -17,14 +17,16 @@ limitations under the License.
 package v1alpha3
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
 	// +kubebuilder:scaffold:imports
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/webhooks"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -37,8 +39,15 @@ func TestMain(m *testing.M) {
 	utilruntime.Must(AddToScheme(scheme.Scheme))
 
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
-		M:             m,
-		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupCoreWebhooksWithManager,
+		M:        m,
+		SetupEnv: func(e *envtest.Environment) { env = e },
+		SetupWebhooks: func(mgr ctrl.Manager) {
+			if err := clusterv1.SetupWebhooksWithManager(mgr); err != nil {
+				panic(fmt.Sprintf("Failed to set up webhooks: %v", err))
+			}
+			if err := webhooks.SetupWebhooksWithManager(mgr); err != nil {
+				panic(fmt.Sprintf("failed to set up webhooks: %v", err))
+			}
+		},
 	}))
 }
diff --git a/api/v1beta1/webhooks.go b/api/v1beta1/webhooks.go
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	"github.com/pkg/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+// SetupWebhooksWithManager sets up all webhooks of the current package.
+func SetupWebhooksWithManager(mgr ctrl.Manager) error {
+	if err := (&Machine{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create Machine webhook")
+	}
+
+	if err := (&MachineSet{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create MachineSet webhook")
+	}
+
+	if err := (&MachineDeployment{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create MachineDeployment webhook")
+	}
+
+	if err := (&MachineHealthCheck{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create MachineHealthCheck webhook")
+	}
+	return nil
+}
diff --git a/bootstrap/kubeadm/api/v1alpha3/suite_test.go b/bootstrap/kubeadm/api/v1alpha3/suite_test.go
@@ -17,14 +17,15 @@ limitations under the License.
 package v1alpha3
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
 	// +kubebuilder:scaffold:imports
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
+	kubeadmbootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -39,6 +40,10 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:        m,
 		SetupEnv: func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupCABPKWebhooksWithManager,
+		SetupWebhooks: func(mgr ctrl.Manager) {
+			if err := kubeadmbootstrapv1.SetupWebhooksWithManager(mgr); err != nil {
+				panic(fmt.Sprintf("Failed to set up webhooks: %v", err))
+			}
+		},
 	}))
 }
diff --git a/bootstrap/kubeadm/api/v1beta1/webhooks.go b/bootstrap/kubeadm/api/v1beta1/webhooks.go
@@ -0,0 +1,33 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	"github.com/pkg/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+// SetupWebhooksWithManager sets up all webhooks of the current package.
+func SetupWebhooksWithManager(mgr ctrl.Manager) error {
+	if err := (&KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create KubeadmConfig webhook")
+	}
+	if err := (&KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create KubeadmConfigTemplate webhook")
+	}
+	return nil
+}
diff --git a/bootstrap/kubeadm/internal/controllers/suite_test.go b/bootstrap/kubeadm/internal/controllers/suite_test.go
@@ -22,7 +22,7 @@ import (
 
 	// +kubebuilder:scaffold:imports
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -35,6 +35,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go
@@ -216,18 +216,10 @@ func setupWebhooks(mgr ctrl.Manager) {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfig")
 		os.Exit(1)
 	}
-	if err := (&kubeadmbootstrapv1.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigList")
-		os.Exit(1)
-	}
 	if err := (&kubeadmbootstrapv1.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplate")
 		os.Exit(1)
 	}
-	if err := (&kubeadmbootstrapv1.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplateList")
-		os.Exit(1)
-	}
 }
 
 func concurrency(c int) controller.Options {

diff --git a/bootstrap/util/suite_test.go b/bootstrap/util/suite_test.go
@@ -22,7 +22,7 @@ import (
 
 	// +kubebuilder:scaffold:imports
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -35,6 +35,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/controllers/remote/suite_test.go b/controllers/remote/suite_test.go
@@ -23,7 +23,7 @@ import (
 
 	// +kubebuilder:scaffold:imports
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -40,6 +40,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/cluster-api/api/v1beta1/index"
 	"sigs.k8s.io/cluster-api/controllers/remote"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 )
@@ -128,7 +128,7 @@ func TestMain(m *testing.M) {
 		M:                m,
 		SetupEnv:         func(e *envtest.Environment) { env = e },
 		SetupIndexes:     setupIndexes,
-		SetupWebhooks:    webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks:    setup.AllWebhooksWithManager,
 		SetupReconcilers: setupReconcilers,
 	}))
 }

diff --git a/controllers/topology/suite_test.go b/controllers/topology/suite_test.go
@@ -30,7 +30,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/api/v1beta1/index"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -53,6 +53,7 @@ func TestMain(m *testing.M) {
 			panic(fmt.Sprintf("unable to setup index: %v", err))
 		}
 	}
+
 	setupReconcilers := func(ctx context.Context, mgr ctrl.Manager) {
 		unstructuredCachingClient, err := client.NewDelegatingClient(
 			client.NewDelegatingClientInput{
@@ -88,7 +89,7 @@ func TestMain(m *testing.M) {
 		ManagerUncachedObjs: []client.Object{},
 		SetupEnv:            func(e *envtest.Environment) { env = e },
 		SetupIndexes:        setupIndexes,
-		SetupWebhooks:       webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks:       setup.AllWebhooksWithManager,
 		SetupReconcilers:    setupReconcilers,
 	}))
 }
diff --git a/controlplane/kubeadm/api/v1alpha3/suite_test.go b/controlplane/kubeadm/api/v1alpha3/suite_test.go
@@ -24,7 +24,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -39,6 +39,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupKCPWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/controlplane/kubeadm/api/v1beta1/webhooks.go b/controlplane/kubeadm/api/v1beta1/webhooks.go
@@ -0,0 +1,33 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	"github.com/pkg/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+// SetupWebhooksWithManager sets up all webhooks of the current package.
+func SetupWebhooksWithManager(mgr ctrl.Manager) error {
+	if err := (&KubeadmControlPlane{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create KubeadmControlPlane webhook")
+	}
+	if err := (&KubeadmControlPlaneTemplate{}).SetupWebhookWithManager(mgr); err != nil {
+		return errors.Wrapf(err, "failed to create KubeadmControlPlaneTemplate webhook")
+	}
+	return nil
+}
diff --git a/controlplane/kubeadm/controllers/suite_test.go b/controlplane/kubeadm/controllers/suite_test.go
@@ -24,7 +24,7 @@ import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -56,6 +56,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/controlplane/kubeadm/internal/suite_test.go b/controlplane/kubeadm/internal/suite_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
+	"sigs.k8s.io/cluster-api/internal/envtest/setup"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -34,6 +34,6 @@ func TestMain(m *testing.M) {
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
 		M:             m,
 		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupAllWebhooksWithManager,
+		SetupWebhooks: setup.AllWebhooksWithManager,
 	}))
 }
diff --git a/exp/addons/api/v1alpha3/suite_test.go b/exp/addons/api/v1alpha3/suite_test.go
@@ -17,14 +17,15 @@ limitations under the License.
 package v1alpha3
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
 	// +kubebuilder:scaffold:imports
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
+	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/internal/envtest"
-	"sigs.k8s.io/cluster-api/internal/envtest/webhooks"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -37,8 +38,12 @@ func TestMain(m *testing.M) {
 	utilruntime.Must(AddToScheme(scheme.Scheme))
 
 	os.Exit(envtest.Run(ctx, envtest.RunInput{
-		M:             m,
-		SetupEnv:      func(e *envtest.Environment) { env = e },
-		SetupWebhooks: webhooks.SetupCoreWebhooksWithManager,
+		M:        m,
+		SetupEnv: func(e *envtest.Environment) { env = e },
+		SetupWebhooks: func(mgr ctrl.Manager) {
+			if err := addonsv1.SetupWebhooksWithManager(mgr); err != nil {
+				panic(fmt.Sprintf("Failed to set up webhooks: %v", err))
+			}
+		},
 	}))
 }