File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 55require (
66 github.com/google/go-cmp v0.7.0
77 github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d
8- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
8+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
99 github.com/robfig/cron/v3 v3.0.1
1010 k8s.io/api v0.29.15
1111 k8s.io/apimachinery v0.29.15
Original file line number Diff line number Diff line change @@ -75,8 +75,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
7575github.com/onsi/gomega v1.34.1 /go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY =
7676github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d h1:aphoDw96rkEMGhZJoc+kO3S4o9e/GQfXz/njRPjh+Kw =
7777github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d /go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU =
78- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo =
79- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
78+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 h1:dczrtvVjeDXUR3OhnUQRhVVnN14KX52qp0KXCulo8pA =
79+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
8080github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4 =
8181github.com/pkg/errors v0.9.1 /go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0 =
8282github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM =
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ require (
1212 github.com/onsi/gomega v1.34.1
1313 github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d
1414 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250429200536-ceab98cb3680
15- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
15+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35
1616 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0
1717 github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250423055245-3cb2ae8df6f0
1818 github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250429105455-119a21fd879a
Original file line number Diff line number Diff line change @@ -82,8 +82,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2
8282github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250430070919-2ce4eea3a06d /go.mod h1:XywwuHkxaBZA+6QsF+N/3f9ekBq3tH0I/gQZzwL89GU =
8383github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250429200536-ceab98cb3680 h1:FblL5Up8Xl+fEvRilunXDs/SuhT4PJq6AVTid572BSY =
8484github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250429200536-ceab98cb3680 /go.mod h1:l2mtILjoZuQkDzMVvvZBKhQC3wAEGQDWZyED5PCHx5k =
85- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo =
86- github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
85+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 h1:dczrtvVjeDXUR3OhnUQRhVVnN14KX52qp0KXCulo8pA =
86+ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250505061650-7cb2f323fb35 /go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ =
8787github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:FAHrScvlj6w17wvcDhJ0ZnmraMrrOX1CxzvqZK595hA =
8888github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250423055245-3cb2ae8df6f0 /go.mod h1:fesgTbs2j30Fhw2hebXkPgbeAIqG0Yk2oaeOklAInZg =
8989github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:JejCQvZ28JmG87iGpy0tk8v4WJzZ07PIIAxXRpiMR9E =
Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ import (
3939 "sigs.k8s.io/controller-runtime/pkg/webhook"
4040
4141 memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
42+ "github.com/openstack-k8s-operators/lib-common/modules/common/operator"
4243 metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4344
4445 networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
@@ -102,7 +103,7 @@ func main() {
102103 c .NextProtos = []string {"http/1.1" }
103104 }
104105
105- mgr , err := ctrl . NewManager ( ctrl . GetConfigOrDie (), ctrl.Options {
106+ options := ctrl.Options {
106107 Scheme : scheme ,
107108 Metrics : metricsserver.Options {
108109 BindAddress : metricsAddr ,
@@ -115,7 +116,15 @@ func main() {
115116 Port : 9444 ,
116117 TLSOpts : []func (config * tls.Config ){disableHTTP2 },
117118 }),
118- })
119+ }
120+
121+ err := operator .SetManagerOptions (& options , setupLog )
122+ if err != nil {
123+ setupLog .Error (err , "unable to set manager options" )
124+ os .Exit (1 )
125+ }
126+
127+ mgr , err := ctrl .NewManager (ctrl .GetConfigOrDie (), options )
119128 if err != nil {
120129 setupLog .Error (err , "unable to start manager" )
121130 os .Exit (1 )
You can’t perform that action at this time.
0 commit comments