Skip to content

Commit f39105c

Browse files
github-actions[bot]afritzler
github-actions[bot]
authored and
afritzler
committed
Update kubebuilder scaffold v4.13.1 -> v4.14.0
Signed-off-by: Andreas Fritzler <andreas.fritzler@sap.com>
1 parent 70aa1c0 commit f39105c

15 files changed

Lines changed: 45 additions & 47 deletions

File tree

‎.custom-gcl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# with all the plugins listed below.
44
#
55
# See: https://golangci-lint.run/plugins/module-plugins/
6-
version: v2.8.0
6+
version: v2.11.4
77
plugins:
88
# logcheck validates structured logging calls and parameters (e.g., balanced key-value pairs)
99
- module: "sigs.k8s.io/logtools"

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: Run linter
2020
uses: golangci/golangci-lint-action@v9
2121
with:
22-
version: v2.10
22+
version: v2.11

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
6161

6262
.PHONY: generate
6363
generate: controller-gen goimports ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
64-
"$(CONTROLLER_GEN)" object:headerFile="hack/boilerplate.go.txt" paths="./..."
64+
"$(CONTROLLER_GEN)" object paths="./..."
6565
"$(GOIMPORTS)" -w .
6666

6767
.PHONY: fmt
@@ -291,7 +291,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.20.1
291291
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
292292
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
293293
ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d.%d",$$3, $$2}')
294-
GOLANGCI_LINT_VERSION ?= v2.10
294+
GOLANGCI_LINT_VERSION ?= v2.11
295295
GOIMPORTS_VERSION ?= v0.38.0
296296
CRD_REF_DOCS_VERSION ?= v0.2.0
297297
KUBEBUILDER_VERSION ?= v4.13.0

‎PROJECT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is used to track the info used to scaffold your project
33
# and allow the plugins properly work.
44
# More info: https://book.kubebuilder.io/reference/project-config.html
5-
cliVersion: 4.13.1
5+
cliVersion: 4.14.0
66
domain: ironcore.dev
77
layout:
88
- go.kubebuilder.io/v4

‎REUSE.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ path = [
2626
"package-lock.json",
2727
"internal/cmd/visualizer/index.html",
2828
"test/data/*.json",
29-
"test/data/*.yaml"
29+
"test/data/*.yaml",
30+
"api/v1alpha1/zz_generated.deepcopy.go"
3031
]
3132
precedence = "aggregate"
3233
SPDX-FileCopyrightText = "2024 SAP SE or an SAP affiliate company and IronCore contributors"

‎api/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and IronCore contributors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
// Package v1alpha1 contains API Schema definitions for the metal v1alpha1 API group
4+
// Package v1alpha1 contains API Schema definitions for the metal v1alpha1 API group.
55
// +kubebuilder:object:generate=true
66
// +groupName=metal.ironcore.dev
77
package v1alpha1

‎api/v1alpha1/zz_generated.deepcopy.go‎

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

