Skip to content

Commit adc783f

Browse files
peppi-lottapeppi-lotta
committed
Change placeholder values to actual values
Signed-off-by: peppi-lotta <[email protected]>
1 parent 55b32f8 commit adc783f

File tree

23 files changed

+96
-81
lines changed

23 files changed

+96
-81
lines changed

‎api/go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/metal3-io/cluster-api-provider-metal3/api
33
go 1.24.0
44

55
require (
6-
github.com/metal3-io/ip-address-manager/api v1.10.1-0.20250701084858-f1771d9443f4
6+
github.com/metal3-io/ip-address-manager/api v1.11.0-alpha.0
77
github.com/onsi/gomega v1.37.0
88
github.com/pkg/errors v0.9.1
99
k8s.io/api v0.33.2
1010
k8s.io/apiextensions-apiserver v0.33.2
1111
k8s.io/apimachinery v0.33.2
1212
k8s.io/client-go v0.33.2
13-
sigs.k8s.io/cluster-api v1.11.0-alpha.1
13+
sigs.k8s.io/cluster-api v1.11.0-alpha.2
1414
sigs.k8s.io/controller-runtime v0.21.0
1515
)
1616

@@ -36,6 +36,7 @@ require (
3636
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3737
github.com/spf13/pflag v1.0.6 // indirect
3838
github.com/x448/float16 v0.8.4 // indirect
39+
go.yaml.in/yaml/v2 v2.4.2 // indirect
3940
golang.org/x/net v0.41.0 // indirect
4041
golang.org/x/oauth2 v0.30.0 // indirect
4142
golang.org/x/sys v0.33.0 // indirect
@@ -52,5 +53,5 @@ require (
5253
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
5354
sigs.k8s.io/randfill v1.0.0 // indirect
5455
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
55-
sigs.k8s.io/yaml v1.4.0 // indirect
56+
sigs.k8s.io/yaml v1.5.0 // indirect
5657
)

‎api/go.sum

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
6060
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6161
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
6262
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
63-
github.com/metal3-io/ip-address-manager/api v1.10.1-0.20250701084858-f1771d9443f4 h1:PhIWPEYY5npWP++FzSoIpQWPwQz6ZpzXyLLKLYF1nGU=
64-
github.com/metal3-io/ip-address-manager/api v1.10.1-0.20250701084858-f1771d9443f4/go.mod h1:l5HqI0z1Ks7rNRcbrUsmoDlFewzdtwKEZjFoHe9j9Ik=
63+
github.com/metal3-io/ip-address-manager/api v1.11.0-alpha.0 h1:uCH1Zkj9ndTxO27nPUY/lC9s5acGiO9Hw0lv2TqQ8lE=
64+
github.com/metal3-io/ip-address-manager/api v1.11.0-alpha.0/go.mod h1:rT4+PwdFq82mVuYu2cJcb1CAE0SCLUYJkIVM0r5bgzY=
6565
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
6666
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
6767
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -110,6 +110,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
110110
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
111111
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
112112
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
113+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
114+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
115+
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
116+
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
113117
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
114118
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
115119
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -179,8 +183,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
179183
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
180184
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
181185
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
182-
sigs.k8s.io/cluster-api v1.11.0-alpha.1 h1:8apMLTVE7NC+vLM8Xi5TVk0OoEHW8DT8L09IoBOBlgs=
183-
sigs.k8s.io/cluster-api v1.11.0-alpha.1/go.mod h1:5CVeCZAsEBg/eZpr7wsYntHE7QFqMX8IzNH+MWhAhQg=
186+
sigs.k8s.io/cluster-api v1.11.0-alpha.2 h1:MRj1bsx8X1fYlbl5NCf+98XJ+oIuxRVppXD0KIgjddw=
187+
sigs.k8s.io/cluster-api v1.11.0-alpha.2/go.mod h1:AougDuRB0zXAygnmSTEJiQ1f/s382U2DfboFHbaK1VQ=
184188
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
185189
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
186190
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
@@ -190,5 +194,6 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
190194
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
191195
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
192196
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
193-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
194197
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
198+
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
199+
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

‎docs/api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ spec:
123123
apiGroup: infrastructure.cluster.x-k8s.io
124124
kind: Metal3MachineTemplate
125125
name: m3cluster-controlplane
126-
nodeDrainTimeout: 0s
126+
nodeDrainTimeoutSeconds: 0s
127127
replicas: 3
128128
rolloutStrategy:
129129
rollingUpdate:
@@ -244,7 +244,7 @@ spec:
244244
apiGroup: infrastructure.cluster.x-k8s.io
245245
kind: Metal3Machine
246246
name: controlplane-0
247-
nodeDrainTimeout: 0s
247+
nodeDrainTimeoutSeconds: 0s
248248
providerID: metal3://68be298f-ed11-439e-9d51-6c5260faede6
249249
version: v1.33.0
250250
```

‎docs/remediation-controller.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
# (Optional) maxUnhealthy prevents further remediation if the cluster is
7474
# already partially unhealthy
7575
maxUnhealthy: 100%
76-
# (Optional) nodeStartupTimeout determines how long a MachineHealthCheck
76+
# (Optional) nodeStartupTimeoutSeconds determines how long a MachineHealthCheck
7777
# should wait for
7878
# a Node to join the cluster, before considering a Machine unhealthy.
7979
# Defaults to 10 minutes if not specified.
@@ -82,20 +82,20 @@ spec:
8282
# unhealthy when the Node it created has not yet registered with the cluster.
8383
# This can be useful when Nodes take a long time to start up or when you only
8484
# want condition based checks for Machine health.
85-
nodeStartupTimeout: 0m
85+
nodeStartupTimeoutSeconds: 0m
8686
# selector is used to determine which Machines should be health checked
8787
selector:
8888
matchLabels:
8989
nodepool: nodepool-0
9090
# Conditions to check on Nodes for matched Machines, if any condition is
9191
# matched for the duration of its timeout, the Machine is considered unhealthy
92-
unhealthyConditions:
92+
unhealthyNodeConditions:
9393
- type: Ready
9494
status: Unknown
95-
timeout: 300s
95+
timeoutSeconds: 300s
9696
- type: Ready
9797
status: "False"
98-
timeout: 300s
98+
timeoutSeconds: 300s
9999
remediationTemplate: # added infrastructure reference
100100
kind: Metal3RemediationTemplate
101101
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -129,17 +129,17 @@ metadata:
129129
spec:
130130
clusterName: test1
131131
maxUnhealthy: 100%
132-
nodeStartupTimeout: 0m
132+
nodeStartupTimeoutSeconds: 0m
133133
selector:
134134
matchLabels:
135135
cluster.x-k8s.io/control-plane: ""
136-
unhealthyConditions:
136+
unhealthyNodeConditions:
137137
- type: Ready
138138
status: Unknown
139-
timeout: 300s
139+
timeoutSeconds: 300s
140140
- type: Ready
141141
status: "False"
142-
timeout: 300s
142+
timeoutSeconds: 300s
143143
remediationTemplate: # added infrastructure reference
144144
kind: Metal3RemediationTemplate
145145
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎examples/cluster/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
kind: Metal3Cluster
1919
name: ${CLUSTER_NAME}
2020
controlPlaneRef:
21-
apiGroup: controlplane.cluster.x-k8s.io/v1beta2
21+
apiGroup: controlplane.cluster.x-k8s.io
2222
kind: KubeadmControlPlane
2323
name: ${CLUSTER_NAME}-controlplane
2424
---

‎examples/clusterctl-templates/clusterctl-cluster.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
name: ${CLUSTER_NAME}
1717
controlPlaneRef:
1818
kind: KubeadmControlPlane
19-
apiGroup: controlplane.cluster.x-k8s.io/v1beta2
19+
apiGroup: controlplane.cluster.x-k8s.io
2020
name: ${CLUSTER_NAME}
2121
---
2222
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -41,7 +41,7 @@ spec:
4141
apiGroup: infrastructure.cluster.x-k8s.io
4242
kind: Metal3MachineTemplate
4343
name: ${CLUSTER_NAME}-controlplane
44-
nodeDrainTimeout: ${NODE_DRAIN_TIMEOUT:-"0s"}
44+
nodeDrainTimeoutSeconds: ${NODE_DRAIN_TIMEOUT:-"0s"}
4545
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
4646
rolloutStrategy:
4747
rollingUpdate:
@@ -103,7 +103,7 @@ spec:
103103
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
104104
nodepool: nodepool-0
105105
spec:
106-
nodeDrainTimeout: ${NODE_DRAIN_TIMEOUT:-"0s"}
106+
nodeDrainTimeoutSeconds: ${NODE_DRAIN_TIMEOUT:-"0s"}
107107
clusterName: ${CLUSTER_NAME}
108108
version: ${KUBERNETES_VERSION}
109109
bootstrap:

‎examples/controlplane/controlplane.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: ${CLUSTER_NAME}-controlplane
55
spec:
66
machineTemplate:
7-
nodeDrainTimeout: ${NODE_DRAIN_TIMEOUT:-"0s"}
7+
nodeDrainTimeoutSeconds: ${NODE_DRAIN_TIMEOUT:-"0s"}
88
infrastructureRef:
99
kind: Metal3MachineTemplate
1010
apiGroup: infrastructure.cluster.x-k8s.io

‎examples/machinedeployment/machinedeployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
1919
nodepool: nodepool-0
2020
spec:
21-
nodeDrainTimeout: ${NODE_DRAIN_TIMEOUT:-"0s"}
21+
nodeDrainTimeoutSeconds: ${NODE_DRAIN_TIMEOUT:-"0s"}
2222
clusterName: ${CLUSTER_NAME}
2323
version: ${KUBERNETES_VERSION}
2424
bootstrap:

‎examples/templates/cluster.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ metadata:
229229
namespace: ${NAMESPACE}
230230
spec:
231231
topology:
232-
class: example-clusterclass
232+
classRef:
233+
name: example-clusterclass
233234
version: ${KUBERNETES_VERSION}
234235
controlPlane:
235236
replicas: 1

‎examples/templates/clusterclass.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ spec:
210210
name: example-md-0
211211
# This will create a MachineHealthCheck for ControlPlane machines.
212212
machineHealthCheck:
213-
nodeStartupTimeout: 3m
213+
nodeStartupTimeoutSeconds: 3m
214214
maxUnhealthy: 33%
215-
unhealthyConditions:
215+
unhealthyNodeConditions:
216216
- type: Ready
217217
status: Unknown
218-
timeout: 300s
218+
timeoutSeconds: 300s
219219
- type: Ready
220220
status: "False"
221-
timeout: 300s
221+
timeoutSeconds: 300s
222222
workers:
223223
machineDeployments:
224224
- class: example-worker
@@ -239,13 +239,13 @@ spec:
239239
name: example-md-0
240240
# This will create a health check for each deployment created with the "test-worker" MachineDeploymentClass
241241
machineHealthCheck:
242-
unhealthyConditions:
242+
unhealthyNodeConditions:
243243
- type: Ready
244244
status: Unknown
245-
timeout: 300s
245+
timeoutSeconds: 300s
246246
- type: Ready
247247
status: "False"
248-
timeout: 300s
248+
timeoutSeconds: 300s
249249
infrastructure:
250250
ref:
251251
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)