Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Bump sigs.k8s.io/cluster-api to [email protected] #3206

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

🌱 Bump sigs.k8s.io/cluster-api to [email protected] #3206

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b6ab576
Bump sigs.k8s.io/cluster-api to [email protected]…
chrischdi Sep 26, 2024
5c3232a
controllers: fixes
chrischdi Sep 26, 2024
62fe3b7
Bump CAPI mainfest to main
chrischdi Sep 26, 2024
bae422c
ignore errors.MachineStatusError deprecation
chrischdi Sep 26, 2024
b7bbee0
fixup test data
chrischdi Sep 26, 2024
26b1081
Bump controller-gen
chrischdi Sep 26, 2024
6fa4cdb
add missing v1.9 metadata
chrischdi Sep 26, 2024
4a0d945
fix old conditions api
chrischdi Sep 27, 2024
5fee712
Sync Makefile
chrischdi Sep 27, 2024
6deedb3
Pin capi version manifests to dated nightly
chrischdi Sep 27, 2024
55dbf04
Bump CAPI to match image
chrischdi Sep 27, 2024
ee42f37
fix unit tests
chrischdi Sep 27, 2024
cd8a8e8
Predicate related changes
chrischdi Sep 27, 2024
13faa54
vsphere: bump manifests again
chrischdi Sep 27, 2024
7f40c79
bump go again
chrischdi Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ issues:
- linters:
- staticcheck
text: "SA1019: .*PreferredAPIServerCIDR is deprecated"
# Deprecations for FailureReason
- linters:
- staticcheck
text: "SA1019: \"sigs.k8s.io/cluster-api/errors\" is deprecated:"
# Deprecations for old api groups
- linters:
- staticcheck
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ SETUP_ENVTEST_BIN := setup-envtest
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest

CONTROLLER_GEN_VER := v0.15.0
CONTROLLER_GEN_VER := v0.16.1
CONTROLLER_GEN_BIN := controller-gen
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
Expand All @@ -123,7 +123,7 @@ GOTESTSUM_BIN := gotestsum
GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER))
GOTESTSUM_PKG := gotest.tools/gotestsum

CONVERSION_GEN_VER := v0.30.0
CONVERSION_GEN_VER := v0.31.0
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
CONVERSION_GEN_BIN := conversion-gen
# We are intentionally using the binary without version suffix, to avoid the version
# in generated files.
Expand Down
8 changes: 4 additions & 4 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vsphereclusteridentities.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand All @@ -23,7 +23,6 @@ spec:
description: |-
VSphereClusterIdentity defines the account to be used for reconciling clusters


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -147,6 +146,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
- status
- type
type: object
Expand All @@ -166,7 +166,6 @@ spec:
description: |-
VSphereClusterIdentity defines the account to be used for reconciling clusters


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -290,6 +289,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
Expand Down Expand Up @@ -414,7 +414,7 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Expand Down
12 changes: 4 additions & 8 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vsphereclusters.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down Expand Up @@ -41,7 +41,6 @@ spec:
description: |-
VSphereCluster is the Schema for the vsphereclusters API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand All @@ -68,7 +67,6 @@ spec:
description: |-
CloudProviderConfiguration holds the cluster-wide configuration for the vSphere cloud provider.


Deprecated: will be removed in v1alpha4.
properties:
disk:
Expand Down Expand Up @@ -307,7 +305,6 @@ spec:
Insecure is a flag that controls whether to validate the
vSphere server's certificate.


Deprecated: will be removed in v1alpha4.
type: boolean
loadBalancerRef:
Expand All @@ -318,7 +315,6 @@ spec:
will not be true until the referenced resource is Status.Ready and has a
non-empty Status.Address value.


Deprecated: will be removed in v1alpha4.
properties:
apiVersion:
Expand All @@ -333,7 +329,6 @@ spec:
the event) or if no container name is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to have some well-defined way of
referencing a part of an object.
TODO: this design is not final and this field is subject to change in the future.
type: string
kind:
description: |-
Expand Down Expand Up @@ -414,6 +409,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
Expand Down Expand Up @@ -471,7 +467,6 @@ spec:
description: |-
VSphereCluster is the Schema for the vsphereclusters API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -580,6 +575,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
Expand Down Expand Up @@ -804,7 +800,7 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Expand Down
3 changes: 1 addition & 2 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vsphereclustertemplates.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand All @@ -23,7 +23,6 @@ spec:
description: |-
VSphereClusterTemplate is the Schema for the vsphereclustertemplates API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down
8 changes: 4 additions & 4 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vspheredeploymentzones.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand All @@ -23,7 +23,6 @@ spec:
description: |-
VSphereDeploymentZone is the Schema for the vspheredeploymentzones API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -118,6 +117,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
Expand All @@ -140,7 +140,6 @@ spec:
description: |-
VSphereDeploymentZone is the Schema for the vspheredeploymentzones API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -235,6 +234,7 @@ spec:
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
Expand Down Expand Up @@ -331,7 +331,7 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Expand Down
6 changes: 1 addition & 5 deletions config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vspherefailuredomains.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand All @@ -23,7 +23,6 @@ spec:
description: |-
VSphereFailureDomain is the Schema for the vspherefailuredomains API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -155,7 +154,6 @@ spec:
description: |-
VSphereFailureDomain is the Schema for the vspherefailuredomains API


Deprecated: This type will be removed in one of the next releases.
properties:
apiVersion:
Expand Down Expand Up @@ -313,7 +311,6 @@ spec:
description: |-
AutoConfigure tags the Type which is specified in the Topology


Deprecated: This field is going to be removed in a future release.
type: boolean
name:
Expand Down Expand Up @@ -381,7 +378,6 @@ spec:
description: |-
AutoConfigure tags the Type which is specified in the Topology


Deprecated: This field is going to be removed in a future release.
type: boolean
name:
Expand Down
Loading
Loading