Merge branch 'main' into feat/reservations

.github/workflows/lint.yml

@@ -17,4 +17,4 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.61
+        version: v1.62

Makefile

@@ -12,7 +12,7 @@ BUCKETBROKER_IMG ?= bucketbroker:latest
 IRICTL_BUCKET_IMG ?= irictl-bucket:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.30.3
+ENVTEST_K8S_VERSION = 1.31
 
 # Docker image name for the mkdocs based local development setup
 IMAGE=ironcore/documentation
@@ -145,7 +145,7 @@ clean-docs: ## Remove all local mkdocs Docker images (cleanup).
 	docker container prune --force --filter "label=project=ironcore_documentation"
 
 .PHONY: test
-test: manifests generate fmt vet test-only ## Run tests.
+test: generate manifests fmt vet test-only ## Run tests.
 
 .PHONY: test-only
 test-only: envtest ## Run *only* the tests - no generation, linting etc.
@@ -360,13 +360,14 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.1.1
 VGOPATH_VERSION ?= v0.1.3
-CONTROLLER_TOOLS_VERSION ?= v0.15.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.0
 GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
 ADDLICENSE_VERSION ?= v1.1.1
 PROTOC_GEN_GOGO_VERSION ?= v1.3.2
 GOIMPORTS_VERSION ?= v0.26.0
-GOLANGCI_LINT_VERSION ?= v1.61.0
-OPENAPI_EXTRACTOR_VERSION ?= v0.1.4
+GOLANGCI_LINT_VERSION ?= v1.62.2
+OPENAPI_EXTRACTOR_VERSION ?= v0.1.9
+SETUP_ENVTEST_VERSION ?= release-0.19
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -404,7 +405,7 @@ $(VGOPATH): $(LOCALBIN)
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
-	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)
 
 .PHONY: openapi-extractor
 openapi-extractor: $(OPENAPI_EXTRACTOR) ## Download openapi-extractor locally if necessary.

api/compute/v1alpha1/machine_types.go

@@ -128,10 +128,6 @@ type NetworkInterfaceStatus struct {
 	Name string `json:"name"`
 	// Handle is the MachinePool internal handle of the NetworkInterface.
 	Handle string `json:"handle,omitempty"`
-	// IPs are the ips allocated for the network interface.
-	IPs []commonv1alpha1.IP `json:"ips,omitempty"`
-	// VirtualIP is the virtual ip allocated for the network interface.
-	VirtualIP *commonv1alpha1.IP `json:"virtualIP,omitempty"`
 	// State represents the attachment state of a NetworkInterface.
 	State NetworkInterfaceState `json:"state,omitempty"`
 	// networkInterfaceRef is the reference to the networkinterface attached to the machine

broker/machinebroker/networks/networks.go

@@ -27,7 +27,7 @@ type Manager struct {
 
 	cluster cluster.Cluster
 
-	queue workqueue.RateLimitingInterface
+	queue workqueue.TypedRateLimitingInterface[string]
 
 	waitersByProviderIDMu sync.Mutex
 	waitersByProviderID   map[string]*waiter
@@ -36,7 +36,7 @@ type Manager struct {
 func NewManager(cluster cluster.Cluster) *Manager {
 	return &Manager{
 		cluster:             cluster,
-		queue:               workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue:               workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[string]()),
 		waitersByProviderID: make(map[string]*waiter),
 	}
 }
@@ -144,13 +144,12 @@ func (e *Manager) doWork(ctx context.Context, providerID string) (*networkingv1a
 }
 
 func (e *Manager) processNextWorkItem(ctx context.Context) bool {
-	uncastProviderID, quit := e.queue.Get()
+	providerID, quit := e.queue.Get()
 	if quit {
 		return false
 	}
-	defer e.queue.Done(uncastProviderID)
+	defer e.queue.Done(providerID)
 
-	providerID := uncastProviderID.(string)
 	network, err := e.doWork(ctx, providerID)
 	e.emit(providerID, network, err)
 	e.queue.Forget(providerID)