Move http init to Reconcile

Signed-off-by: ivinokur <[email protected]>
devfile · May 7, 2024 · 429ec8a · 429ec8a
1 parent 1db4598
commit 429ec8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
@@ -18,7 +18,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -115,6 +114,8 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		Ctx:              ctx,
 	}
 
+	setupHttpClients(r.Client, r.Log)
+
 	// Fetch the Workspace instance
 	rawWorkspace := &dw.DevWorkspace{}
 	err = r.Get(ctx, req.NamespacedName, rawWorkspace)
@@ -669,25 +670,17 @@ func (r *DevWorkspaceReconciler) getWorkspaceId(ctx context.Context, workspace *
 }
 
 func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	setupHttpClients(mgr.GetClient(), r.Log)
 	maxConcurrentReconciles, err := wkspConfig.GetMaxConcurrentReconciles()
 	if err != nil {
 		return err
 	}
 
-	var certificatesHandler = func(obj client.Object) []reconcile.Request {
-		certs, ok := readCertificates(mgr.GetClient(), r.Log)
-		if ok {
-			for _, certsPem := range certs {
-				injectCertificates([]byte(certsPem), httpClient.Transport.(*http.Transport))
-			}
-		}
+	var emptyMapper = func(obj client.Object) []reconcile.Request {
 		return []reconcile.Request{}
 	}
 
 	configWatcher := builder.WithPredicates(wkspConfig.Predicates())
 	automountWatcher := builder.WithPredicates(automountPredicates)
-	certificateWatcher := builder.WithPredicates(certificatePredicates)
 
 	// TODO: Set up indexing https://book.kubebuilder.io/cronjob-tutorial/controller-implementation.html#setup
 	return ctrl.NewControllerManagedBy(mgr).
@@ -707,9 +700,8 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&source.Kind{Type: &corev1.PersistentVolumeClaim{}}, handler.EnqueueRequestsFromMapFunc(r.dwPVCHandler)).
 		Watches(&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
 		Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
-		Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.certificateHandler), certificateWatcher).
 		Watches(&source.Kind{Type: &corev1.PersistentVolumeClaim{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
-		Watches(&source.Kind{Type: &controllerv1alpha1.DevWorkspaceOperatorConfig{}}, handler.EnqueueRequestsFromMapFunc(certificatesHandler), configWatcher).
+		Watches(&source.Kind{Type: &controllerv1alpha1.DevWorkspaceOperatorConfig{}}, handler.EnqueueRequestsFromMapFunc(emptyMapper), configWatcher).
 		WithEventFilter(devworkspacePredicates).
 		WithEventFilter(podPredicates).
 		Complete(r)

diff --git a/controllers/workspace/eventhandlers.go b/controllers/workspace/eventhandlers.go
@@ -15,8 +15,6 @@ package controllers
 
 import (
 	"context"
-	corev1 "k8s.io/api/core/v1"
-	"net/http"
 
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	wkspConfig "github.com/devfile/devworkspace-operator/pkg/config"
@@ -108,10 +106,3 @@ func (r *DevWorkspaceReconciler) runningWorkspacesHandler(obj client.Object) []r
 	}
 	return reconciles
 }
-
-func (r *DevWorkspaceReconciler) certificateHandler(obj client.Object) []reconcile.Request {
-	for _, certsPem := range obj.(*corev1.ConfigMap).Data {
-		injectCertificates([]byte(certsPem), httpClient.Transport.(*http.Transport))
-	}
-	return []reconcile.Request{}
-}
diff --git a/controllers/workspace/predicates.go b/controllers/workspace/predicates.go
@@ -17,7 +17,6 @@ package controllers
 
 import (
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
 
 	corev1 "k8s.io/api/core/v1"
@@ -100,19 +99,6 @@ var automountPredicates = predicate.Funcs{
 	GenericFunc: func(_ event.GenericEvent) bool { return false },
 }
 
-var certificatePredicates = predicate.Funcs{
-	CreateFunc: func(ev event.CreateEvent) bool {
-		return objectIsCertificateConfigmap(ev.Object)
-	},
-	DeleteFunc: func(ev event.DeleteEvent) bool {
-		return objectIsCertificateConfigmap(ev.Object)
-	},
-	UpdateFunc: func(ev event.UpdateEvent) bool {
-		return objectIsCertificateConfigmap(ev.ObjectNew)
-	},
-	GenericFunc: func(_ event.GenericEvent) bool { return false },
-}
-
 func objectIsAutomountResource(obj client.Object) bool {
 	labels := obj.GetLabels()
 	switch {
@@ -126,12 +112,3 @@ func objectIsAutomountResource(obj client.Object) bool {
 	}
 
 }
-
-func objectIsCertificateConfigmap(obj client.Object) bool {
-	routing := config.GetGlobalConfig().Routing
-	if routing == nil || routing.TLSCertificateConfigmapRef == nil {
-		return false
-	} else {
-		return routing.TLSCertificateConfigmapRef.Name == obj.GetName() && routing.TLSCertificateConfigmapRef.Namespace == obj.GetNamespace()
-	}
-}
diff --git a/pkg/config/predicates.go b/pkg/config/predicates.go
@@ -25,13 +25,8 @@ import (
 func Predicates() predicate.Predicate {
 	return predicate.Funcs{
 		UpdateFunc: func(evt event.UpdateEvent) bool {
-			if newConfig, ok := evt.ObjectNew.(*dw.DevWorkspaceOperatorConfig); ok {
-				syncConfigFrom(newConfig)
-				if oldConfig, ok := evt.ObjectOld.(*dw.DevWorkspaceOperatorConfig); ok {
-					if *oldConfig.Config.Routing.TLSCertificateConfigmapRef != *newConfig.Config.Routing.TLSCertificateConfigmapRef {
-						return true
-					}
-				}
+			if config, ok := evt.ObjectNew.(*dw.DevWorkspaceOperatorConfig); ok {
+				syncConfigFrom(config)
 			}
 			return false
 		},