Skip to content

Commit df419e5

Browse files
Update to Kubernetes v1.33.2 and cluster-api v1.11
* Use Go v1.24.4 * Rename "sigs.k8s.io/cluster-api/api/v1beta1" to "sigs.k8s.io/cluster-api/api/core/v1beta1" * Use "sigs.k8s.io/cluster-api/api/core/v1beta1" instead of "sigs.k8s.io/cluster-api/exp/api/v1beta1" for MachinePool * Use "sigs.k8s.io/cluster-api/api/ipam/v1beta1" instead of "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1" * Use "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1" instead of "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" * Rename "sigs.k8s.io/cluster-api/api/v1beta1" to "sigs.k8s.io/cluster-api/api/core/v1beta1" * Rename "sigs.k8s.io/cluster-api/hack/tools/release" to "sigs.k8s.io/cluster-api/hack/tools/release/notes" * make generate * Add one API rule violation
1 parent 57ae27e commit df419e5

File tree

51 files changed

+659
-466
lines changed

Some content is hidden

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

51 files changed

+659
-466
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: 1 addition & 1 deletion
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: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api_violations.report

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,4 @@ API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealt
9191
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
9292
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2
9393
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineTemplateSpec,ObjectMeta
94+
API rule violation: streaming_list_type_json_tags,sigs.k8s.io/cluster-api/api/v1beta1,MachineDrainRuleList,ListMeta

cmd/models-schema/zz_generated.openapi.go

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

0 commit comments

Comments
 (0)