From 2be1a80d9275634552ccdbda14263d09af77eec5 Mon Sep 17 00:00:00 2001
From: niravparikh05 <nir.parikh05@gmail.com>
Date: Tue, 12 Apr 2022 15:44:43 +0530
Subject: [PATCH] removing leader election

---
 main.go                | 19 +------------------
 pkg/service/project.go |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/main.go b/main.go
index 4eed1b8..15c60d7 100644
--- a/main.go
+++ b/main.go
@@ -20,7 +20,6 @@ import (
 	"github.com/RafayLabs/rcloud-base/pkg/enforcer"
 	"github.com/RafayLabs/rcloud-base/pkg/gateway"
 	"github.com/RafayLabs/rcloud-base/pkg/grpc"
-	"github.com/RafayLabs/rcloud-base/pkg/leaderelection"
 	"github.com/RafayLabs/rcloud-base/pkg/log"
 	"github.com/RafayLabs/rcloud-base/pkg/notify"
 	"github.com/RafayLabs/rcloud-base/pkg/reconcile"
@@ -35,7 +34,6 @@ import (
 	"github.com/RafayLabs/rcloud-base/server"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	kclient "github.com/ory/kratos-client-go"
-	"github.com/rs/xid"
 	"github.com/spf13/viper"
 	"github.com/uptrace/bun"
 	"github.com/uptrace/bun/dialect/pgdialect"
@@ -194,7 +192,7 @@ func setup() {
 	// cd relay
 	viper.SetDefault(coreCDRelayUserHostEnv, "*.user.cdrelay.rafay.local:10012")
 	viper.SetDefault(coreCDRelayConnectorHostEnv, "*.core-connector.cdrelay.rafay.local:10012")
-	viper.SetDefault(schedulerNamespaceEnv, "rafay-system")
+	viper.SetDefault(schedulerNamespaceEnv, "default")
 
 	// kratos
 	viper.SetDefault(kratosAddrEnv, "http://localhost:4433")
@@ -629,21 +627,6 @@ func runEventHandlers(wg *sync.WaitGroup, ctx context.Context) {
 	// listen to cluster events
 	cs.AddEventHandler(ceh.ClusterHook())
 
-	if !dev {
-		rl, err := leaderelection.NewConfigMapLock("rcloud-base-config", schedulerNamespace, xid.New().String())
-		if err != nil {
-			_log.Fatalw("unable to create configmap lock", "error", err)
-		}
-		go func() {
-			err := leaderelection.Run(rl, func(stop <-chan struct{}) {
-			}, ctx.Done())
-
-			if err != nil {
-				_log.Fatalw("unable to run leader election", "error", err)
-			}
-		}()
-	}
-
 	<-ctx.Done()
 }
 
diff --git a/pkg/service/project.go b/pkg/service/project.go
index 609fcd7..175e691 100644
--- a/pkg/service/project.go
+++ b/pkg/service/project.go
@@ -535,7 +535,7 @@ func (s *projectService) createProjectAccountRelations(ctx context.Context, db b
 	var parrs []models.ProjectAccountResourcerole
 	var ugs []*authzv1.Policy
 
-	for _, ur := range project.Spec.UserRoles {
+	for _, ur := range project.GetSpec().GetUserRoles() {
 		// FIXME: do combined lookup
 		entity, err := dao.GetIdByTraits(ctx, db, ur.User, &models.KratosIdentities{})
 		if err != nil {