Add IPPoolImport

.github/workflows/ci.yaml

@@ -69,7 +69,7 @@ jobs:
       - name: Run tests and generate coverage report
         run: make build/cover.out
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: code-coverage
           path: build/cover.out

.typos.toml

@@ -3,8 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [default.extend-words]
+Adress = "Adress"
+HPE = "HPE"
+Reponse = "Reponse"
+nd = "nd"
 
 [files]
 extend-exclude = [
   "go.mod",
+  "hack/**",
 ]

Makefile

@@ -303,6 +303,7 @@ mv "$(1)" "$(1)-$(3)" ;\
 } ;\
 ln -sf "$(1)-$(3)" "$(1)"
 endef
+
 install-goimports: FORCE
 	@if ! hash goimports 2>/dev/null; then printf "\e[1;36m>> Installing goimports (this may take a while)...\e[0m\n"; go install golang.org/x/tools/cmd/goimports@latest; fi
 

Makefile.maker.yaml

@@ -63,6 +63,16 @@ reuse:
       SPDX-FileCopyrightText: SAP SE
       SPDX-License-Identifier: Apache-2.0
 
+typos:
+  enabled: true
+  extendExcludes:
+    - hack/**
+  extendWords:
+    nd: nd
+    HPE: HPE
+    Reponse: Reponse # typo in the module
+    Adress: Adress # typo in the module
+
 verbatim: |
   tilt: FORCE helm-build-local-image
     tilt up --stream -- --BININFO_VERSION $(BININFO_VERSION) --BININFO_COMMIT_HASH $(BININFO_COMMIT_HASH) --BININFO_BUILD_DATE $(BININFO_BUILD_DATE)
@@ -333,4 +343,4 @@ verbatim: |
   mv "$(1)" "$(1)-$(3)" ;\
   } ;\
   ln -sf "$(1)-$(3)" "$(1)"
-  endef
+  endef

PROJECT

@@ -19,4 +19,13 @@ resources:
   kind: Update
   path: https:/github.com/sapcc/argora/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: cloud.sap
+  group: argora
+  kind: IPPoolImport
+  path: https:/github.com/sapcc/argora/api/v1alpha1
+  version: v1alpha1
 version: "3"

README.md

@@ -33,6 +33,8 @@ credentials:
 
 crd:
   enable: true
+
+netboxURL: <netbox-url>
 ```
 
 **Run on dev cluster**

api/v1alpha1/common.go

@@ -11,3 +11,14 @@ type ClusterSelector struct {
 	// +kubebuilder:validation:Optional
 	Type string `json:"type,omitempty"`
 }
+
+type IPPoolSelector struct {
+	// +kubebuilder:validation:Optional
+	NamePrefix string `json:"namePrefix,omitempty"`
+	// +kubebuilder:validation:Optional
+	Region string `json:"region,omitempty"`
+	// +kubebuilder:validation:Optional
+	Role string `json:"role,omitempty"`
+	// +kubebuilder:validation:Optional
+	ExcludeMask *int `json:"excludeMask,omitempty"`
+}

api/v1alpha1/conditions.go

@@ -24,6 +24,11 @@ const (
 	ConditionReasonClusterImportSucceededMessage                 = "ClusterImport succeeded"
 	ConditionReasonClusterImportFailed           ConditionReason = "ClusterImportFailed"
 	ConditionReasonClusterImportFailedMessage                    = "ClusterImport failed"
+
+	ConditionReasonIPPoolImportSucceeded        ConditionReason = "IPPoolImportSucceeded"
+	ConditionReasonIPPoolImportSucceededMessage                 = "IPPoolImport succeeded"
+	ConditionReasonIPPoolImportFailed           ConditionReason = "IPPoolImportFailed"
+	ConditionReasonIPPoolImportFailedMessage                    = "IPPoolImport failed"
 )
 
 var conditionReasons = map[ConditionReason]conditionMeta{
@@ -32,6 +37,9 @@ var conditionReasons = map[ConditionReason]conditionMeta{
 
 	ConditionReasonClusterImportSucceeded: {Type: ConditionTypeReady, Status: metav1.ConditionTrue, Message: ConditionReasonClusterImportSucceededMessage},
 	ConditionReasonClusterImportFailed:    {Type: ConditionTypeReady, Status: metav1.ConditionFalse, Message: ConditionReasonClusterImportFailedMessage},
+
+	ConditionReasonIPPoolImportSucceeded: {Type: ConditionTypeReady, Status: metav1.ConditionTrue, Message: ConditionReasonIPPoolImportSucceededMessage},
+	ConditionReasonIPPoolImportFailed:    {Type: ConditionTypeReady, Status: metav1.ConditionFalse, Message: ConditionReasonIPPoolImportFailedMessage},
 }
 
 type ReasonWithMessage struct {

api/v1alpha1/ippoolimport_types.go

@@ -0,0 +1,48 @@
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// IPPoolImportSpec defines the desired state of IPPoolImport
+type IPPoolImportSpec struct {
+	IPPools []*IPPoolSelector `json:"ippools,omitempty"`
+}
+
+// IPPoolImportStatus defines the observed state of IPPoolImport.
+type IPPoolImportStatus struct {
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Enum=Ready;Error
+	State       State               `json:"state"`
+	Conditions  *[]metav1.Condition `json:"conditions,omitempty"`
+	Description string              `json:"description,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:JSONPath=".status.state",name="State",type="string"
+
+// IPPoolImport is the Schema for the ippoolimports API
+type IPPoolImport struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   IPPoolImportSpec   `json:"spec,omitempty"`
+	Status IPPoolImportStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// IPPoolImportList contains a list of IPPoolImport
+type IPPoolImportList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitzero"`
+	Items           []IPPoolImport `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&IPPoolImport{}, &IPPoolImportList{})
+}

cmd/manager/main.go

@@ -11,6 +11,8 @@ import (
 	"os"
 	"time"
 
+	ipamv1alpha2 "sigs.k8s.io/cluster-api-ipam-provider-in-cluster/api/v1alpha2"
+
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 
@@ -82,6 +84,7 @@ func init() {
 
 	utilruntime.Must(corev1.AddToScheme(scheme))
 	utilruntime.Must(clusterv1.AddToScheme(scheme))
+	utilruntime.Must(ipamv1alpha2.AddToScheme(scheme))
 	utilruntime.Must(metal3v1alpha1.AddToScheme(scheme))
 	utilruntime.Must(ironcorev1alpha1.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme
@@ -187,6 +190,10 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "update")
 		os.Exit(1)
 	}
+	if err = controller.NewIPPoolImportReconciler(mgr, creds, status.NewIPPoolImportStatusHandler(mgr.GetClient()), netbox.NewNetbox(flagVar.netboxURL), flagVar.reconcileInterval).SetupWithManager(mgr, rateLimiter); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "IPPoolImport")
+		os.Exit(1)
+	}
 	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {