Skip to content

Commit becd47a

Browse files
authored
Start workload controller if scanner is installed (#194)
Signed-off-by: Tamal Saha <[email protected]>
1 parent 6613d83 commit becd47a

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

pkg/apiserver/apiserver.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
scannerscheme "kubeops.dev/scanner/client/clientset/versioned/scheme"
2828
identityinstall "kubeops.dev/ui-server/apis/identity/install"
2929
identityv1alpha1 "kubeops.dev/ui-server/apis/identity/v1alpha1"
30-
scannercontrollers "kubeops.dev/ui-server/pkg/controllers/scanner"
3130
"kubeops.dev/ui-server/pkg/graph"
3231
"kubeops.dev/ui-server/pkg/menu"
3332
"kubeops.dev/ui-server/pkg/metricshandler"
@@ -187,6 +186,10 @@ func (c completedConfig) New(ctx context.Context) (*UIServer, error) {
187186
log.SetLogger(klogr.New())
188187
setupLog := log.Log.WithName("setup")
189188

189+
if !c.ExtraConfig.DisableImageCache {
190+
shared.InitImageCache(c.ExtraConfig.CacheSize, c.ExtraConfig.CacheTTL)
191+
}
192+
190193
cfg := c.ExtraConfig.ClientConfig
191194
mgr, err := manager.New(cfg, manager.Options{
192195
Scheme: Scheme,
@@ -240,17 +243,6 @@ func (c completedConfig) New(ctx context.Context) (*UIServer, error) {
240243
os.Exit(1)
241244
}
242245

243-
if !c.ExtraConfig.DisableImageCache {
244-
shared.InitImageCache(c.ExtraConfig.CacheSize, c.ExtraConfig.CacheTTL)
245-
}
246-
247-
if err = (&scannercontrollers.WorkloadReconciler{
248-
Client: mgr.GetClient(),
249-
}).SetupWithManager(mgr); err != nil {
250-
setupLog.Error(err, "unable to create controller", "controller", "Workload")
251-
os.Exit(1)
252-
}
253-
254246
s := &UIServer{
255247
GenericAPIServer: genericServer,
256248
Manager: mgr,

pkg/graph/setup.go

+12
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import (
2222
"strings"
2323
"time"
2424

25+
scannerapi "kubeops.dev/scanner/apis/scanner/v1alpha1"
26+
scannercontrollers "kubeops.dev/ui-server/pkg/controllers/scanner"
27+
2528
"github.com/graphql-go/graphql"
2629
"github.com/pkg/errors"
2730
"gomodules.xyz/sets"
@@ -108,6 +111,15 @@ func SetupGraphReconciler(mgr manager.Manager) func(ctx context.Context) error {
108111
}).SetupWithManager(mgr); err != nil {
109112
return err
110113
}
114+
115+
if rid.Group == scannerapi.SchemeGroupVersion.Group &&
116+
rid.Kind == scannerapi.ResourceKindImageScanRequest {
117+
if err := (&scannercontrollers.WorkloadReconciler{
118+
Client: mgr.GetClient(),
119+
}).SetupWithManager(mgr); err != nil {
120+
return err
121+
}
122+
}
111123
}
112124
return nil
113125
}

0 commit comments

Comments
 (0)