implement controllers

Author: bruelea

api/v1/iprange_types.go

@@ -26,9 +26,14 @@ import (
 // IpRangeSpec defines the desired state of IpRange
 type IpRangeSpec struct {
 	//+kubebuilder:validation:Format=cidr
-	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'ipRange' is immutable"
+	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'startAddress' is immutable"
 	//+kubebuilder:validation:Required
-	IpRange string `json:"ipRange"`
+	StartAddress string `json:"startAddress"`
+
+	//+kubebuilder:validation:Format=cidr
+	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'endAddress' is immutable"
+	//+kubebuilder:validation:Required
+	EndAddress string `json:"endAddress"`
 
 	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'tenant' is immutable"
 	Tenant string `json:"tenant,omitempty"`
@@ -54,7 +59,8 @@ type IpRangeStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:storageversion
-//+kubebuilder:printcolumn:name="IpRange",type=string,JSONPath=`.spec.ipRange`
+//+kubebuilder:printcolumn:name="StartAddress",type=string,JSONPath=`.spec.startAddress`
+//+kubebuilder:printcolumn:name="EndAddress",type=string,JSONPath=`.spec.endAddress`
 //+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
 //+kubebuilder:printcolumn:name="ID",type=string,JSONPath=`.status.id`
 //+kubebuilder:printcolumn:name="URL",type=string,JSONPath=`.status.url`
@@ -94,12 +100,12 @@ var ConditionIpRangeReadyFalse = metav1.Condition{
 	Type:    "Ready",
 	Status:  "False",
 	Reason:  "FailedToReserveIpInNetbox",
-	Message: "Failed to reserve IP in NetBox",
+	Message: "Failed to reserve IP Range in NetBox",
 }
 
 var ConditionIpRangeReadyFalseDeletionFailed = metav1.Condition{
 	Type:    "Ready",
 	Status:  "False",
 	Reason:  "FailedToDeleteIpInNetbox",
-	Message: "Failed to delete IP in NetBox",
+	Message: "Failed to delete IP Range in NetBox",
 }

api/v1/iprangeclaim_types.go

@@ -30,6 +30,11 @@ type IpRangeClaimSpec struct {
 	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'parentPrefix' is immutable"
 	ParentPrefix string `json:"parentPrefix"`
 
+	//+kubebuilder:validation:Required
+	//+kubebuilder:validation:XValisation:Minimum=1
+	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'size' is immutable"
+	Size int `json:"size,omitempty"`
+
 	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="Field 'tenant' is immutable"
 	Tenant string `json:"tenant,omitempty"`
 
@@ -44,9 +49,7 @@ type IpRangeClaimSpec struct {
 
 // IpRangeClaimStatus defines the observed state of IpRangeClaim
 type IpRangeClaimStatus struct {
-	IpRange string `json:"ipAddress,omitempty"`
-
-	IpRangeDotDecimal string `json:"ipAddressDotDecimal,omitempty"`
+	IpRange string `json:"ipRange,omitempty"`
 
 	IpRangeName string `json:"ipAddressName,omitempty"`
 
@@ -57,7 +60,7 @@ type IpRangeClaimStatus struct {
 //+kubebuilder:subresource:status
 //+kubebuilder:storageversion
 //+kubebuilder:printcolumn:name="IpRange",type=string,JSONPath=`.status.ipRange`
-//+kubebuilder:printcolumn:name="IpAssigned",type=string,JSONPath=`.status.conditions[?(@.type=="IPAssigned")].status`
+//+kubebuilder:printcolumn:name="IpRangeAssigned",type=string,JSONPath=`.status.conditions[?(@.type=="IPAssigned")].status`
 //+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
 //+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:resource:shortName=iprc

api/v1/zz_generated.deepcopy.go

@@ -191,15 +191,23 @@ func main() {
 		os.Exit(1)
 	}
 	if err = (&controller.IpRangeClaimReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:            mgr.GetClient(),
+		Scheme:            mgr.GetScheme(),
+		Recorder:          mgr.GetEventRecorderFor("ip-range-claim-controller"),
+		NetboxClient:      netboxClient,
+		OperatorNamespace: operatorNamespace,
+		RestConfig:        mgr.GetConfig(),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IpRangeClaim")
 		os.Exit(1)
 	}
 	if err = (&controller.IpRangeReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:            mgr.GetClient(),
+		Scheme:            mgr.GetScheme(),
+		Recorder:          mgr.GetEventRecorderFor("ip-address-claim-controller"),
+		NetboxClient:      netboxClient,
+		OperatorNamespace: operatorNamespace,
+		RestConfig:        mgr.GetConfig(),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IpRange")
 		os.Exit(1)

cmd/main.go

@@ -21,7 +21,7 @@ spec:
       name: IpRange
       type: string
     - jsonPath: .status.conditions[?(@.type=="IPAssigned")].status
-      name: IpAssigned
+      name: IpRangeAssigned
       type: string
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
@@ -70,6 +70,11 @@ spec:
                   rule: self == oldSelf
               preserveInNetbox:
                 type: boolean
+              size:
+                type: integer
+                x-kubernetes-validations:
+                - message: Field 'size' is immutable
+                  rule: self == oldSelf
               tenant:
                 type: string
                 x-kubernetes-validations:
@@ -150,12 +155,10 @@ spec:
                   - type
                   type: object
                 type: array
-              ipAddress:
-                type: string
-              ipAddressDotDecimal:
-                type: string
               ipAddressName:
                 type: string
+              ipRange:
+                type: string
             type: object
         type: object
     served: true

config/crd/bases/netbox.dev_iprangeclaims.yaml

@@ -17,8 +17,11 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.ipRange
-      name: IpRange
+    - jsonPath: .spec.startAddress
+      name: StartAddress
+      type: string
+    - jsonPath: .spec.endAddress
+      name: EndAddress
       type: string
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
@@ -65,21 +68,28 @@ spec:
                 type: object
               description:
                 type: string
-              ipRange:
+              endAddress:
                 format: cidr
                 type: string
                 x-kubernetes-validations:
-                - message: Field 'ipRange' is immutable
+                - message: Field 'endAddress' is immutable
                   rule: self == oldSelf
               preserveInNetbox:
                 type: boolean
+              startAddress:
+                format: cidr
+                type: string
+                x-kubernetes-validations:
+                - message: Field 'startAddress' is immutable
+                  rule: self == oldSelf
               tenant:
                 type: string
                 x-kubernetes-validations:
                 - message: Field 'tenant' is immutable
                   rule: self == oldSelf
             required:
-            - ipRange
+            - endAddress
+            - startAddress
             type: object
           status:
             description: IpRangeStatus defines the observed state of IpRange

config/crd/bases/netbox.dev_ipranges.yaml

@@ -4,6 +4,6 @@ resources:
 - netbox_v1_ipaddressclaim.yaml
 - netbox_v1_prefix.yaml
 - netbox_v1_prefixclaim.yaml
-- _v1_iprangeclaim.yaml
-- _v1_iprange.yaml
+- netbox_v1_iprangeclaim.yaml
+- netbox_v1_iprange.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples

config/samples/_v1_iprange.yaml

@@ -0,0 +1,14 @@
+apiVersion: netbox.dev/v1
+kind: IpRange
+metadata:
+  labels:
+    app.kubernetes.io/name: netbox-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: iprange-sample
+spec:
+  tenant: "Dunder-Mifflin, Inc."
+  description: "some description"
+  comments: "your comments"
+  preserveInNetbox: true
+  startAddress: "2.0.0.200/32"
+  endAddress: "2.0.0.202/32"

config/samples/kustomization.yaml

@@ -6,4 +6,9 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
   name: iprangeclaim-sample
 spec:
-  # TODO(user): Add fields here
+  tenant: "Dunder-Mifflin, Inc."
+  description: "some description"
+  comments: "your comments"
+  preserveInNetbox: true
+  parentPrefix: "2.0.0.0/16"
+  size: 3