Provisioning: move job operator to enterprise and enable PR worker (grafana#111663)

Author: ferruvich

.gitignore

@@ -130,6 +130,9 @@ profile.cov
 /public/app/extensions
 !/public/app/extensions/.keep
 
+# Enterprise operators
+/pkg/operators/enterprise_*
+/pkg/operators/**/enterprise_*
 
 debug.test
 /examples/*/dist

pkg/operators/provisioning/config.go

@@ -33,11 +33,13 @@ import (
 
 // provisioningControllerConfig contains the configuration that overlaps for the jobs and repo controllers
 type provisioningControllerConfig struct {
-	provisioningClient *client.Clientset
-	resyncInterval     time.Duration
-	repoFactory        repository.Factory
-	unified            resources.ResourceStore
-	clients            resources.ClientFactory
+	provisioningClient  *client.Clientset
+	resyncInterval      time.Duration
+	repoFactory         repository.Factory
+	unified             resources.ResourceStore
+	clients             resources.ClientFactory
+	tokenExchangeClient *authn.TokenExchangeClient
+	tlsConfig           rest.TLSClientConfig
 }
 
 // expects:
@@ -179,11 +181,13 @@ func setupFromConfig(cfg *setting.Cfg, registry prometheus.Registerer) (controll
 	clients := resources.NewClientFactoryForMultipleAPIServers(configProviders)
 
 	return &provisioningControllerConfig{
-		provisioningClient: provisioningClient,
-		repoFactory:        repoFactory,
-		unified:            unified,
-		clients:            clients,
-		resyncInterval:     operatorSec.Key("resync_interval").MustDuration(60 * time.Second),
+		provisioningClient:  provisioningClient,
+		repoFactory:         repoFactory,
+		unified:             unified,
+		clients:             clients,
+		resyncInterval:      operatorSec.Key("resync_interval").MustDuration(60 * time.Second),
+		tokenExchangeClient: tokenExchangeClient,
+		tlsConfig:           tlsConfig,
 	}, nil
 }
 

pkg/operators/provisioning/jobs_operator.go

@@ -7,12 +7,6 @@ import (
 )
 
 func init() {
-	server.RegisterOperator(server.Operator{
-		Name:        "provisioning-jobs",
-		Description: "Watch provisioning jobs and manage job history cleanup",
-		RunFunc:     provisioning.RunJobController,
-	})
-
 	server.RegisterOperator(server.Operator{
 		Name:        "provisioning-repo",
 		Description: "Watch provisioning repositories",

pkg/operators/register.go

@@ -55,11 +55,11 @@ type fileChangeInfo struct {
 type evaluator struct {
 	render      ScreenshotRenderer
 	parsers     resources.ParserFactory
-	urlProvider func(namespace string) string
+	urlProvider func(ctx context.Context, namespace string) string
 	metrics     screenshotMetrics
 }
 
-func NewEvaluator(render ScreenshotRenderer, parsers resources.ParserFactory, urlProvider func(namespace string) string, registry prometheus.Registerer) Evaluator {
+func NewEvaluator(render ScreenshotRenderer, parsers resources.ParserFactory, urlProvider func(ctx context.Context, namespace string) string, registry prometheus.Registerer) Evaluator {
 	metrics := registerScreenshotMetrics(registry)
 	return &evaluator{
 		render:      render,
@@ -80,7 +80,7 @@ func (e *evaluator) Evaluate(ctx context.Context, repo repository.Reader, opts p
 	rendererAvailable := e.render.IsAvailable(ctx)
 	shouldRender := rendererAvailable && len(changes) == 1 && cfg.Spec.GitHub.GenerateDashboardPreviews
 	info := changeInfo{
-		GrafanaBaseURL:       e.urlProvider(cfg.Namespace),
+		GrafanaBaseURL:       e.urlProvider(ctx, cfg.Namespace),
 		MissingImageRenderer: !rendererAvailable,
 	}
 

pkg/registry/apis/provisioning/webhooks/pullrequest/changes.go

@@ -754,7 +754,7 @@ func TestCalculateChanges(t *testing.T) {
 
 			tt.setupMocks(parser, reader, progress, renderer, parserFactory)
 
-			evaluator := NewEvaluator(renderer, parserFactory, func(_ string) string {
+			evaluator := NewEvaluator(renderer, parserFactory, func(_ context.Context, _ string) string {
 				if tt.grafanaBaseURL != "" {
 					return tt.grafanaBaseURL
 				}

pkg/registry/apis/provisioning/webhooks/pullrequest/changes_test.go

@@ -28,7 +28,7 @@ func ProvidePullRequestWorker(
 	configProvider apiserver.RestConfigProvider,
 	registry prometheus.Registerer,
 ) *PullRequestWorker {
-	urlProvider := func(_ string) string {
+	urlProvider := func(_ context.Context, _ string) string {
 		return cfg.AppURL
 	}
 

pkg/registry/apis/provisioning/webhooks/pullrequest/worker.go

@@ -26,7 +26,7 @@ import (
 type WebhookExtraBuilder struct {
 	provisioningapis.ExtraBuilder
 	isPublic    bool
-	urlProvider func(namespace string) string
+	urlProvider func(ctx context.Context, namespace string) string
 }
 
 // FIXME: separate the URL provider from connector to simplify operators
@@ -38,7 +38,7 @@ func (b *WebhookExtraBuilder) WebhookURL(ctx context.Context, r *provisioning.Re
 	gvr := provisioning.RepositoryResourceInfo.GroupVersionResource()
 	webhookURL := fmt.Sprintf(
 		"%sapis/%s/%s/namespaces/%s/%s/%s/webhook",
-		b.urlProvider(r.GetNamespace()),
+		b.urlProvider(ctx, r.GetNamespace()),
 		gvr.Group,
 		gvr.Version,
 		r.GetNamespace(),
@@ -66,10 +66,10 @@ func ProvideWebhooksWithImages(
 	configProvider apiserver.RestConfigProvider,
 	registry prometheus.Registerer,
 ) *WebhookExtraBuilder {
-	urlProvider := func(_ string) string {
+	urlProvider := func(_ context.Context, _ string) string {
 		return cfg.AppURL
 	}
-	isPublic := isPublicURL(urlProvider(""))
+	isPublic := isPublicURL(urlProvider(context.Background(), ""))
 
 	return &WebhookExtraBuilder{
 		isPublic:    isPublic,
@@ -102,11 +102,11 @@ func ProvideWebhooksWithImages(
 }
 
 func ProvideWebhooks(provisioningURL string, registry prometheus.Registerer) *WebhookExtraBuilder {
-	urlProvider := func(_ string) string {
+	urlProvider := func(_ context.Context, _ string) string {
 		return provisioningURL
 	}
 
-	isPublic := isPublicURL(urlProvider(""))
+	isPublic := isPublicURL(urlProvider(context.Background(), ""))
 
 	return &WebhookExtraBuilder{
 		isPublic:    isPublic,
@@ -131,7 +131,7 @@ type WebhookExtraWithImages struct {
 func NewWebhookExtraWithImages(
 	render *renderConnector,
 	webhook *webhookConnector,
-	urlProvider func(namespace string) string,
+	urlProvider func(ctx context.Context, namespace string) string,
 	workers []jobs.Worker,
 ) *WebhookExtraWithImages {
 	return &WebhookExtraWithImages{