ipam: enable conversion in CRDs

Author: chrischdi

config/crd/kustomization.yaml

@@ -30,6 +30,8 @@ patches:
 - path: patches/webhook_in_machinehealthchecks.yaml
 - path: patches/webhook_in_clusterresourcesets.yaml
 - path: patches/webhook_in_clusterresourcesetbindings.yaml
+- path: patches/webhook_in_ipaddresses.yaml
+- path: patches/webhook_in_ipaddressclaims.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/patches/webhook_in_ipaddressclaims.yaml

@@ -0,0 +1,16 @@
+# The following patch enables conversion webhook for CRD
+# CRD conversion requires k8s 1.13 or later.
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: ipaddressclaims.ipam.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions: ["v1", "v1beta1"]
+      clientConfig:
+        service:
+          namespace: system
+          name: webhook-service
+          path: /convert

config/crd/patches/webhook_in_ipaddresses.yaml

@@ -0,0 +1,16 @@
+# The following patch enables conversion webhook for CRD
+# CRD conversion requires k8s 1.13 or later.
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: ipaddresses.ipam.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions: ["v1", "v1beta1"]
+      clientConfig:
+        service:
+          namespace: system
+          name: webhook-service
+          path: /convert

config/default/kustomization.yaml

@@ -58,8 +58,6 @@ replacements:
     select:
       kind: CustomResourceDefinition
     reject:
-    - name: ipaddressclaims.ipam.cluster.x-k8s.io
-    - name: ipaddresses.ipam.cluster.x-k8s.io
     - name: extensionconfigs.runtime.cluster.x-k8s.io
 - source:
     fieldPath: .metadata.name
@@ -93,8 +91,6 @@ replacements:
     select:
       kind: CustomResourceDefinition
     reject:
-    - name: ipaddressclaims.ipam.cluster.x-k8s.io
-    - name: ipaddresses.ipam.cluster.x-k8s.io
     - name: extensionconfigs.runtime.cluster.x-k8s.io
 - source:
     fieldPath: .metadata.name

main.go

@@ -65,6 +65,8 @@ import (
 	expv1beta1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
 	expcontrollers "sigs.k8s.io/cluster-api/exp/controllers"
+	ipamv1alpha1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1"
+	ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2"
 	expipamwebhooks "sigs.k8s.io/cluster-api/exp/ipam/webhooks"
 	runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1"
@@ -158,6 +160,8 @@ func init() {
 
 	_ = runtimev1.AddToScheme(scheme)
 
+	_ = ipamv1alpha1.AddToScheme(scheme)
+	_ = ipamv1beta1.AddToScheme(scheme)
 	_ = ipamv1.AddToScheme(scheme)
 
 	// Register the RuntimeHook types into the catalog.