Merge pull request #12791 from sbueringer/pr-webhook-rename

🌱 Consistent webhook file/folder structure

Author: k8s-ci-robot

config/webhook/manifests.yaml

@@ -55,20 +55,20 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta2-machine
+      path: /mutate-runtime-cluster-x-k8s-io-v1beta2-extensionconfig
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machine.cluster.x-k8s.io
+  name: default.extensionconfig.runtime.addons.cluster.x-k8s.io
   rules:
   - apiGroups:
-    - cluster.x-k8s.io
+    - runtime.cluster.x-k8s.io
     apiVersions:
     - v1beta2
     operations:
     - CREATE
     - UPDATE
     resources:
-    - machines
+    - extensionconfigs
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -77,10 +77,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta2-machinedeployment
+      path: /mutate-cluster-x-k8s-io-v1beta2-machine
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machinedeployment.cluster.x-k8s.io
+  name: default.machine.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -90,7 +90,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinedeployments
+    - machines
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -99,10 +99,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta2-machinehealthcheck
+      path: /mutate-cluster-x-k8s-io-v1beta2-machinedeployment
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machinehealthcheck.cluster.x-k8s.io
+  name: default.machinedeployment.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -112,7 +112,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinehealthchecks
+    - machinedeployments
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -121,10 +121,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta2-machinepool
+      path: /mutate-cluster-x-k8s-io-v1beta2-machinehealthcheck
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machinepool.cluster.x-k8s.io
+  name: default.machinehealthcheck.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -134,7 +134,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinepools
+    - machinehealthchecks
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -143,10 +143,10 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-cluster-x-k8s-io-v1beta2-machineset
+      path: /mutate-cluster-x-k8s-io-v1beta2-machinepool
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.machineset.cluster.x-k8s.io
+  name: default.machinepool.cluster.x-k8s.io
   rules:
   - apiGroups:
     - cluster.x-k8s.io
@@ -156,7 +156,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - machinesets
+    - machinepools
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -165,20 +165,20 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-runtime-cluster-x-k8s-io-v1beta2-extensionconfig
+      path: /mutate-cluster-x-k8s-io-v1beta2-machineset
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: default.extensionconfig.runtime.addons.cluster.x-k8s.io
+  name: default.machineset.cluster.x-k8s.io
   rules:
   - apiGroups:
-    - runtime.cluster.x-k8s.io
+    - cluster.x-k8s.io
     apiVersions:
     - v1beta2
     operations:
     - CREATE
     - UPDATE
     resources:
-    - extensionconfigs
+    - machinesets
   sideEffects: None
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -276,6 +276,28 @@ webhooks:
     resources:
     - clusterresourcesetbindings
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /validate-runtime-cluster-x-k8s-io-v1beta2-extensionconfig
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.extensionconfig.runtime.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - runtime.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - extensionconfigs
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -454,25 +476,3 @@ webhooks:
     resources:
     - machinesets
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-runtime-cluster-x-k8s-io-v1beta2-extensionconfig
-  failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: validation.extensionconfig.runtime.cluster.x-k8s.io
-  rules:
-  - apiGroups:
-    - runtime.cluster.x-k8s.io
-    apiVersions:
-    - v1beta2
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - extensionconfigs
-  sideEffects: None

controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go renamed to controlplane/kubeadm/internal/webhooks/kubeadmcontrolplane.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runtime
+package webhooks
 
 import (
 	"context"

controlplane/kubeadm/internal/webhooks/kubeadm_control_plane_test.go renamed to controlplane/kubeadm/internal/webhooks/kubeadmcontrolplane_test.go

@@ -14,29 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runtime
+package webhooks
 
 import (
 	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	utilfeature "k8s.io/component-base/featuregate/testing"
 	"k8s.io/utils/ptr"
-	ctrl "sigs.k8s.io/controller-runtime"
 
 	runtimev1 "sigs.k8s.io/cluster-api/api/runtime/v1beta2"
 	"sigs.k8s.io/cluster-api/feature"
 	"sigs.k8s.io/cluster-api/internal/webhooks/util"
 )
 
-var (
-	ctx        = ctrl.SetupSignalHandler()
-	fakeScheme = runtime.NewScheme()
-)
-
 func init() {
 	_ = runtimev1.AddToScheme(fakeScheme)
 }