diff --git a/go.mod b/go.mod index 08d43ee..e7ec56b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.6 require ( github.com/pkg/errors v0.9.1 - github.com/sap/component-operator-runtime v0.2.8 + github.com/sap/component-operator-runtime v0.3.0 k8s.io/apiextensions-apiserver v0.28.4 k8s.io/apimachinery v0.28.4 k8s.io/client-go v0.28.4 diff --git a/go.sum b/go.sum index 9353abb..5e844b0 100644 --- a/go.sum +++ b/go.sum @@ -127,22 +127,8 @@ github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+Pymzi github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/sap/component-operator-runtime v0.2.3 h1:eA7W5qtJWyKWPzORqzwAHmuuP7QZqolMsthMJfBDHBA= -github.com/sap/component-operator-runtime v0.2.3/go.mod h1:HQ7wgyk8/2/9J/E5snXUy4U98Z/kc6fbooY/jlkycSQ= -github.com/sap/component-operator-runtime v0.2.4 h1:ijkHbH4+OVwNcEXL/lm9EhcsQlzMKJJtiD6vphtZyLU= -github.com/sap/component-operator-runtime v0.2.4/go.mod h1:VcdffUc3ukYoBDvbhQ9KdtTJJTh3TNurG4Aj99xQfdo= -github.com/sap/component-operator-runtime v0.2.5 h1:JFi52ixTcQ70rj5gu6/mjissSrH+x/4cUiw+0UVZ3eo= -github.com/sap/component-operator-runtime v0.2.5/go.mod h1:VcdffUc3ukYoBDvbhQ9KdtTJJTh3TNurG4Aj99xQfdo= -github.com/sap/component-operator-runtime v0.2.6 h1:9RECYBr6B1sn4F7Od37g/5fOltmM5rBK3503JRxvElU= -github.com/sap/component-operator-runtime v0.2.6/go.mod h1:VcdffUc3ukYoBDvbhQ9KdtTJJTh3TNurG4Aj99xQfdo= -github.com/sap/component-operator-runtime v0.2.7 h1:OTxOnLC1QOzFge0GCgy9M+GyOl56e85pBOj/sfhtRYQ= -github.com/sap/component-operator-runtime v0.2.7/go.mod h1:VcdffUc3ukYoBDvbhQ9KdtTJJTh3TNurG4Aj99xQfdo= -github.com/sap/component-operator-runtime v0.2.8 h1:XGpWxNmI9EYzOXfUWFpG9+qjMAGd7cyOh7vlh0zGEdI= -github.com/sap/component-operator-runtime v0.2.8/go.mod h1:LUjZBNtmPooMqKDmHFJe3jB7p+XntKxRVkLVJrSB6w4= -github.com/sap/go-generics v0.1.8 h1:S16/8Qxk0vytuKQamXYd7RysQpHpsnnsPNL3Q7g8uZU= -github.com/sap/go-generics v0.1.8/go.mod h1:9ywvA4XyTaPSayzstFXt9c+lYn/++TRQ0iW6z+vfnu0= -github.com/sap/go-generics v0.1.9 h1:oiZ11empOCsmHPHLEwQ2Yfn5fnfqjd2l6hzzYu73ewg= -github.com/sap/go-generics v0.1.9/go.mod h1:P0+/APImYIlDC3RkF43EVj12aoYBks29dMTbPotqdso= +github.com/sap/component-operator-runtime v0.3.0 h1:CaEU2BiqNkDR3X6gKeYZ0U8Qqut0z5KHFMhG7LI89Qk= +github.com/sap/component-operator-runtime v0.3.0/go.mod h1:LUjZBNtmPooMqKDmHFJe3jB7p+XntKxRVkLVJrSB6w4= github.com/sap/go-generics v0.1.10 h1:1dc/6WiS6kYoSk8s+slwJTU+zOt5U5gPOV+pAZmhhzg= github.com/sap/go-generics v0.1.10/go.mod h1:P0+/APImYIlDC3RkF43EVj12aoYBks29dMTbPotqdso= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= diff --git a/internal/generator/generator.go b/internal/generator/generator.go index 670c5ce..d4f6862 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -11,7 +11,6 @@ import ( "io/fs" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/client-go/discovery" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/sap/component-operator-runtime/pkg/manifests" @@ -22,8 +21,8 @@ type ResourceGenerator struct { generator *manifests.HelmGenerator } -func NewResourceGenerator(name string, fsys fs.FS, chartPath string, client client.Client, discoveryClient discovery.DiscoveryInterface) (*ResourceGenerator, error) { - generator, err := manifests.NewHelmGenerator(name, fsys, chartPath, client, discoveryClient) +func NewResourceGenerator(fsys fs.FS, chartPath string, client client.Client) (*ResourceGenerator, error) { + generator, err := manifests.NewHelmGenerator(fsys, chartPath, client) if err != nil { return nil, err } diff --git a/main.go b/main.go index 2a9e7f5..ac3b799 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,6 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/discovery" clientgoscheme "k8s.io/client-go/kubernetes/scheme" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ctrl "sigs.k8s.io/controller-runtime" @@ -82,13 +81,7 @@ func main() { os.Exit(1) } - discoveryClient, err := discovery.NewDiscoveryClientForConfig(mgr.GetConfig()) - if err != nil { - setupLog.Error(err, "error creating discovery client") - os.Exit(1) - } - - if err := operator.Setup(mgr, discoveryClient); err != nil { + if err := operator.Setup(mgr); err != nil { setupLog.Error(err, "error registering controller with manager") os.Exit(1) } diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 8761c71..ffa9c3d 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -12,7 +12,6 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/discovery" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -59,8 +58,8 @@ func GetUncacheableTypes() []client.Object { return defaultOperator.GetUncacheableTypes() } -func Setup(mgr ctrl.Manager, discoveryClient discovery.DiscoveryInterface) error { - return defaultOperator.Setup(mgr, discoveryClient) +func Setup(mgr ctrl.Manager) error { + return defaultOperator.Setup(mgr) } func New() *Operator { @@ -94,13 +93,11 @@ func (o *Operator) GetUncacheableTypes() []client.Object { return []client.Object{&operatorv1alpha1.CertManager{}} } -func (o *Operator) Setup(mgr ctrl.Manager, discoveryClient discovery.DiscoveryInterface) error { +func (o *Operator) Setup(mgr ctrl.Manager) error { resourceGenerator, err := generator.NewResourceGenerator( - Name, data, "data/charts/cert-manager", mgr.GetClient(), - discoveryClient, ) if err != nil { return errors.Wrap(err, "error initializing resource generator") @@ -108,11 +105,8 @@ func (o *Operator) Setup(mgr ctrl.Manager, discoveryClient discovery.DiscoveryIn if err := component.NewReconciler[*operatorv1alpha1.CertManager]( o.options.Name, - mgr.GetClient(), - discoveryClient, - mgr.GetEventRecorderFor(o.options.Name), - mgr.GetScheme(), resourceGenerator, + component.ReconcilerOptions{}, ).SetupWithManager(mgr); err != nil { return errors.Wrapf(err, "unable to create controller") }