‎cmd/main.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -413,14 +413,14 @@ func main() { // nolint: gocyclo
413413
DefaultProtocol: effectiveProtocol,
414414
SkipCertValidation: effectiveSkipCert,
415415
}).SetupWithManager(mgr); err != nil {
416-
setupLog.Error(err, "Failed to create controller", "controller", "Endpoint")
416+
setupLog.Error(err, "Failed to create controller", "controller", "endpoint")
417417
os.Exit(1)
418418
}
419419
if err = (&controller.BMCSecretReconciler{
420420
Client: mgr.GetClient(),
421421
Scheme: mgr.GetScheme(),
422422
}).SetupWithManager(mgr); err != nil {
423-
setupLog.Error(err, "Failed to create controller", "controller", "BMCSecret")
423+
setupLog.Error(err, "Failed to create controller", "controller", "bmcsecret")
424424
os.Exit(1)
425425
}
426426
if err = (&controller.BMCReconciler{
@@ -439,7 +439,7 @@ func main() { // nolint: gocyclo
439439
BasicAuth: true,
440440
},
441441
}).SetupWithManager(mgr); err != nil {
442-
setupLog.Error(err, "Failed to create controller", "controller", "BMC")
442+
setupLog.Error(err, "Failed to create controller", "controller", "bmc")
443443
os.Exit(1)
444444
}
445445
if err = (&controller.ServerReconciler{
@@ -470,14 +470,14 @@ func main() { // nolint: gocyclo
470470
},
471471
DiscoveryTimeout: discoveryTimeout,
472472
}).SetupWithManager(mgr); err != nil {
473-
setupLog.Error(err, "Failed to create controller", "controller", "Server")
473+
setupLog.Error(err, "Failed to create controller", "controller", "server")
474474
os.Exit(1)
475475
}
476476
if err = (&controller.ServerBootConfigurationReconciler{
477477
Client: mgr.GetClient(),
478478
Scheme: mgr.GetScheme(),
479479
}).SetupWithManager(mgr); err != nil {
480-
setupLog.Error(err, "Failed to create controller", "controller", "ServerBootConfiguration")
480+
setupLog.Error(err, "Failed to create controller", "controller", "serverbootconfiguration")
481481
os.Exit(1)
482482
}
483483
if err = (&controller.ServerClaimReconciler{
@@ -487,14 +487,14 @@ func main() { // nolint: gocyclo
487487
Scheme: mgr.GetScheme(),
488488
MaxConcurrentReconciles: serverClaimMaxConcurrentReconciles,
489489
}).SetupWithManager(mgr); err != nil {
490-
setupLog.Error(err, "Failed to create controller", "controller", "ServerClaim")
490+
setupLog.Error(err, "Failed to create controller", "controller", "serverclaim")
491491
os.Exit(1)
492492
}
493493
if err = (&controller.ServerMaintenanceReconciler{
494494
Client: mgr.GetClient(),
495495
Scheme: mgr.GetScheme(),
496496
}).SetupWithManager(mgr); err != nil {
497-
setupLog.Error(err, "Failed to create controller", "controller", "ServerMaintenance")
497+
setupLog.Error(err, "Failed to create controller", "controller", "servermaintenance")
498498
os.Exit(1)
499499
}
500500
if err = (&controller.BIOSSettingsReconciler{
@@ -515,7 +515,7 @@ func main() { // nolint: gocyclo
515515
TimeoutExpiry: biosSettingsApplyTimeout,
516516
DefaultFailedAutoRetryCount: int32(defaultFailedAutoRetryCount),
517517
}).SetupWithManager(mgr); err != nil {
518-
setupLog.Error(err, "Failed to create controller", "controller", "BIOSSettings")
518+
setupLog.Error(err, "Failed to create controller", "controller", "biossettings")
519519
os.Exit(1)
520520
}
521521
if err = (&controller.BIOSVersionReconciler{
@@ -535,7 +535,7 @@ func main() { // nolint: gocyclo
535535
},
536536
DefaultFailedAutoRetryCount: int32(defaultFailedAutoRetryCount),
537537
}).SetupWithManager(mgr); err != nil {
538-
setupLog.Error(err, "Failed to create controller", "controller", "BIOSVersion")
538+
setupLog.Error(err, "Failed to create controller", "controller", "biosversion")
539539
os.Exit(1)
540540
}
541541
if err = (&controller.BMCSettingsReconciler{
@@ -555,7 +555,7 @@ func main() { // nolint: gocyclo
555555
},
556556
DefaultFailedAutoRetryCount: int32(defaultFailedAutoRetryCount),
557557
}).SetupWithManager(mgr); err != nil {
558-
setupLog.Error(err, "Failed to create controller", "controller", "BMCSettings")
558+
setupLog.Error(err, "Failed to create controller", "controller", "bmcsettings")
559559
os.Exit(1)
560560
}
561561
if err = (&controller.BMCVersionReconciler{
@@ -575,39 +575,39 @@ func main() { // nolint: gocyclo
575575
},
576576
DefaultFailedAutoRetryCount: int32(defaultFailedAutoRetryCount),
577577
}).SetupWithManager(mgr); err != nil {
578-
setupLog.Error(err, "Failed to create controller", "controller", "BMCVersion")
578+
setupLog.Error(err, "Failed to create controller", "controller", "bmcversion")
579579
os.Exit(1)
580580
}
581581
if err = (&controller.BIOSVersionSetReconciler{
582582
Client: mgr.GetClient(),
583583
Scheme: mgr.GetScheme(),
584584
ResyncInterval: maintenanceResyncInterval,
585585
}).SetupWithManager(mgr); err != nil {
586-
setupLog.Error(err, "Failed to create controller", "controller", "BIOSVersionSet")
586+
setupLog.Error(err, "Failed to create controller", "controller", "biosversionset")
587587
os.Exit(1)
588588
}
589589
if err = (&controller.BIOSSettingsSetReconciler{
590590
Client: mgr.GetClient(),
591591
Scheme: mgr.GetScheme(),
592592
ResyncInterval: maintenanceResyncInterval,
593593
}).SetupWithManager(mgr); err != nil {
594-
setupLog.Error(err, "Failed to create controller", "controller", "BIOSSettingsSet")
594+
setupLog.Error(err, "Failed to create controller", "controller", "biossettingsset")
595595
os.Exit(1)
596596
}
597597
if err = (&controller.BMCVersionSetReconciler{
598598
Client: mgr.GetClient(),
599599
Scheme: mgr.GetScheme(),
600600
ResyncInterval: maintenanceResyncInterval,
601601
}).SetupWithManager(mgr); err != nil {
602-
setupLog.Error(err, "Failed to create controller", "controller", "BMCVersionSet")
602+
setupLog.Error(err, "Failed to create controller", "controller", "bmcversionset")
603603
os.Exit(1)
604604
}
605605
if err := (&controller.BMCSettingsSetReconciler{
606606
Client: mgr.GetClient(),
607607
Scheme: mgr.GetScheme(),
608608
ResyncInterval: maintenanceResyncInterval,
609609
}).SetupWithManager(mgr); err != nil {
610-
setupLog.Error(err, "Failed to create controller", "controller", "BMCSettingsSet")
610+
setupLog.Error(err, "Failed to create controller", "controller", "bmcsettingsset")
611611
os.Exit(1)
612612
}
613613
if err = (&controller.BMCUserReconciler{
@@ -623,56 +623,56 @@ func main() { // nolint: gocyclo
623623
ResourcePollingTimeout: resourcePollingTimeout,
624624
},
625625
}).SetupWithManager(mgr); err != nil {
626-
setupLog.Error(err, "Failed to create controller", "controller", "BMCUser")
626+
setupLog.Error(err, "Failed to create controller", "controller", "bmcuser")
627627
os.Exit(1)
628628
}
629629

630630
// nolint:goconst
631631
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
632632
if err := webhookv1alpha1.SetupEndpointWebhookWithManager(mgr); err != nil {
633-
setupLog.Error(err, "Failed to create webhook", "webhook", "Endpoint")
633+
setupLog.Error(err, "Failed to create webhook", "webhook", "endpoint")
634634
os.Exit(1)
635635
}
636636
}
637637
// nolint:goconst
638638
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
639639
if err := webhookv1alpha1.SetupBMCSecretWebhookWithManager(mgr); err != nil {
640-
setupLog.Error(err, "Failed to create webhook", "webhook", "BMCSecret")
640+
setupLog.Error(err, "Failed to create webhook", "webhook", "bmcsecret")
641641
os.Exit(1)
642642
}
643643
}
644644
// nolint:goconst
645645
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
646646
if err := webhookv1alpha1.SetupServerWebhookWithManager(mgr); err != nil {
647-
setupLog.Error(err, "Failed to create webhook", "webhook", "Server")
647+
setupLog.Error(err, "Failed to create webhook", "webhook", "server")
648648
os.Exit(1)
649649
}
650650
}
651651
// nolint:goconst
652652
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
653653
if err := webhookv1alpha1.SetupBIOSSettingsWebhookWithManager(mgr); err != nil {
654-
setupLog.Error(err, "Failed to create webhook", "webhook", "BIOSSettings")
654+
setupLog.Error(err, "Failed to create webhook", "webhook", "biossettings")
655655
os.Exit(1)
656656
}
657657
}
658658
// nolint:goconst
659659
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
660660
if err := webhookv1alpha1.SetupBIOSVersionWebhookWithManager(mgr); err != nil {
661-
setupLog.Error(err, "Failed to create webhook", "webhook", "BIOSVersion")
661+
setupLog.Error(err, "Failed to create webhook", "webhook", "biosversion")
662662
os.Exit(1)
663663
}
664664
}
665665
// nolint:goconst
666666
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
667667
if err := webhookv1alpha1.SetupBMCSettingsWebhookWithManager(mgr); err != nil {
668-
setupLog.Error(err, "Failed to create webhook", "webhook", "BMCSettings")
668+
setupLog.Error(err, "Failed to create webhook", "webhook", "bmcsettings")
669669
os.Exit(1)
670670
}
671671
}
672672
// nolint:goconst
673673
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
674674
if err := webhookv1alpha1.SetupBMCVersionWebhookWithManager(mgr); err != nil {
675-
setupLog.Error(err, "Failed to create webhook", "webhook", "BMCVersion")
675+
setupLog.Error(err, "Failed to create webhook", "webhook", "bmcversion")
676676
os.Exit(1)
677677
}
678678
}

‎config/manager/manager.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ spec:
6666
- --leader-elect
6767
image: controller:latest
6868
name: manager
69-
ports: []
69+
ports:
70+
- containerPort: 8081
71+
name: health
72+
protocol: TCP
7073
securityContext:
7174
allowPrivilegeEscalation: false
7275
capabilities:

‎docs/api-reference/api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Package v1alpha1 contains API Schema definitions for the metal.ironcore.dev API group
1010

11-
Package v1alpha1 contains API Schema definitions for the metal v1alpha1 API group
11+
Package v1alpha1 contains API Schema definitions for the metal v1alpha1 API group.
1212

1313
### Resource Types
1414
- [BIOSSettings](#biossettings)

0 commit comments

Comments
 (0)