KIM Integration - provisioner client removed from runtime reconciler (

kyma-project#1123) * provisioner client removed * linter --------- Co-authored-by: Piotr Miśkiewicz <[email protected]>
ukff · Sep 12, 2024 · 8408e12 · 8408e12
1 parent b0dfd5a
commit 8408e12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/cmd/runtimereconciler/main.go b/cmd/runtimereconciler/main.go
@@ -7,7 +7,6 @@ import (
 	btpmanager "github.com/kyma-project/kyma-environment-broker/internal/btpmanager/credentials"
 	"github.com/kyma-project/kyma-environment-broker/internal/events"
 	"github.com/kyma-project/kyma-environment-broker/internal/process/input"
-	"github.com/kyma-project/kyma-environment-broker/internal/provisioner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/sirupsen/logrus"
 	"github.com/vrischmann/envconfig"
@@ -61,9 +60,7 @@ func main() {
 	kcpK8sClient, err := client.New(kcpK8sConfig, client.Options{})
 	fatalOnError(err, logs)
 
-	provisionerClient := provisioner.NewProvisionerClient(cfg.Provisioner.URL, false, logs.WithField("service", "provisioner"))
-
-	btpOperatorManager := btpmanager.NewManager(ctx, kcpK8sClient, db.Instances(), logs, cfg.DryRun, provisionerClient)
+	btpOperatorManager := btpmanager.NewManager(ctx, kcpK8sClient, db.Instances(), logs, cfg.DryRun)
 
 	logs.Infof("job enabled? %t", cfg.JobEnabled)
 	if cfg.JobEnabled {

diff --git a/internal/btpmanager/credentials/manager.go b/internal/btpmanager/credentials/manager.go
@@ -10,7 +10,6 @@ import (
 	"github.com/kyma-project/kyma-environment-broker/internal/kubeconfig"
 
 	"github.com/kyma-project/kyma-environment-broker/internal"
-	"github.com/kyma-project/kyma-environment-broker/internal/provisioner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel"
 	"github.com/sirupsen/logrus"
@@ -58,18 +57,16 @@ type Manager struct {
 	instances         storage.Instances
 	kcpK8sClient      client.Client
 	dryRun            bool
-	provisioner       provisioner.Client
 	k8sClientProvider K8sClientProvider
 	logger            *logrus.Logger
 }
 
-func NewManager(ctx context.Context, kcpK8sClient client.Client, instanceDb storage.Instances, logs *logrus.Logger, dryRun bool, provisioner provisioner.Client) *Manager {
+func NewManager(ctx context.Context, kcpK8sClient client.Client, instanceDb storage.Instances, logs *logrus.Logger, dryRun bool) *Manager {
 	return &Manager{
 		ctx:               ctx,
 		instances:         instanceDb,
 		kcpK8sClient:      kcpK8sClient,
 		dryRun:            dryRun,
-		provisioner:       provisioner,
 		logger:            logs,
 		k8sClientProvider: kubeconfig.NewK8sClientFromSecretProvider(kcpK8sClient),
 	}

diff --git a/internal/btpmanager/credentials/manager_test.go b/internal/btpmanager/credentials/manager_test.go
@@ -12,7 +12,6 @@ import (
 
 	uuid2 "github.com/google/uuid"
 	"github.com/kyma-project/kyma-environment-broker/internal"
-	"github.com/kyma-project/kyma-environment-broker/internal/provisioner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel"
 	"github.com/sirupsen/logrus"
@@ -66,7 +65,7 @@ func InitEnvironment(ctx context.Context, t *testing.T) *Environment {
 	}
 
 	newEnvironment.createTestData()
-	newEnvironment.manager = NewManager(ctx, newEnvironment.kcp, newEnvironment.kebDb.Instances(), logs, false, provisioner.NewFakeClient())
+	newEnvironment.manager = NewManager(ctx, newEnvironment.kcp, newEnvironment.kebDb.Instances(), logs, false)
 	newEnvironment.job = NewJob(newEnvironment.manager, logs)
 	newEnvironment.assertThatCorrectNumberOfInstancesExists()
 	return newEnvironment