fix: rbac (#132)

bentoml · Nov 29, 2023 · 574531d · 574531d
1 parent 9903eee
commit 574531d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/controllers/bentodeployment_controller.go b/controllers/bentodeployment_controller.go
@@ -634,23 +634,34 @@ func (r *BentoDeploymentReconciler) setStatusConditions(ctx context.Context, req
 	return
 }
 
+var cachedYataiConf *commonconfig.YataiConfig
+
 func (r *BentoDeploymentReconciler) getYataiClient(ctx context.Context) (yataiClient **yataiclient.YataiClient, clusterName *string, err error) {
-	yataiConf, err := commonconfig.GetYataiConfig(ctx, func(ctx context.Context, namespace, name string) (*corev1.Secret, error) {
-		secret := &corev1.Secret{}
-		err = r.Get(ctx, types.NamespacedName{
-			Namespace: namespace,
-			Name:      name,
-		}, secret)
-		return secret, errors.Wrap(err, "get secret")
-	}, commonconsts.YataiDeploymentComponentName, false)
-	isNotFound := k8serrors.IsNotFound(err)
-	if err != nil && !isNotFound {
-		err = errors.Wrap(err, "get yatai config")
+	restConfig := config.GetConfigOrDie()
+	clientset, err := kubernetes.NewForConfig(restConfig)
+	if err != nil {
+		err = errors.Wrapf(err, "create kubernetes clientset")
 		return
 	}
+	var yataiConf *commonconfig.YataiConfig
 
-	if isNotFound {
-		return
+	if cachedYataiConf != nil {
+		yataiConf = cachedYataiConf
+	} else {
+		yataiConf, err = commonconfig.GetYataiConfig(ctx, func(ctx context.Context, namespace, name string) (*corev1.Secret, error) {
+			secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, name, metav1.GetOptions{})
+			return secret, errors.Wrap(err, "get secret")
+		}, commonconsts.YataiDeploymentComponentName, false)
+		isNotFound := k8serrors.IsNotFound(err)
+		if err != nil && !isNotFound {
+			err = errors.Wrap(err, "get yatai config")
+			return
+		}
+
+		if isNotFound {
+			return
+		}
+		cachedYataiConf = yataiConf
 	}
 
 	yataiEndpoint := yataiConf.Endpoint
@@ -3041,12 +3052,15 @@ func (r *BentoDeploymentReconciler) doRegisterYataiComponent() (err error) {
 
 	yataiClient_ := *yataiClient
 
+	restConfig := config.GetConfigOrDie()
+	clientset, err := kubernetes.NewForConfig(restConfig)
+	if err != nil {
+		err = errors.Wrapf(err, "create kubernetes clientset")
+		return
+	}
+
 	namespace, err := commonconfig.GetYataiDeploymentNamespace(ctx, func(ctx context.Context, namespace, name string) (*corev1.Secret, error) {
-		secret := &corev1.Secret{}
-		err := r.Get(ctx, types.NamespacedName{
-			Namespace: namespace,
-			Name:      name,
-		}, secret)
+		secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, name, metav1.GetOptions{})
 		return secret, errors.Wrap(err, "get secret")
 	})
 	if err != nil {

diff --git a/main.go b/main.go
@@ -110,21 +110,19 @@ func main() {
 			setupLog.Error(err, "unable to start manager")
 			os.Exit(1)
 		}
-		namespaces := bentoDeploymentNamespaces
-		namespaces = append(namespaces, commonconfig.GetYataiSystemNamespaceFromEnv())
-		ctrlOptions.NewCache = cache.MultiNamespacedCacheBuilder(namespaces)
-		setupLog.Info("starting manager", "cached namespaces", namespaces)
+		ctrlOptions.NewCache = cache.MultiNamespacedCacheBuilder(bentoDeploymentNamespaces)
+		setupLog.Info("starting manager", "bento deployment namespaces", bentoDeploymentNamespaces)
 	} else {
 		setupLog.Info("starting manager", "bento deployment namespaces", "all")
 	}
 
-	mgr, err := ctrl.NewManager(restConf, ctrlOptions)
+	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrlOptions)
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
 
-	discoveryClient, err := discovery.NewDiscoveryClientForConfig(restConf)
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(ctrl.GetConfigOrDie())
 	if err != nil {
 		setupLog.Error(err, "unable to create discovery client")
 		os.Exit(1)