Skip to content

Commit a4af15e

Browse files
authored
chore: cluster api v1.10.6 (#93)
1 parent 4c42b1a commit a4af15e

File tree

7 files changed

+160
-120
lines changed

7 files changed

+160
-120
lines changed

capi-lab/mini-lab

Submodule mini-lab updated 96 files

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,32 @@ spec:
119119
properties:
120120
lastTransitionTime:
121121
description: |-
122-
Last time the condition transitioned from one status to another.
122+
lastTransitionTime is the last time the condition transitioned from one status to another.
123123
This should be when the underlying condition changed. If that is not known, then using the time when
124124
the API field changed is acceptable.
125125
format: date-time
126126
type: string
127127
message:
128128
description: |-
129-
A human readable message indicating details about the transition.
129+
message is a human readable message indicating details about the transition.
130130
This field may be empty.
131+
maxLength: 10240
132+
minLength: 1
131133
type: string
132134
reason:
133135
description: |-
134-
The reason for the condition's last transition in CamelCase.
136+
reason is the reason for the condition's last transition in CamelCase.
135137
The specific API may choose whether or not this field is considered a guaranteed API.
136138
This field may be empty.
139+
maxLength: 256
140+
minLength: 1
137141
type: string
138142
severity:
139143
description: |-
140144
severity provides an explicit classification of Reason code, so the users or machines can immediately
141145
understand the current situation and act accordingly.
142146
The Severity field MUST be set only when Status=False.
147+
maxLength: 32
143148
type: string
144149
status:
145150
description: status of the condition, one of True, False, Unknown.
@@ -149,6 +154,8 @@ spec:
149154
type of condition in CamelCase or in foo.example.com/CamelCase.
150155
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
151156
can be useful (see .node.status.conditions), the ability to deconflict is important.
157+
maxLength: 256
158+
minLength: 1
152159
type: string
153160
required:
154161
- lastTransitionTime

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,19 @@ spec:
9292
address.
9393
properties:
9494
address:
95-
description: The machine address.
95+
description: address is the machine address.
96+
maxLength: 256
97+
minLength: 1
9698
type: string
9799
type:
98-
description: Machine address type, one of Hostname, ExternalIP,
99-
InternalIP, ExternalDNS or InternalDNS.
100+
description: type is the machine address type, one of Hostname,
101+
ExternalIP, InternalIP, ExternalDNS or InternalDNS.
102+
enum:
103+
- Hostname
104+
- ExternalIP
105+
- InternalIP
106+
- ExternalDNS
107+
- InternalDNS
100108
type: string
101109
required:
102110
- address
@@ -111,27 +119,32 @@ spec:
111119
properties:
112120
lastTransitionTime:
113121
description: |-
114-
Last time the condition transitioned from one status to another.
122+
lastTransitionTime is the last time the condition transitioned from one status to another.
115123
This should be when the underlying condition changed. If that is not known, then using the time when
116124
the API field changed is acceptable.
117125
format: date-time
118126
type: string
119127
message:
120128
description: |-
121-
A human readable message indicating details about the transition.
129+
message is a human readable message indicating details about the transition.
122130
This field may be empty.
131+
maxLength: 10240
132+
minLength: 1
123133
type: string
124134
reason:
125135
description: |-
126-
The reason for the condition's last transition in CamelCase.
136+
reason is the reason for the condition's last transition in CamelCase.
127137
The specific API may choose whether or not this field is considered a guaranteed API.
128138
This field may be empty.
139+
maxLength: 256
140+
minLength: 1
129141
type: string
130142
severity:
131143
description: |-
132144
severity provides an explicit classification of Reason code, so the users or machines can immediately
133145
understand the current situation and act accordingly.
134146
The Severity field MUST be set only when Status=False.
147+
maxLength: 32
135148
type: string
136149
status:
137150
description: status of the condition, one of True, False, Unknown.
@@ -141,6 +154,8 @@ spec:
141154
type of condition in CamelCase or in foo.example.com/CamelCase.
142155
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
143156
can be useful (see .node.status.conditions), the ability to deconflict is important.
157+
maxLength: 256
158+
minLength: 1
144159
type: string
145160
required:
146161
- lastTransitionTime

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,19 @@ spec:
105105
node's address.
106106
properties:
107107
address:
108-
description: The machine address.
108+
description: address is the machine address.
109+
maxLength: 256
110+
minLength: 1
109111
type: string
110112
type:
111-
description: Machine address type, one of Hostname,
112-
ExternalIP, InternalIP, ExternalDNS or InternalDNS.
113+
description: type is the machine address type, one of
114+
Hostname, ExternalIP, InternalIP, ExternalDNS or InternalDNS.
115+
enum:
116+
- Hostname
117+
- ExternalIP
118+
- InternalIP
119+
- ExternalDNS
120+
- InternalDNS
113121
type: string
114122
required:
115123
- address
@@ -125,27 +133,32 @@ spec:
125133
properties:
126134
lastTransitionTime:
127135
description: |-
128-
Last time the condition transitioned from one status to another.
136+
lastTransitionTime is the last time the condition transitioned from one status to another.
129137
This should be when the underlying condition changed. If that is not known, then using the time when
130138
the API field changed is acceptable.
131139
format: date-time
132140
type: string
133141
message:
134142
description: |-
135-
A human readable message indicating details about the transition.
143+
message is a human readable message indicating details about the transition.
136144
This field may be empty.
145+
maxLength: 10240
146+
minLength: 1
137147
type: string
138148
reason:
139149
description: |-
140-
The reason for the condition's last transition in CamelCase.
150+
reason is the reason for the condition's last transition in CamelCase.
141151
The specific API may choose whether or not this field is considered a guaranteed API.
142152
This field may be empty.
153+
maxLength: 256
154+
minLength: 1
143155
type: string
144156
severity:
145157
description: |-
146158
severity provides an explicit classification of Reason code, so the users or machines can immediately
147159
understand the current situation and act accordingly.
148160
The Severity field MUST be set only when Status=False.
161+
maxLength: 32
149162
type: string
150163
status:
151164
description: status of the condition, one of True, False,
@@ -156,6 +169,8 @@ spec:
156169
type of condition in CamelCase or in foo.example.com/CamelCase.
157170
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
158171
can be useful (see .node.status.conditions), the ability to deconflict is important.
172+
maxLength: 256
173+
minLength: 1
159174
type: string
160175
required:
161176
- lastTransitionTime

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: ghcr.io/metal-stack/cluster-api-metal-stack-controller
7+
newName: ghcr.io/metal-stack/capms-controller
88
newTag: latest

go.mod

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ require (
66
github.com/go-logr/logr v1.4.2
77
github.com/metal-stack/metal-go v0.40.4
88
github.com/metal-stack/metal-lib v0.20.2
9-
github.com/onsi/ginkgo/v2 v2.22.2
10-
github.com/onsi/gomega v1.36.2
9+
github.com/onsi/ginkgo/v2 v2.23.3
10+
github.com/onsi/gomega v1.36.3
1111
github.com/stretchr/testify v1.10.0
1212
go.uber.org/zap v1.27.0
13-
k8s.io/api v0.32.2
14-
k8s.io/apimachinery v0.32.2
15-
k8s.io/client-go v0.32.2
13+
k8s.io/api v0.32.3
14+
k8s.io/apimachinery v0.32.3
15+
k8s.io/client-go v0.32.3
1616
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
17-
sigs.k8s.io/cluster-api v1.9.5
18-
sigs.k8s.io/controller-runtime v0.19.6
17+
sigs.k8s.io/cluster-api v1.10.6
18+
sigs.k8s.io/controller-runtime v0.20.4
1919
)
2020

2121
require (
@@ -29,10 +29,10 @@ require (
2929
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
3030
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3131
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
32+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3434
github.com/felixge/httpsnoop v1.0.4 // indirect
35-
github.com/fsnotify/fsnotify v1.7.0 // indirect
35+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3636
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3737
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
3838
github.com/go-logr/stdr v1.2.2 // indirect
@@ -53,9 +53,10 @@ require (
5353
github.com/gogo/protobuf v1.3.2 // indirect
5454
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
5555
github.com/golang/protobuf v1.5.4 // indirect
56+
github.com/google/btree v1.1.3 // indirect
5657
github.com/google/cel-go v0.22.0 // indirect
5758
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
58-
github.com/google/go-cmp v0.6.0 // indirect
59+
github.com/google/go-cmp v0.7.0 // indirect
5960
github.com/google/gofuzz v1.2.0 // indirect
6061
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
6162
github.com/google/uuid v1.6.0 // indirect
@@ -86,42 +87,42 @@ require (
8687
github.com/prometheus/common v0.60.0 // indirect
8788
github.com/prometheus/procfs v0.15.1 // indirect
8889
github.com/segmentio/asm v1.2.0 // indirect
89-
github.com/spf13/cobra v1.8.1 // indirect
90-
github.com/spf13/pflag v1.0.5 // indirect
90+
github.com/spf13/cobra v1.9.1 // indirect
91+
github.com/spf13/pflag v1.0.6 // indirect
9192
github.com/stoewer/go-strcase v1.3.0 // indirect
9293
github.com/stretchr/objx v0.5.2 // indirect
9394
github.com/x448/float16 v0.8.4 // indirect
9495
go.mongodb.org/mongo-driver v1.17.1 // indirect
95-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
96+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
9697
go.opentelemetry.io/otel v1.30.0 // indirect
9798
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
9899
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
99100
go.opentelemetry.io/otel/metric v1.30.0 // indirect
100-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
101+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
101102
go.opentelemetry.io/otel/trace v1.30.0 // indirect
102103
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
103104
go.uber.org/multierr v1.11.0 // indirect
104-
golang.org/x/crypto v0.32.0 // indirect
105+
golang.org/x/crypto v0.36.0 // indirect
105106
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
106-
golang.org/x/net v0.34.0 // indirect
107-
golang.org/x/oauth2 v0.25.0 // indirect
108-
golang.org/x/sync v0.10.0 // indirect
109-
golang.org/x/sys v0.29.0 // indirect
110-
golang.org/x/term v0.28.0 // indirect
111-
golang.org/x/text v0.21.0 // indirect
112-
golang.org/x/time v0.7.0 // indirect
113-
golang.org/x/tools v0.28.0 // indirect
114-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
115-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
116-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
117-
google.golang.org/grpc v1.66.1 // indirect
118-
google.golang.org/protobuf v1.36.1 // indirect
107+
golang.org/x/net v0.38.0 // indirect
108+
golang.org/x/oauth2 v0.28.0 // indirect
109+
golang.org/x/sync v0.12.0 // indirect
110+
golang.org/x/sys v0.31.0 // indirect
111+
golang.org/x/term v0.30.0 // indirect
112+
golang.org/x/text v0.23.0 // indirect
113+
golang.org/x/time v0.8.0 // indirect
114+
golang.org/x/tools v0.30.0 // indirect
115+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
116+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
117+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
118+
google.golang.org/grpc v1.67.3 // indirect
119+
google.golang.org/protobuf v1.36.5 // indirect
119120
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
120121
gopkg.in/inf.v0 v0.9.1 // indirect
121122
gopkg.in/yaml.v3 v3.0.1 // indirect
122-
k8s.io/apiextensions-apiserver v0.32.2 // indirect
123-
k8s.io/apiserver v0.32.2 // indirect
124-
k8s.io/component-base v0.32.2 // indirect
123+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
124+
k8s.io/apiserver v0.32.3 // indirect
125+
k8s.io/component-base v0.32.3 // indirect
125126
k8s.io/klog/v2 v2.130.1 // indirect
126127
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
127128
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect

0 commit comments

Comments
 (0)