Skip to content

Commit be031f2

Browse files
pierreprinettipierreprinetti
committed
Update to Kubernetes v1.33.2 and cluster-api v1.11
* Use Go v1.24.4 * Replace import path "sigs.k8s.io/cluster-api/api/v1beta1" with "sigs.k8s.io/cluster-api/api/core/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1" with "sigs.k8s.io/cluster-api/api/ipam/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" with "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/hack/tools/release" with "sigs.k8s.io/cluster-api/hack/tools/release/notes" * Replace import path "sigs.k8s.io/cluster-api/utils/patch" with "sigs.k8s.io/cluster-api/utils/deprecated/v1beta1/patch" * Use util packages from cluster-api/util/deprecated/v1beta1 where necessary * make generate * Update API rule violations
1 parent 57ae27e commit be031f2

File tree

55 files changed

+1487
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1487
-940
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ unexport GOPATH
2727
TRACE ?= 0
2828

2929
# Go
30-
GO_VERSION ?= 1.23.10
30+
GO_VERSION ?= 1.24.4
3131

3232
# Directories.
3333
ARTIFACTS ?= $(REPO_ROOT)/_artifacts

‎api/v1alpha1/openstackfloatingippool_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121

2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
23+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2424

2525
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
2626
)

‎api/v1alpha1/openstackserver_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1alpha1
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323

2424
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
2525
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta1/conditions_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1beta1
1818

19-
import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
19+
import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2020

2121
const (
2222
// InstanceReadyCondition reports on current status of the OpenStack instance. Ready indicates the instance is in a Running state.

‎api/v1beta1/openstackcluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v1beta1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
21+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2222

2323
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2424
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"

‎api/v1beta1/openstackmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/ptr"
23-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
23+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2424

2525
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2626
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"

‎api/v1beta1/zz_generated.deepcopy.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api_violations.report

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,28 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack
2323
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Subnet,Tags
2424
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,AllocationPools
2525
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,DNSNameservers
26-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassPatch,Definitions
27-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Patches
28-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Variables
29-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,Variables
30-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatusVariable,Definitions
31-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AllOf
32-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AnyOf
33-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Enum
34-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,OneOf
35-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Required
36-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckClass,UnhealthyConditions
37-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
38-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,Targets
39-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolClass,FailureDomains
40-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachinePoolTopology,FailureDomains
41-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,NetworkRanges,CIDRBlocks
42-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchDefinition,JSONPatches
43-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachineDeploymentClass,Names
44-
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,PatchSelectorMatchMachinePoolClass,Names
26+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassPatch,Definitions
27+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Patches
28+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Variables
29+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatus,Variables
30+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatusVariable,Definitions
31+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,AllOf
32+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,AnyOf
33+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,Enum
34+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,OneOf
35+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,Required
36+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckClass,UnhealthyConditions
37+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
38+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckStatus,Targets
39+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolClass,FailureDomains
40+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolSpec,FailureDomains
41+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolSpec,ProviderIDList
42+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolStatus,NodeRefs
43+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolTopology,FailureDomains
44+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,NetworkRanges,CIDRBlocks
45+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchDefinition,JSONPatches
46+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchSelectorMatchMachineDeploymentClass,Names
47+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,PatchSelectorMatchMachinePoolClass,Names
4548
API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
4649
API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
4750
API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port
@@ -80,14 +83,16 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
8083
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
8184
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
8285
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
83-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,V1Beta2
84-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterStatus,V1Beta2
85-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XIntOrString
86-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XMetadata
87-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XPreserveUnknownFields
88-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XValidations
89-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeploymentStatus,V1Beta2
90-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,V1Beta2
91-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
92-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2
93-
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineTemplateSpec,ObjectMeta
86+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatus,V1Beta2
87+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterStatus,V1Beta2
88+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XIntOrString
89+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XMetadata
90+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XPreserveUnknownFields
91+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XValidations
92+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineDeploymentStatus,V1Beta2
93+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineHealthCheckStatus,V1Beta2
94+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachinePoolStatus,V1Beta2
95+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineSetStatus,V1Beta2
96+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineStatus,V1Beta2
97+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineTemplateSpec,ObjectMeta
98+
API rule violation: streaming_list_type_json_tags,sigs.k8s.io/cluster-api/api/core/v1beta1,MachineDrainRuleList,ListMeta

0 commit comments

Comments
 (0)