Merge pull request #2640 from Nordix/lentzi90/capi-1.11

🌱 Update to Kubernetes v1.33 and cluster-api v1.11 (continued)

Author: k8s-ci-robot

.golangci.yml

@@ -62,73 +62,77 @@ linters-settings:
     - prefix(sigs.k8s.io/cluster-api-provider-openstack)
   gocritic:
     enabled-tags:
-      - diagnostic
-      - experimental
-      - performance
+    - diagnostic
+    - experimental
+    - performance
     disabled-checks:
-      - appendAssign
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - evalOrder
-      - ifElseChain
-      - octalLiteral
-      - regexpSimplify
-      - sloppyReassign
-      - truncateCmp
-      - typeDefFirst
-      - unnamedResult
-      - unnecessaryDefer
-      - whyNoLint
-      - wrapperFunc
-      - rangeValCopy
-      - hugeParam
+    - appendAssign
+    - dupImport # https://github.com/go-critic/go-critic/issues/845
+    - evalOrder
+    - ifElseChain
+    - octalLiteral
+    - regexpSimplify
+    - sloppyReassign
+    - truncateCmp
+    - typeDefFirst
+    - unnamedResult
+    - unnecessaryDefer
+    - whyNoLint
+    - wrapperFunc
+    - rangeValCopy
+    - hugeParam
   importas:
     no-unaliased: true
     alias:
-      # Kubernetes
-      - pkg: k8s.io/api/core/v1
-        alias: corev1
-      - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
-        alias: apiextensionsv1
-      - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
-        alias: metav1
-      - pkg: k8s.io/apimachinery/pkg/api/errors
-        alias: apierrors
-      - pkg: k8s.io/apimachinery/pkg/util/errors
-        alias: kerrors
-      # Controller Runtime
-      - pkg: sigs.k8s.io/controller-runtime
-        alias: ctrl
-      # CAPO
-      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1
-        alias: infrav1alpha1
-      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
-        alias: infrav1
-      - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
-        alias: capoerrors
-      # CAPI
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
-        alias: clusterv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
-        alias: clusterv1alpha4
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
-        alias: clusterv1
-      # CABPK
-      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3
-        alias: bootstrapv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4
-        alias: bootstrapv1alpha4
-      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
-        alias: bootstrapv1
-      # KCP
-      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha3
-        alias: controlplanev1alpha3
-      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4
-        alias: controlplanev1alpha4
-      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
-        alias: controlplanev1
-      # ORC
-      - pkg: github.com/k-orc/openstack-resource-controller/api/v1alpha1
-        alias: orcv1alpha1
+    # Kubernetes
+    - pkg: k8s.io/api/core/v1
+      alias: corev1
+    - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+      alias: apiextensionsv1
+    - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+      alias: metav1
+    - pkg: k8s.io/apimachinery/pkg/api/errors
+      alias: apierrors
+    - pkg: k8s.io/apimachinery/pkg/util/errors
+      alias: kerrors
+    # Controller Runtime
+    - pkg: sigs.k8s.io/controller-runtime
+      alias: ctrl
+    # CAPO
+    - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1
+      alias: infrav1alpha1
+    - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
+      alias: infrav1
+    - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
+      alias: capoerrors
+    # CAPI
+    - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
+      alias: clusterv1alpha3
+    - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
+      alias: clusterv1alpha4
+    - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      alias: clusterv1b1
+    - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
+      alias: clusterv1
+    - pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta2
+      alias: ipamv1
+    # CABPK
+    - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3
+      alias: bootstrapv1alpha3
+    - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4
+      alias: bootstrapv1alpha4
+    - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
+      alias: bootstrapv1
+    # KCP
+    - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha3
+      alias: controlplanev1alpha3
+    - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4
+      alias: controlplanev1alpha4
+    - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
+      alias: controlplanev1
+    # ORC
+    - pkg: github.com/k-orc/openstack-resource-controller/api/v1alpha1
+      alias: orcv1alpha1
 
   nolintlint:
     # https://github.com/golangci/golangci-lint/issues/3228
@@ -174,11 +178,17 @@ issues:
     - stylecheck
     text: "ST1003: should not use underscores in Go names;"
     path: pkg/utils/conversioncommon/.*.go
+  - linters:
+    - staticcheck
+    text: 'SA1019: "sigs.k8s.io/cluster-api/api/core/v1beta1" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.'
+  - linters:
+    - staticcheck
+    text: 'SA1019: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details.'
   exclude-files:
   - "zz_generated.*\\.go$"
 
 run:
-  go: "1.23"
+  go: "1.24"
   timeout: 10m
   build-tags:
   - e2e

Makefile

@@ -27,7 +27,7 @@ unexport GOPATH
 TRACE ?= 0
 
 # Go
-GO_VERSION ?= 1.23.10
+GO_VERSION ?= 1.24.4
 
 # Directories.
 ARTIFACTS ?= $(REPO_ROOT)/_artifacts

api/v1alpha1/openstackfloatingippool_types.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )

api/v1alpha1/openstackserver_types.go

@@ -19,7 +19,9 @@ package v1alpha1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
@@ -199,6 +201,16 @@ func (r *OpenStackServer) GetIdentityRef() (*string, *infrav1.OpenStackIdentityR
 	return &r.Namespace, &r.Spec.IdentityRef
 }
 
+func (r *OpenStackServer) ToUnstructured() (*unstructured.Unstructured, error) {
+	rawMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(r)
+	if err != nil {
+		return nil, err
+	}
+	u := &unstructured.Unstructured{Object: rawMap}
+	u.SetGroupVersionKind(infrav1.SchemeGroupVersion.WithKind("OpenStackServer"))
+	return u, nil
+}
+
 func init() {
 	SchemeBuilder.Register(&OpenStackServer{}, &OpenStackServerList{})
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 const (
 	// InstanceReadyCondition reports on current status of the OpenStack instance. Ready indicates the instance is in a Running state.

api/v1beta1/conditions_consts.go

@@ -18,7 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"

api/v1beta1/openstackcluster_types.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"

api/v1beta1/openstackmachine_types.go

@@ -23,25 +23,31 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Subnet,Tags
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,AllocationPools
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,DNSNameservers
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassPatch,Definitions
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Patches
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Variables
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,Variables
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatusVariable,Definitions
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AllOf
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AnyOf
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Enum
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,OneOf
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Required
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckClass,UnhealthyConditions
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,Targets
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolClass,FailureDomains
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolTopology,FailureDomains
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,NetworkRanges,CIDRBlocks
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchDefinition,JSONPatches
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachineDeploymentClass,Names
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachinePoolClass,Names
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassPatch,Definitions
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Patches
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Variables
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatus,Variables
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatusVariable,Definitions
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,AllOf
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,AnyOf
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,Enum
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,OneOf
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,Required
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckClass,UnhealthyConditions
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckStatus,Targets
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolClass,FailureDomains
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolSpec,FailureDomains
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolSpec,ProviderIDList
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolStatus,NodeRefs
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolTopology,FailureDomains
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,NetworkRanges,CIDRBlocks
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchDefinition,JSONPatches
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchSelectorMatchMachineDeploymentClass,Names
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchSelectorMatchMachinePoolClass,Names
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,AllOf
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,AnyOf
+API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,OneOf
 API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
 API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
 API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port
@@ -80,14 +86,29 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
 API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XIntOrString
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XMetadata
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XPreserveUnknownFields
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XValidations
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeploymentStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2
-API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineTemplateSpec,ObjectMeta
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XIntOrString
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XMetadata
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XPreserveUnknownFields
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XValidations
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineDeploymentStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineSetStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineStatus,V1Beta2
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineTemplateSpec,ObjectMeta
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,ClusterClassDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,ClusterDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,XIntOrString
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,XMetadata
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,XPreserveUnknownFields
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,JSONSchemaProps,XValidations
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineDeploymentDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineHealthCheckDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachinePoolDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineSetDeprecatedStatus,V1Beta1
+API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineTemplateSpec,ObjectMeta
+API rule violation: streaming_list_type_json_tags,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineDrainRuleList,ListMeta
+API rule violation: streaming_list_type_json_tags,sigs.k8s.io/cluster-api/api/core/v1beta2,MachineDrainRuleList,ListMeta