Merge branch 'main' into cilium-tests

.github/workflows/build-dev.yaml

@@ -21,8 +21,11 @@ jobs:
         with:
           go-version: "^1.21"
 
-      - name: Test build
-        run: make manifests generate fmt vet build
+      - name: Verify that generated manifests committed to the repository are up to date
+        run: make verify-manifests
+
+      - name: Build
+        run: make generate fmt vet build
 
       - name: Run unit tests
         run: make unit-test

Makefile

@@ -596,6 +596,18 @@ lint: $(GOLANGCI_LINT) ## Lint the codebase
 lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
 	GOLANGCI_LINT_EXTRA_ARGS="$(GOLANGCI_LINT_EXTRA_ARGS) --fix" $(MAKE) lint
 
+# Make any new verify task a dependency of this target
+.PHONY: verify ## Run all verify targets
+verify: verify-manifests
+
+# Adapted from https://github.com/kubernetes-sigs/cluster-api/blob/f15e8769a2135429911ce6d8f7124b853c0444a1/Makefile#L651-L656
+.PHONY: verify-manifests
+verify-manifests: manifests  ## Verify generated manifests are up to date
+	@if !(git diff --quiet HEAD); then \
+		git diff; \
+		echo "generated manifests are out of date in the repository, run make manifests, and commit"; exit 1; \
+	fi
+
 ## --------------------------------------
 ## Clean
 ## --------------------------------------

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachines.yaml

@@ -32,10 +32,6 @@ spec:
       jsonPath: .spec.providerID
       name: ProviderID
       type: string
-    - description: Corresponding workload cluster node
-      jsonPath: .status.nodeRef.name
-      name: NodeRef
-      type: string
     name: v1alpha4
     schema:
       openAPIV3Schema:
@@ -309,8 +305,9 @@ spec:
                 description: Will be set in case of failure of Machine instance
                 type: string
               nodeRef:
-                description: NodeRef is a reference to the corresponding workload
-                  cluster Node if it exists.
+                description: 'NodeRef is a reference to the corresponding workload
+                  cluster Node if it exists. Deprecated: Do not use. Will be removed
+                  in a future release.'
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -370,10 +367,6 @@ spec:
       jsonPath: .spec.providerID
       name: ProviderID
       type: string
-    - description: Corresponding workload cluster node
-      jsonPath: .status.nodeRef.name
-      name: NodeRef
-      type: string
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -669,8 +662,9 @@ spec:
                 description: Will be set in case of failure of Machine instance
                 type: string
               nodeRef:
-                description: NodeRef is a reference to the corresponding workload
-                  cluster Node if it exists.
+                description: 'NodeRef is a reference to the corresponding workload
+                  cluster Node if it exists. Deprecated: Do not use. Will be removed
+                  in a future release.'
                 properties:
                   apiVersion:
                     description: API version of the referent.