Add hypershiftlogforwarder controller hosted cluster clients

Author: samanthajayasinghe

controllers/clusterlogforwardertemplate/clusterlogforwardertemplate_controller.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/go-logr/logr"
 	loggingv1 "github.com/openshift/cluster-logging-operator/apis/logging/v1"
-	hyperv1beta1 "github.com/openshift/hypershift/api/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,6 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	hlov1alpha1 "github.com/openshift/hypershift-logging-operator/api/v1alpha1"
+	"github.com/openshift/hypershift-logging-operator/pkg/hostedcluster"
 )
 
 const (
@@ -71,7 +71,7 @@ func (r *ClusterLogForwarderTemplateReconciler) Reconcile(
 		return ctrl.Result{}, err
 	}
 
-	hcpList, err := r.GetHostedControlPlanes(ctx)
+	hcpList, err := hostedcluster.GetHostedControlPlanes(r.Client, ctx, false)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -162,20 +162,6 @@ func (r *ClusterLogForwarderTemplateReconciler) Reconcile(
 	return ctrl.Result{}, nil
 }
 
-// GetHostedControlPlanes returns a list of all hostedcontrolplane resources in all namespaces.
-// Basically does `oc get hostedcontrolplane -A`
-func (r *ClusterLogForwarderTemplateReconciler) GetHostedControlPlanes(
-	ctx context.Context,
-) ([]hyperv1beta1.HostedControlPlane, error) {
-
-	hcpList := new(hyperv1beta1.HostedControlPlaneList)
-	if err := r.List(ctx, hcpList, &client.ListOptions{Namespace: ""}); err != nil {
-		return nil, err
-	}
-
-	return hcpList.Items, nil
-}
-
 // BuildInputs builds the input array from the template and adds to the clean log forwarder
 func (r *ClusterLogForwarderTemplateReconciler) BuildInputs(clusterLogForwarder *loggingv1.ClusterLogForwarder,
 	logForwarderTemplate *hlov1alpha1.ClusterLogForwarderTemplate) {

controllers/hypershiftlogforwarder/hypershiftlogforwarder_controller.go

@@ -19,18 +19,61 @@ package hypershiftlogforwarder
 import (
 	"context"
 
+	"github.com/go-logr/logr"
+	hlov1alpha1 "github.com/openshift/hypershift-logging-operator/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/cluster"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	managedv1alpha1 "github.com/openshift/hypershift-logging-operator/api/v1alpha1"
+	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
+// HostedCluster keeps hosted cluster info
+type HostedCluster struct {
+	Cluster      cluster.Cluster
+	ClusterId    string
+	HCPNamespace string
+}
+
 // HyperShiftLogForwarderReconciler reconciles a HyperShiftLogForwarder object
 type HyperShiftLogForwarderReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme       *runtime.Scheme
+	MCClint      client.Client
+	HCPNamespace string
+	log          logr.Logger
+}
+
+// NewLogForwarderReconcilerReconciler ...
+func NewHyperShiftLogForwarderReconciler(mgr ctrl.Manager, hostedClusters map[string]HostedCluster) (*HyperShiftLogForwarderReconciler, error) {
+	r := HyperShiftLogForwarderReconciler{
+		Scheme: mgr.GetScheme(),
+	}
+
+	for _, hostedCluster := range hostedClusters {
+		r := HyperShiftLogForwarderReconciler{
+			Client:       hostedCluster.Cluster.GetClient(),
+			Scheme:       mgr.GetScheme(),
+			MCClint:      mgr.GetClient(),
+			HCPNamespace: hostedCluster.HCPNamespace,
+		}
+
+		err := ctrl.NewControllerManagedBy(mgr).
+			For(&hlov1alpha1.HyperShiftLogForwarder{}).
+			Watches(
+				source.NewKindWithCache(&hlov1alpha1.HyperShiftLogForwarder{}, hostedCluster.Cluster.GetCache()),
+				&handler.EnqueueRequestForObject{},
+			).
+			Complete(&r)
+		if err != nil {
+
+			return &r, err
+		}
+	}
+
+	return &r, nil
 }
 
 //+kubebuilder:rbac:groups=logging.managed.openshift.io,resources=hypershiftlogforwarders,verbs=get;list;watch;create;update;patch;delete
@@ -53,10 +96,3 @@ func (r *HyperShiftLogForwarderReconciler) Reconcile(ctx context.Context, req ct
 
 	return ctrl.Result{}, nil
 }
-
-// SetupWithManager sets up the controller with the Manager.
-func (r *HyperShiftLogForwarderReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&managedv1alpha1.HyperShiftLogForwarder{}).
-		Complete(r)
-}

go.mod

@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/go-logr/logr v1.2.4
-	github.com/openshift/api v0.0.0-20230825144922-938af62eda38
 	github.com/openshift/cluster-logging-operator v0.0.0-20230824003206-e87beec8402b
 	github.com/openshift/hypershift v0.1.9
 	k8s.io/api v0.28.1
@@ -15,13 +14,6 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.99.0 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
@@ -37,12 +29,12 @@ require (
 	github.com/gobuffalo/flect v0.2.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -54,6 +46,7 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/onsi/ginkgo/v2 v2.12.0 // indirect
 	github.com/onsi/gomega v1.27.10 // indirect
+	github.com/openshift/api v0.0.0-20230825144922-938af62eda38 // indirect
 	github.com/openshift/elasticsearch-operator v0.0.0-20220613183908-e1648e67c298 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect