From b3d964e903af37b8851524adec2b351313085eed Mon Sep 17 00:00:00 2001 From: Rohit Kumar Date: Fri, 23 Oct 2026 14:20:46 +0530 Subject: [PATCH 1/2] Move to controller-utils config getter Signed-off-by: Rohit Kumar --- bucketbroker/client/config/getter.go | 9 ++- bucketbroker/cmd/bucketbroker/app/app.go | 13 +++- common/client/config/config.go | 81 ---------------------- go.mod | 2 +- go.sum | 4 +- machinebroker/client/config/getter.go | 9 ++- machinebroker/cmd/machinebroker/app/app.go | 12 +++- volumebroker/client/config/getter.go | 9 ++- volumebroker/cmd/volumebroker/app/app.go | 12 +++- 9 files changed, 49 insertions(+), 102 deletions(-) delete mode 100644 common/client/config/config.go diff --git a/bucketbroker/client/config/getter.go b/bucketbroker/client/config/getter.go index 567b639..9ac1676 100644 --- a/bucketbroker/client/config/getter.go +++ b/bucketbroker/client/config/getter.go @@ -6,22 +6,21 @@ package config import ( "os" - brokerconfig "github.com/ironcore-dev/brokers/common/client/config" - "github.com/ironcore-dev/ironcore/utils/client/config" + configutils "github.com/ironcore-dev/controller-utils/configutils" "k8s.io/apiserver/pkg/server/egressselector" ctrl "sigs.k8s.io/controller-runtime" ) var log = ctrl.Log.WithName("client").WithName("config") -func NewGetter() (*brokerconfig.BrokerGetter, error) { - return brokerconfig.NewBrokerGetter(config.GetterOptions{ +func NewGetter() (*configutils.Getter, error) { + return configutils.NewGetter(configutils.GetterOptions{ Name: "bucketbroker", NetworkContext: egressselector.ControlPlane.AsNetworkContext(), }) } -func NewGetterOrDie() *brokerconfig.BrokerGetter { +func NewGetterOrDie() *configutils.Getter { getter, err := NewGetter() if err != nil { log.Error(err, "Error creating getter") diff --git a/bucketbroker/cmd/bucketbroker/app/app.go b/bucketbroker/cmd/bucketbroker/app/app.go index 227de41..0815e9f 100644 --- a/bucketbroker/cmd/bucketbroker/app/app.go +++ b/bucketbroker/cmd/bucketbroker/app/app.go @@ -15,6 +15,8 @@ import ( bucketbrokerconfig "github.com/ironcore-dev/brokers/bucketbroker/client/config" "github.com/ironcore-dev/brokers/bucketbroker/server" + configutils "github.com/ironcore-dev/controller-utils/configutils" + "github.com/ironcore-dev/brokers/common" iri "github.com/ironcore-dev/ironcore/iri/apis/bucket/v1alpha1" "github.com/ironcore-dev/ironcore/utils/client/config" @@ -83,7 +85,16 @@ func Run(ctx context.Context, opts Options) error { return fmt.Errorf("error creating new getter: %w", err) } - cfg, err := getter.GetConfig(ctx, &opts.GetConfigOptions) + getConfigOptions := &configutils.GetConfigOptions{ + Context: opts.GetConfigOptions.Context, + EgressSelectorConfig: opts.GetConfigOptions.EgressSelectorConfig, + QPS: opts.GetConfigOptions.QPS, + Burst: opts.GetConfigOptions.Burst, + } + if opts.GetConfigOptions.Kubeconfig != "" { + getConfigOptions.Kubeconfig = &opts.GetConfigOptions.Kubeconfig + } + cfg, err := getter.GetConfig(ctx, getConfigOptions) if err != nil { return fmt.Errorf("error getting config: %w", err) } diff --git a/common/client/config/config.go b/common/client/config/config.go deleted file mode 100644 index 611e31b..0000000 --- a/common/client/config/config.go +++ /dev/null @@ -1,81 +0,0 @@ -// SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and IronCore contributors -// SPDX-License-Identifier: Apache-2.0 - -package config - -import ( - "context" - "fmt" - - "github.com/go-logr/logr" - "github.com/ironcore-dev/ironcore/utils/client/config" - "k8s.io/apiserver/pkg/server/egressselector" - "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" - ctrl "sigs.k8s.io/controller-runtime" -) - -// BrokerGetter is a lightweight config getter for broker components that only -// need a *rest.Config, without certificate rotation or CSR bootstrapping. -// -// It was previously provided by github.com/ironcore-dev/ironcore/utils/client/config -// and moved here when the brokers were split into their own repository. -type BrokerGetter struct { - name string - logConstructor func() logr.Logger - networkContext egressselector.NetworkContext -} - -// NewBrokerGetter creates a new BrokerGetter from the given options. -func NewBrokerGetter(opts config.GetterOptions) (*BrokerGetter, error) { - logConstructor := opts.LogConstructor - if logConstructor == nil { - l := ctrl.Log.WithName("client").WithName("config").WithValues("getter", opts.Name) - logConstructor = func() logr.Logger { return l } - } - return &BrokerGetter{ - name: opts.Name, - logConstructor: logConstructor, - networkContext: opts.NetworkContext, - }, nil -} - -// GetConfig returns a *rest.Config based on the given options. -func (bg *BrokerGetter) GetConfig(ctx context.Context, opts ...config.GetConfigOption) (*rest.Config, error) { - o := &config.GetConfigOptions{} - o.ApplyOptions(opts) - - if o.Kubeconfig != "" && o.KubeconfigSecretName != "" { - return nil, fmt.Errorf("cannot specify kubeconfig and kubeconfig-secret-name") - } - - bg.logConstructor().Info("Getting config") - - loader, err := config.LoaderFromOptions(o) - if err != nil { - return nil, fmt.Errorf("error getting loader: %w", err) - } - - var cfg *rest.Config - if loader != nil { - cfg, err = loader.Load(ctx, &clientcmd.ConfigOverrides{ - CurrentContext: o.Context, - }) - } else { - cfg, err = config.LoadDefaultConfig(o.Context) - } - if err != nil { - return nil, err - } - - dialFunc, err := config.GetEgressSelectorDial(bg.networkContext, o.EgressSelectorConfig) - if err != nil { - return nil, err - } - - cfg.Dial = dialFunc - cfg.QPS = o.QPS - cfg.Burst = o.Burst - - return cfg, nil -} diff --git a/go.mod b/go.mod index 795cefc..a96ccc6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/go-chi/chi/v5 v5.5.0 github.com/go-logr/logr v1.4.4 - github.com/ironcore-dev/controller-utils v0.15.1 + github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 github.com/onsi/ginkgo/v2 v2.33.1 github.com/onsi/gomega v1.44.0 diff --git a/go.sum b/go.sum index 4411c92..fa8e8c3 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF2 github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/ironcore-dev/controller-utils v0.15.1 h1:m7ucpzQgMYBF8adnPTesmJ5Ca2lsXVJVKGJVhA1TVx8= -github.com/ironcore-dev/controller-utils v0.15.1/go.mod h1:E/3nSv9TxRtSGpejWMwLTxbb9fknTcPhcA8moHXa0sY= +github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc h1:kfjRfO8LT5Td/1HJ4sjn684vikDOqe0HrWc9ZT1VcHc= +github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc/go.mod h1:E/3nSv9TxRtSGpejWMwLTxbb9fknTcPhcA8moHXa0sY= github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 h1:/EDdIi+hDurZy1zJCNprTWaqZQDAg4mo5wW7s78PXUk= github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904/go.mod h1:LkAjBGMMwMgomdJK1MqwRyK1IWjMraIZ4NmUxWL24F4= github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE= diff --git a/machinebroker/client/config/getter.go b/machinebroker/client/config/getter.go index 47c299f..b7e7c4f 100644 --- a/machinebroker/client/config/getter.go +++ b/machinebroker/client/config/getter.go @@ -6,22 +6,21 @@ package config import ( "os" - brokerconfig "github.com/ironcore-dev/brokers/common/client/config" - "github.com/ironcore-dev/ironcore/utils/client/config" + configutils "github.com/ironcore-dev/controller-utils/configutils" "k8s.io/apiserver/pkg/server/egressselector" ctrl "sigs.k8s.io/controller-runtime" ) var log = ctrl.Log.WithName("client").WithName("config") -func NewGetter() (*brokerconfig.BrokerGetter, error) { - return brokerconfig.NewBrokerGetter(config.GetterOptions{ +func NewGetter() (*configutils.Getter, error) { + return configutils.NewGetter(configutils.GetterOptions{ Name: "machinebroker", NetworkContext: egressselector.ControlPlane.AsNetworkContext(), }) } -func NewGetterOrDie() *brokerconfig.BrokerGetter { +func NewGetterOrDie() *configutils.Getter { getter, err := NewGetter() if err != nil { log.Error(err, "Error creating getter") diff --git a/machinebroker/cmd/machinebroker/app/app.go b/machinebroker/cmd/machinebroker/app/app.go index 50bca52..1373df1 100644 --- a/machinebroker/cmd/machinebroker/app/app.go +++ b/machinebroker/cmd/machinebroker/app/app.go @@ -23,6 +23,7 @@ import ( mchinebrokerconfig "github.com/ironcore-dev/brokers/machinebroker/client/config" machinebrokerhttp "github.com/ironcore-dev/brokers/machinebroker/http" "github.com/ironcore-dev/brokers/machinebroker/server" + configutils "github.com/ironcore-dev/controller-utils/configutils" iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1" "github.com/ironcore-dev/ironcore/utils/client/config" @@ -95,7 +96,16 @@ func Run(ctx context.Context, opts Options) error { return fmt.Errorf("error creating new getter: %w", err) } - cfg, err := getter.GetConfig(ctx, &opts.GetConfigOptions) + getConfigOptions := &configutils.GetConfigOptions{ + Context: opts.GetConfigOptions.Context, + EgressSelectorConfig: opts.GetConfigOptions.EgressSelectorConfig, + QPS: opts.GetConfigOptions.QPS, + Burst: opts.GetConfigOptions.Burst, + } + if opts.GetConfigOptions.Kubeconfig != "" { + getConfigOptions.Kubeconfig = &opts.GetConfigOptions.Kubeconfig + } + cfg, err := getter.GetConfig(ctx, getConfigOptions) if err != nil { return fmt.Errorf("error getting config: %w", err) } diff --git a/volumebroker/client/config/getter.go b/volumebroker/client/config/getter.go index 4878044..a890cb4 100644 --- a/volumebroker/client/config/getter.go +++ b/volumebroker/client/config/getter.go @@ -6,22 +6,21 @@ package config import ( "os" - brokerconfig "github.com/ironcore-dev/brokers/common/client/config" - "github.com/ironcore-dev/ironcore/utils/client/config" + configutils "github.com/ironcore-dev/controller-utils/configutils" "k8s.io/apiserver/pkg/server/egressselector" ctrl "sigs.k8s.io/controller-runtime" ) var log = ctrl.Log.WithName("client").WithName("config") -func NewGetter() (*brokerconfig.BrokerGetter, error) { - return brokerconfig.NewBrokerGetter(config.GetterOptions{ +func NewGetter() (*configutils.Getter, error) { + return configutils.NewGetter(configutils.GetterOptions{ Name: "volumebroker", NetworkContext: egressselector.ControlPlane.AsNetworkContext(), }) } -func NewGetterOrDie() *brokerconfig.BrokerGetter { +func NewGetterOrDie() *configutils.Getter { getter, err := NewGetter() if err != nil { log.Error(err, "Error creating getter") diff --git a/volumebroker/cmd/volumebroker/app/app.go b/volumebroker/cmd/volumebroker/app/app.go index 288b9aa..0e7a643 100644 --- a/volumebroker/cmd/volumebroker/app/app.go +++ b/volumebroker/cmd/volumebroker/app/app.go @@ -16,6 +16,7 @@ import ( "github.com/ironcore-dev/brokers/common" volumebrokerconfig "github.com/ironcore-dev/brokers/volumebroker/client/config" "github.com/ironcore-dev/brokers/volumebroker/server" + configutils "github.com/ironcore-dev/controller-utils/configutils" iri "github.com/ironcore-dev/ironcore/iri/apis/volume/v1alpha1" "github.com/ironcore-dev/ironcore/utils/client/config" @@ -83,7 +84,16 @@ func Run(ctx context.Context, opts Options) error { return fmt.Errorf("error creating new getter: %w", err) } - cfg, err := getter.GetConfig(ctx, &opts.GetConfigOptions) + getConfigOptions := &configutils.GetConfigOptions{ + Context: opts.GetConfigOptions.Context, + EgressSelectorConfig: opts.GetConfigOptions.EgressSelectorConfig, + QPS: opts.GetConfigOptions.QPS, + Burst: opts.GetConfigOptions.Burst, + } + if opts.GetConfigOptions.Kubeconfig != "" { + getConfigOptions.Kubeconfig = &opts.GetConfigOptions.Kubeconfig + } + cfg, err := getter.GetConfig(ctx, getConfigOptions) if err != nil { return fmt.Errorf("error getting config: %w", err) } From adc5c5055fc8ae73c16c0fdea862840cfe89366f Mon Sep 17 00:00:00 2001 From: Rohit Kumar Date: Mon, 9 Nov 2026 10:53:31 +0530 Subject: [PATCH 2/2] pin controller-utils version to v0.15.1 Signed-off-by: Rohit Kumar --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a96ccc6..795cefc 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/go-chi/chi/v5 v5.5.0 github.com/go-logr/logr v1.4.4 - github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc + github.com/ironcore-dev/controller-utils v0.15.1 github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 github.com/onsi/ginkgo/v2 v2.33.1 github.com/onsi/gomega v1.44.0 diff --git a/go.sum b/go.sum index fa8e8c3..4411c92 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF2 github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc h1:kfjRfO8LT5Td/1HJ4sjn684vikDOqe0HrWc9ZT1VcHc= -github.com/ironcore-dev/controller-utils v0.15.1-0.20261022123004-2349ba75c7bc/go.mod h1:E/3nSv9TxRtSGpejWMwLTxbb9fknTcPhcA8moHXa0sY= +github.com/ironcore-dev/controller-utils v0.15.1 h1:m7ucpzQgMYBF8adnPTesmJ5Ca2lsXVJVKGJVhA1TVx8= +github.com/ironcore-dev/controller-utils v0.15.1/go.mod h1:E/3nSv9TxRtSGpejWMwLTxbb9fknTcPhcA8moHXa0sY= github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 h1:/EDdIi+hDurZy1zJCNprTWaqZQDAg4mo5wW7s78PXUk= github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904/go.mod h1:LkAjBGMMwMgomdJK1MqwRyK1IWjMraIZ4NmUxWL24F4= github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=