Move webhooks to a separate package

kubernetes-sigs · Aug 8, 2023 · b501f5f · b501f5f
1 parent 85a7a41
commit b501f5f
Show file tree

Hide file tree

Showing 20 changed files with 716 additions and 559 deletions.
diff --git a/api/v1beta1/machinehealthcheck_types.go b/api/v1beta1/machinehealthcheck_types.go
@@ -17,11 +17,21 @@ limitations under the License.
 package v1beta1
 
 import (
+	"time"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
+var (
+	// DefaultNodeStartupTimeout is the time allowed for a node to start up.
+	// Can be made longer as part of spec if required for particular provider.
+	// 10 minutes should allow the instance to start and the node to join the
+	// cluster on most providers.
+	DefaultNodeStartupTimeout = metav1.Duration{Duration: 10 * time.Minute}
+)
+
 // ANCHOR: MachineHealthCheckSpec
 
 // MachineHealthCheckSpec defines the desired state of MachineHealthCheck.

diff --git a/api/v1beta1/zz_generated.openapi.go b/api/v1beta1/zz_generated.openapi.go
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -11,10 +11,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-machine
+      path: /mutate-cluster-x-k8s-io-v1beta1-cluster
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machine.cluster.x-k8s.io
+  name: default.cluster.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -24,7 +24,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machines
+    - clusters
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -33,10 +33,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-machinedeployment
+      path: /mutate-cluster-x-k8s-io-v1beta1-clusterclass
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machinedeployment.cluster.x-k8s.io
+  name: default.clusterclass.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -46,7 +46,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinedeployments
+    - clusterclasses
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -55,10 +55,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-machinehealthcheck
+      path: /mutate-cluster-x-k8s-io-v1beta1-machine
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machinehealthcheck.cluster.x-k8s.io
+  name: default.machine.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -68,7 +68,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinehealthchecks
+    - machines
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -77,10 +77,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-machineset
+      path: /mutate-cluster-x-k8s-io-v1beta1-machinedeployment
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machineset.cluster.x-k8s.io
+  name: default.machinedeployment.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -90,7 +90,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinesets
+    - machinedeployments
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -99,10 +99,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-cluster
+      path: /mutate-cluster-x-k8s-io-v1beta1-machinehealthcheck
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.cluster.cluster.x-k8s.io
+  name: default.machinehealthcheck.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -112,7 +112,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - clusters
+    - machinehealthchecks
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -121,10 +121,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta1-clusterclass
+      path: /mutate-cluster-x-k8s-io-v1beta1-machineset
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.clusterclass.cluster.x-k8s.io
+  name: default.machineset.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -134,7 +134,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - clusterclasses
+    - machinesets
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -215,10 +215,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-machine
+      path: /validate-cluster-x-k8s-io-v1beta1-cluster
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.machine.cluster.x-k8s.io
+  name: validation.cluster.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -227,8 +227,9 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
-    - machines
+    - clusters
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -237,10 +238,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-machinedeployment
+      path: /validate-cluster-x-k8s-io-v1beta1-clusterclass
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.machinedeployment.cluster.x-k8s.io
+  name: validation.clusterclass.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -249,8 +250,9 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
-    - machinedeployments
+    - clusterclasses
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -259,10 +261,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-machinehealthcheck
+      path: /validate-cluster-x-k8s-io-v1beta1-machine
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.machinehealthcheck.cluster.x-k8s.io
+  name: validation.machine.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -272,7 +274,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinehealthchecks
+    - machines
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -281,10 +283,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-machineset
+      path: /validate-cluster-x-k8s-io-v1beta1-machinedeployment
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.machineset.cluster.x-k8s.io
+  name: validation.machinedeployment.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -294,7 +296,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinesets
+    - machinedeployments
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -303,10 +305,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-cluster
+      path: /validate-cluster-x-k8s-io-v1beta1-machinehealthcheck
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.cluster.cluster.x-k8s.io
+  name: validation.machinehealthcheck.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -315,9 +317,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
-    - DELETE
     resources:
-    - clusters
+    - machinehealthchecks
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -326,10 +327,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-cluster-x-k8s-io-v1beta1-clusterclass
+      path: /validate-cluster-x-k8s-io-v1beta1-machineset
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.clusterclass.cluster.x-k8s.io
+  name: validation.machineset.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -338,9 +339,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
-    - DELETE
     resources:
-    - clusterclasses
+    - machinesets
   sideEffects: None
 - admissionReviewVersions:
   - v1

diff --git a/controlplane/kubeadm/internal/controllers/controller_test.go b/controlplane/kubeadm/internal/controllers/controller_test.go
@@ -55,6 +55,7 @@ import (
 	"sigs.k8s.io/cluster-api/internal/contract"
 	"sigs.k8s.io/cluster-api/internal/test/builder"
 	"sigs.k8s.io/cluster-api/internal/util/ssa"
+	"sigs.k8s.io/cluster-api/internal/webhooks"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/certs"
 	"sigs.k8s.io/cluster-api/util/collections"
@@ -2418,7 +2419,10 @@ func createMachineNodePair(name string, cluster *clusterv1.Cluster, kcp *control
 			},
 		},
 	}
-	machine.Default()
+	webhook := webhooks.Machine{}
+	if err := webhook.Default(ctx, machine); err != nil {
+		panic(err)
+	}
 
 	node := &corev1.Node{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
@@ -46,6 +46,7 @@ import (
 	"sigs.k8s.io/cluster-api/controllers/remote"
 	capierrors "sigs.k8s.io/cluster-api/errors"
 	"sigs.k8s.io/cluster-api/internal/test/builder"
+	"sigs.k8s.io/cluster-api/internal/webhooks"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
@@ -1248,7 +1249,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 				},
 			},
 		}
-		machineSet.Default()
+		g.Expect((&webhooks.MachineSet{}).Default(ctx, machineSet)).Should(Succeed())
 		g.Expect(env.Create(ctx, machineSet)).To(Succeed())
 
 		// Ensure machines have been created.

diff --git a/internal/controllers/topology/cluster/desired_state.go b/internal/controllers/topology/cluster/desired_state.go
@@ -38,6 +38,7 @@ import (
 	"sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope"
 	"sigs.k8s.io/cluster-api/internal/hooks"
 	tlog "sigs.k8s.io/cluster-api/internal/log"
+	"sigs.k8s.io/cluster-api/internal/webhooks"
 	"sigs.k8s.io/cluster-api/util"
 )
 
@@ -1015,7 +1016,9 @@ func computeMachineHealthCheck(healthCheckTarget client.Object, selector *metav1
 
 	// Default all fields in the MachineHealthCheck using the same function called in the webhook. This ensures the desired
 	// state of the object won't be different from the current state due to webhook Defaulting.
-	mhc.Default()
+	if err := (&webhooks.MachineHealthCheck{}).Default(context.TODO(), mhc); err != nil {
+		panic(err)
+	}
 
 	return mhc
 }