File tree Expand file tree Collapse file tree 5 files changed +17
-8
lines changed
Expand file tree Collapse file tree 5 files changed +17
-8
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ require (
88 github.com/metal3-io/baremetal-operator/apis v0.6.3
99 github.com/onsi/ginkgo/v2 v2.20.1
1010 github.com/onsi/gomega v1.34.1
11- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
11+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
1212 k8s.io/api v0.29.15
1313 k8s.io/apimachinery v0.29.15
1414 sigs.k8s.io/controller-runtime v0.17.6
Original file line number Diff line number Diff line change @@ -88,8 +88,8 @@ github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo
8888github.com/onsi/ginkgo/v2 v2.20.1 /go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI =
8989github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k =
9090github.com/onsi/gomega v1.34.1 /go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY =
91- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo =
92- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
91+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 h1:dczrtvVjeDXUR3OhnUQRhVVnN14KX52qp0KXCulo8pA =
92+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
9393github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4 =
9494github.com/pkg/errors v0.9.1 /go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0 =
9595github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM =
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ require (
1010 github.com/metal3-io/baremetal-operator/apis v0.6.3
1111 github.com/onsi/ginkgo/v2 v2.20.1
1212 github.com/onsi/gomega v1.34.1
13- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
13+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
1414 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.0.0-00010101000000-000000000000
1515 github.com/spf13/cobra v1.9.1
1616 k8s.io/api v0.29.15
Original file line number Diff line number Diff line change @@ -99,8 +99,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
9999github.com/onsi/gomega v1.34.1 /go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY =
100100github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E =
101101github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 /go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4 =
102- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo =
103- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
102+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 h1:dczrtvVjeDXUR3OhnUQRhVVnN14KX52qp0KXCulo8pA =
103+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
104104github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4 =
105105github.com/pkg/errors v0.9.1 /go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0 =
106106github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM =
Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ import (
4040
4141 metal3v1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
4242
43+ "github.com/openstack-k8s-operators/lib-common/modules/common/operator"
4344 baremetalv1beta1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1"
4445 "github.com/openstack-k8s-operators/openstack-baremetal-operator/controllers"
4546 //+kubebuilder:scaffold:imports
@@ -83,7 +84,7 @@ func main() {
8384 c .NextProtos = []string {"http/1.1" }
8485 }
8586
86- mgr , err := ctrl . NewManager ( ctrl . GetConfigOrDie (), ctrl.Options {
87+ options := ctrl.Options {
8788 Scheme : scheme ,
8889 Metrics : metricsserver.Options {
8990 BindAddress : metricsAddr ,
@@ -96,7 +97,15 @@ func main() {
9697 Port : 9443 ,
9798 TLSOpts : []func (config * tls.Config ){disableHTTP2 },
9899 }),
99- })
100+ }
101+
102+ err := operator .SetManagerOptions (& options , setupLog )
103+ if err != nil {
104+ setupLog .Error (err , "unable to set manager options" )
105+ os .Exit (1 )
106+ }
107+
108+ mgr , err := ctrl .NewManager (ctrl .GetConfigOrDie (), options )
100109 if err != nil {
101110 setupLog .Error (err , "unable to start manager" )
102111 os .Exit (1 )
You can’t perform that action at this time.
0 commit comments