Skip to content

Commit ee62cb2

Browse files
afritzlerdefo89
afritzler
and
defo89
authored
Bump k8s.io/* deps to v0.31.1 (#127)
* Bump `k8s.io/*` deps to v0.31.1 - Bump `k8s.io/*` deps to v0.31.1 - Bump `controller-tools` to v0.16.3 * enable controller SkipNameValidation in test ref kubernetes-sigs/controller-runtime#2902 (comment) * Bump `k8s.io/*` deps to v0.31.1 - Bump `k8s.io/*` deps to v0.31.1 - Bump `controller-tools` to v0.16.3 * Use 1.31 testenv cluster * Make probe agent backoff timeout configurable --------- Co-authored-by: Dmitri Fedotov <dmitri.fedotov@sap.com>
1 parent a99ad21 commit ee62cb2

17 files changed

+113
-266
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.30.0
5+
ENVTEST_K8S_VERSION = 1.31.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -199,7 +199,7 @@ GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs-$(GEN_CRD_A
199199

200200
## Tool Versions
201201
KUSTOMIZE_VERSION ?= v5.3.0
202-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
202+
CONTROLLER_TOOLS_VERSION ?= v0.16.3
203203
ENVTEST_VERSION ?= latest
204204
GOLANGCI_LINT_VERSION ?= v1.61.0
205205
GOIMPORTS_VERSION ?= v0.25.0

‎api/v1alpha1/webhook_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var _ = BeforeSuite(func() {
7474
// Note that you must have the required binaries setup under the bin directory to perform
7575
// the tests directly. When we run make test it will be setup and used automatically.
7676
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
77-
fmt.Sprintf("1.29.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
77+
fmt.Sprintf("1.31.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
7878

7979
WebhookInstallOptions: envtest.WebhookInstallOptions{
8080
Paths: []string{filepath.Join("..", "..", "config", "webhook")},

‎api/v1alpha1/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/metalprobe/main.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package main
66
import (
77
"flag"
88
"os"
9+
"time"
910

1011
"github.com/ironcore-dev/metal-operator/internal/probe"
1112
ctrl "sigs.k8s.io/controller-runtime"
@@ -19,9 +20,11 @@ var (
1920
func main() {
2021
var registryURL string
2122
var serverUUID string
23+
var duration time.Duration
2224

2325
flag.StringVar(&registryURL, "registry-url", "", "Registry URL where the probe will register itself.")
2426
flag.StringVar(&serverUUID, "server-uuid", "", "Agent UUID to register with the registry.")
27+
flag.DurationVar(&duration, "duration", 5*time.Second, "Duration of time to wait between checks.")
2528

2629
opts := zap.Options{
2730
Development: true,
@@ -44,7 +47,7 @@ func main() {
4447
ctx := ctrl.SetupSignalHandler()
4548

4649
setupLog.Info("starting registry agent")
47-
agent := probe.NewAgent(serverUUID, registryURL)
50+
agent := probe.NewAgent(serverUUID, registryURL, duration)
4851
if err := agent.Start(ctx); err != nil {
4952
setupLog.Error(err, "problem running probe agent")
5053
os.Exit(1)

‎config/crd/bases/metal.ironcore.dev_bmcs.yaml

+4-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: bmcs.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev
@@ -82,9 +82,7 @@ spec:
8282
This field is effectively required, but due to backwards compatibility is
8383
allowed to be empty. Instances of this type with an empty value here are
8484
almost certainly wrong.
85-
TODO: Add other useful fields. apiVersion, kind, uid?
8685
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
87-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
8886
type: string
8987
type: object
9088
x-kubernetes-map-type: atomic
@@ -120,9 +118,7 @@ spec:
120118
This field is effectively required, but due to backwards compatibility is
121119
allowed to be empty. Instances of this type with an empty value here are
122120
almost certainly wrong.
123-
TODO: Add other useful fields. apiVersion, kind, uid?
124121
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
125-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
126122
type: string
127123
type: object
128124
x-kubernetes-map-type: atomic
@@ -158,16 +154,8 @@ spec:
158154
description: Conditions represents the latest available observations
159155
of the BMC's current state.
160156
items:
161-
description: "Condition contains details for one aspect of the current
162-
state of this API Resource.\n---\nThis struct is intended for
163-
direct use as an array at the field path .status.conditions. For
164-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
165-
observations of a foo's current state.\n\t // Known .status.conditions.type
166-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
167-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
168-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
169-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
170-
\ // other fields\n\t}"
157+
description: Condition contains details for one aspect of the current
158+
state of this API Resource.
171159
properties:
172160
lastTransitionTime:
173161
description: |-
@@ -208,12 +196,7 @@ spec:
208196
- Unknown
209197
type: string
210198
type:
211-
description: |-
212-
type of condition in CamelCase or in foo.example.com/CamelCase.
213-
---
214-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
215-
useful (see .node.status.conditions), the ability to deconflict is important.
216-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
199+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
217200
maxLength: 316
218201
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
219202
type: string

‎config/crd/bases/metal.ironcore.dev_bmcsecrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: bmcsecrets.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev

‎config/crd/bases/metal.ironcore.dev_endpoints.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: endpoints.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev

‎config/crd/bases/metal.ironcore.dev_serverbootconfigurations.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: serverbootconfigurations.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev
@@ -69,9 +69,7 @@ spec:
6969
This field is effectively required, but due to backwards compatibility is
7070
allowed to be empty. Instances of this type with an empty value here are
7171
almost certainly wrong.
72-
TODO: Add other useful fields. apiVersion, kind, uid?
7372
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
74-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
7573
type: string
7674
type: object
7775
x-kubernetes-map-type: atomic
@@ -91,9 +89,7 @@ spec:
9189
This field is effectively required, but due to backwards compatibility is
9290
allowed to be empty. Instances of this type with an empty value here are
9391
almost certainly wrong.
94-
TODO: Add other useful fields. apiVersion, kind, uid?
9592
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
96-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
9793
type: string
9894
type: object
9995
x-kubernetes-map-type: atomic

‎config/crd/bases/metal.ironcore.dev_serverclaims.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: serverclaims.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev
@@ -67,9 +67,7 @@ spec:
6767
This field is effectively required, but due to backwards compatibility is
6868
allowed to be empty. Instances of this type with an empty value here are
6969
almost certainly wrong.
70-
TODO: Add other useful fields. apiVersion, kind, uid?
7170
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
72-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
7371
type: string
7472
type: object
7573
x-kubernetes-map-type: atomic
@@ -91,9 +89,7 @@ spec:
9189
This field is effectively required, but due to backwards compatibility is
9290
allowed to be empty. Instances of this type with an empty value here are
9391
almost certainly wrong.
94-
TODO: Add other useful fields. apiVersion, kind, uid?
9592
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
96-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
9793
type: string
9894
type: object
9995
x-kubernetes-map-type: atomic

‎config/crd/bases/metal.ironcore.dev_servers.yaml

+4-23
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: servers.metal.ironcore.dev
88
spec:
99
group: metal.ironcore.dev
@@ -103,9 +103,7 @@ spec:
103103
This field is effectively required, but due to backwards compatibility is
104104
allowed to be empty. Instances of this type with an empty value here are
105105
almost certainly wrong.
106-
TODO: Add other useful fields. apiVersion, kind, uid?
107106
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
108-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
109107
type: string
110108
type: object
111109
x-kubernetes-map-type: atomic
@@ -148,9 +146,7 @@ spec:
148146
This field is effectively required, but due to backwards compatibility is
149147
allowed to be empty. Instances of this type with an empty value here are
150148
almost certainly wrong.
151-
TODO: Add other useful fields. apiVersion, kind, uid?
152149
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
153-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
154150
type: string
155151
type: object
156152
x-kubernetes-map-type: atomic
@@ -172,7 +168,6 @@ spec:
172168
the event) or if no container name is specified "spec.containers[2]" (container with
173169
index 2 in this pod). This syntax is chosen only to have some well-defined way of
174170
referencing a part of an object.
175-
TODO: this design is not final and this field is subject to change in the future.
176171
type: string
177172
kind:
178173
description: |-
@@ -245,7 +240,6 @@ spec:
245240
the event) or if no container name is specified "spec.containers[2]" (container with
246241
index 2 in this pod). This syntax is chosen only to have some well-defined way of
247242
referencing a part of an object.
248-
TODO: this design is not final and this field is subject to change in the future.
249243
type: string
250244
kind:
251245
description: |-
@@ -303,16 +297,8 @@ spec:
303297
description: Conditions represents the latest available observations
304298
of the server's current state.
305299
items:
306-
description: "Condition contains details for one aspect of the current
307-
state of this API Resource.\n---\nThis struct is intended for
308-
direct use as an array at the field path .status.conditions. For
309-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
310-
observations of a foo's current state.\n\t // Known .status.conditions.type
311-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
312-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
313-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
314-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
315-
\ // other fields\n\t}"
300+
description: Condition contains details for one aspect of the current
301+
state of this API Resource.
316302
properties:
317303
lastTransitionTime:
318304
description: |-
@@ -353,12 +339,7 @@ spec:
353339
- Unknown
354340
type: string
355341
type:
356-
description: |-
357-
type of condition in CamelCase or in foo.example.com/CamelCase.
358-
---
359-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
360-
useful (see .node.status.conditions), the ability to deconflict is important.
361-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
342+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
362343
maxLength: 316
363344
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
364345
type: string

0 commit comments

Comments
 (0)