From cb143125a02367a1542f5d365b3976657f3c94b0 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 09:05:29 +0100
Subject: [PATCH 01/18] feat(ci): add check-diff target

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 4f705a6..ef06ff7 100644
--- a/Makefile
+++ b/Makefile
@@ -190,3 +190,7 @@ tidy: ## Tidy Go modules
 .PHONY: e2e-test
 e2e-test: ## Run e2e tests, make sure subscription operator is running somewhere
 	cd e2e && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
+
+.PHONY: check-diff
+check-diff: generate
+	git diff --exit-code

From de1dc1c349500daa9c82de8e08b9055882160032 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 09:05:52 +0100
Subject: [PATCH 02/18] feat(ci): add basic gh actions ci workflow

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/ci.yaml | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .github/workflows/ci.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..14de3ea
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches: main
+  pull_request:
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+    
+      - name: Set up Go 
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+
+      - name: Check diff
+        run: make check-diff
+
+      - name: Test
+        run: make test
+    
+  lint: 
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+    
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+
+      - name: Lint
+        run: make lint
+        env:
+          LINTER_FLAGS: '--timeout 5m'
\ No newline at end of file

From c8108f968ca8cb3f5126eb520ffe7f2cb7344c51 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 09:11:11 +0100
Subject: [PATCH 03/18] fix(ci): make lint-fix results

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile                                       | 2 +-
 api/telemetry/v1alpha1/otlp_config.go          | 2 +-
 internal/controller/telemetry/otel_conf_gen.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ef06ff7..91ff0a6 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -v ./... -coverprofile cover.out
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.55.2
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
diff --git a/api/telemetry/v1alpha1/otlp_config.go b/api/telemetry/v1alpha1/otlp_config.go
index 0e2fab4..f9a93bf 100644
--- a/api/telemetry/v1alpha1/otlp_config.go
+++ b/api/telemetry/v1alpha1/otlp_config.go
@@ -95,7 +95,7 @@ type GRPCClientSettings struct {
 	Authority string `json:"authority,omitempty"`
 
 	// Auth configuration for outgoing RPCs.
-	Auth string `json:"auth,omitempty"` //TODO this is a refernece *configauth.Authentication
+	Auth string `json:"auth,omitempty"` //TODO this is a reference *configauth.Authentication
 }
 
 // TLSClientSetting contains TLS configurations that are specific to client
diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index 8650ecc..d5694d3 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -23,7 +23,7 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-// TODO move this to its appropiate place
+// TODO move this to its appropriate place
 type OtelColConfigInput struct {
 	Tenants       []v1alpha1.Tenant
 	Subscriptions []v1alpha1.Subscription

From 4b11b6da59e27c836ac44d8ca5dd2e2be1e364e9 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 09:23:30 +0100
Subject: [PATCH 04/18] fix(lint): trivial lint fixes

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .../telemetry/collector_controller.go         | 44 ++++++++++++-------
 .../controller/telemetry/otel_conf_gen.go     |  7 ++-
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go
index 0e5bdd3..1651d24 100644
--- a/internal/controller/telemetry/collector_controller.go
+++ b/internal/controller/telemetry/collector_controller.go
@@ -76,7 +76,10 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 	collector.Status.Tenants = tenantNames
 
-	r.Status().Update(ctx, collector)
+	if err := r.Status().Update(ctx, collector); err != nil {
+		return ctrl.Result{}, err
+	}
+
 	logger.Info("Setting collector status")
 
 	subscriptions := []v1alpha1.Subscription{}
@@ -112,7 +115,10 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		slices.Sort(logsourceNamespacesForTenant)
 		tenant.Status.LogSourceNamespaces = logsourceNamespacesForTenant
 
-		r.Status().Update(ctx, &tenant)
+		if err := r.Status().Update(ctx, &tenant); err != nil {
+			return ctrl.Result{}, err
+		}
+
 		logger.Info("Setting tenant status")
 
 	}
@@ -190,7 +196,9 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		},
 	}
 
-	ctrl.SetControllerReference(collector, &otelCollector, r.Scheme)
+	if err := ctrl.SetControllerReference(collector, &otelCollector, r.Scheme); err != nil {
+		return ctrl.Result{}, err
+	}
 
 	resourceReconciler := reconciler.NewReconcilerWith(r.Client, reconciler.WithLog(logger))
 
@@ -235,7 +243,9 @@ func (r *CollectorReconciler) reconcileServiceAccount(ctx context.Context, colle
 		},
 	}
 
-	ctrl.SetControllerReference(collector, &serviceAccount, r.Scheme)
+	if err := ctrl.SetControllerReference(collector, &serviceAccount, r.Scheme); err != nil {
+		return v1alpha1.NamespacedName{}, err
+	}
 
 	resourceReconciler := reconciler.NewReconcilerWith(r.Client, reconciler.WithLog(logger))
 
@@ -265,7 +275,9 @@ func (r *CollectorReconciler) reconcileClusterRoleBinding(ctx context.Context, c
 		},
 	}
 
-	ctrl.SetControllerReference(collector, &clusterRoleBinding, r.Scheme)
+	if err := ctrl.SetControllerReference(collector, &clusterRoleBinding, r.Scheme); err != nil {
+		return err
+	}
 
 	resourceReconciler := reconciler.NewReconcilerWith(r.Client, reconciler.WithLog(logger))
 
@@ -295,7 +307,9 @@ func (r *CollectorReconciler) reconcileClusterRole(ctx context.Context, collecto
 		},
 	}
 
-	ctrl.SetControllerReference(collector, &clusterRole, r.Scheme)
+	if err := ctrl.SetControllerReference(collector, &clusterRole, r.Scheme); err != nil {
+		return err
+	}
 
 	resourceReconciler := reconciler.NewReconcilerWith(r.Client, reconciler.WithLog(logger))
 
@@ -305,18 +319,18 @@ func (r *CollectorReconciler) reconcileClusterRole(ctx context.Context, collecto
 }
 
 func getTenantNamesFromTenants(tenants []v1alpha1.Tenant) []string {
-	var tenantNames []string
-	for _, tenant := range tenants {
-		tenantNames = append(tenantNames, tenant.Name)
+	tenantNames := make([]string, len(tenants))
+	for i, tenant := range tenants {
+		tenantNames[i] = tenant.Name
 	}
 
 	return tenantNames
 }
 
 func getSubscriptionNamesFromSubscription(subscriptions []v1alpha1.Subscription) []v1alpha1.NamespacedName {
-	var subscriptionNames []v1alpha1.NamespacedName
-	for _, subscription := range subscriptions {
-		subscriptionNames = append(subscriptionNames, subscription.NamespacedName())
+	subscriptionNames := make([]v1alpha1.NamespacedName, len(subscriptions))
+	for i, subscription := range subscriptions {
+		subscriptionNames[i] = subscription.NamespacedName()
 	}
 
 	return subscriptionNames
@@ -434,10 +448,10 @@ func (r *CollectorReconciler) getLogsourceNamespaceNamesForTenant(ctx context.Co
 		return nil, err
 	}
 
-	var namespaceNames []string
+	namespaceNames := make([]string, len(namespaces))
 
-	for _, namespace := range namespaces {
-		namespaceNames = append(namespaceNames, namespace.Name)
+	for i, namespace := range namespaces {
+		namespaceNames[i] = namespace.Name
 	}
 
 	return namespaceNames, nil
diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index d5694d3..2ed08aa 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -130,11 +130,10 @@ func newRoutingConnector(name string, defaultPipelines []string) RoutingConnecto
 }
 
 func buildRoutingTableItemForTenant(tenant v1alpha1.Tenant) RoutingConnectorTableItem {
+	conditions := make([]string, len(tenant.Status.LogSourceNamespaces))
 
-	var conditions []string
-
-	for _, namespace := range tenant.Status.LogSourceNamespaces {
-		conditions = append(conditions, fmt.Sprintf(`IsMatch(attributes["k8s.namespace.name"], %q)`, namespace))
+	for i, namespace := range tenant.Status.LogSourceNamespaces {
+		conditions[i] = fmt.Sprintf(`IsMatch(attributes["k8s.namespace.name"], %q)`, namespace)
 	}
 
 	conditionString := strings.Join(conditions, " or ")

From 5c634b92c20de0120f3e89533d3f6cc683f87576 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 13:58:55 +0100
Subject: [PATCH 05/18] fix(test): followup on unit tests

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .../otel_col_conf_test_fixtures/complex.yaml  | 261 +++++-----
 .../telemetry/otel_conf_gen_test.go           | 465 +++++++++++-------
 2 files changed, 404 insertions(+), 322 deletions(-)

diff --git a/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml b/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
index 3d476a9..df9ee8c 100644
--- a/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
+++ b/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
@@ -1,143 +1,128 @@
 receivers:
-  file/in:
-    path:
-      /dev/stdin
-
+    filelog/kubernetes:
+        exclude:
+            - /var/log/pods/*/otc-container/*.log
+        include:
+            - /var/log/pods/*/*/*.log
+        include_file_name: false
+        include_file_path: true
+        operators:
+            - id: get-format
+              routes:
+                - expr: body matches "^\\{"
+                  output: parser-docker
+                - expr: body matches "^[^ Z]+Z"
+                  output: parser-containerd
+              type: router
+            - id: parser-containerd
+              output: extract_metadata_from_filepath
+              regex: ^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
+              timestamp:
+                layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+                parse_from: attributes.time
+              type: regex_parser
+            - id: parser-docker
+              output: extract_metadata_from_filepath
+              timestamp:
+                layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+                parse_from: attributes.time
+              type: json_parser
+            - cache:
+                size: 128
+              id: extract_metadata_from_filepath
+              parse_from: attributes["log.file.path"]
+              regex: ^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9-]+)\/(?P<container_name>[^\/]+)\/(?P<restart_count>\d+)\.log$
+              type: regex_parser
+            - from: attributes.log
+              to: body
+              type: move
+            - from: attributes.stream
+              to: attributes["log.iostream"]
+              type: move
+            - from: attributes.container_name
+              to: resource["k8s.container.name"]
+              type: move
+            - from: attributes.namespace
+              to: resource["k8s.namespace.name"]
+              type: move
+            - from: attributes.pod_name
+              to: resource["k8s.pod.name"]
+              type: move
+            - from: attributes.restart_count
+              to: resource["k8s.container.restart_count"]
+              type: move
+            - from: attributes.uid
+              to: resource["k8s.pod.uid"]
+              type: move
+        start_at: end
 exporters:
-  file/default:
-    path:
-      /foo/default
-  file/tenant_A_S1:
-    path:
-      /foo/tenant_A_S1
-  file/tenant_A_S2:
-    path:
-      /foo/tenant_A_S2
-  file/tenant_A_default:
-    path:
-      /foo/tenant_A_default
-  file/tenant_B_S1:
-    path:
-      /foo/tenant_B_S1
-  file/tenant_B_S2:
-    path:
-      /foo/tenant_B_S2
-  file/tenant_B_default:
-    path:
-      /foo/tenant_B_default
-
-
+    logging/debug:
+        verbosity: detailed
+    otlp/collector_otelp-test-output:
+        endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
+        tls:
+            insecure: true
+    otlp/collector_otelp-test-output-2:
+        endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
+        tls:
+            insecure: true
 processors:
-  # k8sattributes processor to get the metadata from K8s
-  k8sattributes:
-    auth_type: "serviceAccount"
-    passthrough: false
-    extract:
-      metadata:
-      - k8s.pod.name
-      - k8s.pod.uid
-      - k8s.deployment.name
-      - k8s.namespace.name
-      - k8s.node.name
-      - k8s.pod.start_time
-      # Pod labels which can be fetched via K8sattributeprocessor
-      labels: #TODO extract pod's tenant's namespace
-      - tag_name: app.label.example
-        key: example # label's name on a pod
-        from: pod
-    # Pod association using resource attributes and connection
-    pod_association:
-      - sources:
-        - from: resource_attribute
-          name: k8s.namespace.name
-        - from: resource_attribute
-          name: k8s.pod.name
-
+    attributes/subscription_subscription-example-1:
+        actions:
+            - action: insert
+              key: subscription_name
+              value: subscription-example-1
+    attributes/subscription_subscription-example-2:
+        actions:
+            - action: insert
+              key: subscription_name
+              value: subscription-example-2
+    attributes/tenant_example-tenant:
+        actions:
+            - action: insert
+              key: tenant_name
+              value: example-tenant
+    k8sattributes:
+        auth_type: serviceAccount
+        extract:
+            metadata:
+                - k8s.pod.name
+                - k8s.pod.uid
+                - k8s.deployment.name
+                - k8s.namespace.name
+                - k8s.node.name
+                - k8s.pod.start_time
+        passthrough: false
+        pod_association:
+            - sources:
+                - name: k8s.namespace.name
+                  from: resource_attribute
+                - name: k8s.pod.name
+                  from: resource_attribute
 connectors:
-  routing/tenants:
-    default_pipelines: [logs/default]
-    table:
-      - statement: 'route() where attributes["kubernetes.namespace.labels.tenant"] == "A"'
-        pipelines: [logs/tenant_A]
-      - statement: 'route() where attributes["kubernetes.namespace.labels.tenant"] == "B"'
-        pipelines: [logs/tenant_B]
-
-  routing/tenant_A_subscriptions:
-    default_pipelines: [logs/tenant_A_default]
-    table:
-      - statement: 'route() where attributes["kubernetes.labels.app"] == "S1"'
-        pipelines: [logs/tenant_A_subscription_S1]
-      - statement: 'route() where attributes["kubernetes.labels.app"] == "S2"'
-        pipelines: [logs/tenant_A_subscription_S2]
-
-  routing/tenant_B_subscriptions:
-    default_pipelines: [logs/tenant_B_default]
-    table:
-      - statement: 'route() where attributes["kubernetes.labels.app"] == "S1"'
-        pipelines: [logs/tenant_B_subscription_S1]
-      - statement: 'route() where attributes["kubernetes.labels.app"] == "S2"'
-        pipelines: [logs/tenant_B_subscription_S2]
-
+    routing/tenant_example-tenant_subscriptions:
+        table:
+            - statement: route()
+              pipelines: [logs/tenant_example-tenant_subscription_subscription-example-1]
+            - statement: 'route() '
+              pipelines: [logs/tenant_example-tenant_subscription_subscription-example-2]
+    routing/tenants:
+        table:
+            - statement: 'route() where '
+              pipelines: [logs/tenant_example-tenant]
 service:
-  pipelines:
-    logs/default:
-      receivers:
-      - routing/tenants
-      exporters:
-      - file/default
-
-    logs/all:
-      receivers:
-      - file/in
-      processors:
-      - k8sattributes
-      exporters:
-      - routing/tenants
-
-    logs/tenant_A:
-      receivers:
-      - routing/tenants
-      exporters:
-      - routing/tenant_A_subscriptions
-    
-    logs/tenant_A_default:
-      receivers:
-      - routing/tenant_A_subscriptions
-      exporters:
-      - file/tenant_A_default
-
-    logs/tenant_A_subscription_S1:
-      receivers:
-      - routing/tenant_A_subscriptions
-      exporters:
-      - file/tenant_A_S1
-      
-    logs/tenant_A_subscription_S2:
-      receivers:
-      - routing/tenant_A_subscriptions
-      exporters:
-      - file/tenant_A_S2
-
-    logs/tenant_B:
-      receivers:
-      - routing/tenants
-      exporters:
-      - routing/tenant_B_subscriptions
-
-    logs/tenant_B_default:
-      receivers:
-      - routing/tenant_B_subscriptions
-      exporters:
-      - file/tenant_B_default
-
-    logs/tenant_B_subscription_S1:
-      receivers:
-      - routing/tenant_B_subscriptions
-      exporters:
-      - file/tenant_B_S1
-    
-    logs/tenant_B_subscription_S2:
-      receivers:
-      - routing/tenant_B_subscriptions
-      exporters:
-      - file/tenant_B_S2
+    pipelines:
+        logs/all:
+            receivers: [filelog/kubernetes]
+            processors: [k8sattributes]
+            exporters: [routing/tenants]
+        logs/tenant_example-tenant:
+            receivers: [routing/tenants]
+            processors: [attributes/tenant_example-tenant]
+            exporters: [routing/tenant_example-tenant_subscriptions]
+        logs/tenant_example-tenant_subscription_subscription-example-1:
+            receivers: [routing/tenant_example-tenant_subscriptions]
+            processors: [attributes/subscription_subscription-example-1]
+        logs/tenant_example-tenant_subscription_subscription-example-2:
+            receivers: [routing/tenant_example-tenant_subscriptions]
+            processors: [attributes/subscription_subscription-example-2]
diff --git a/internal/controller/telemetry/otel_conf_gen_test.go b/internal/controller/telemetry/otel_conf_gen_test.go
index e8ac52f..19125db 100644
--- a/internal/controller/telemetry/otel_conf_gen_test.go
+++ b/internal/controller/telemetry/otel_conf_gen_test.go
@@ -16,9 +16,12 @@ package telemetry
 
 import (
 	_ "embed"
+	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v2"
 
 	"github.com/kube-logging/subscription-operator/api/telemetry/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -27,79 +30,173 @@ import (
 //go:embed otel_col_conf_test_fixtures/complex.yaml
 var otelColTargetYaml string
 
-// func TestOtelColConfComplex(t *testing.T) {
-// 	// Required inputs
-// 	inputCfg := OtelColConfigInput{
-// 		TenantSubscriptionMap: map[string][]string{
-// 			"A": {"S1", "S2"},
-// 			"B": {"S1", "S2"},
-// 		},
-// 	}
+func TestOtelColConfComplex(t *testing.T) {
+	// Required inputs
+	var subscriptions = []v1alpha1.Subscription{
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "subscription-example-1",
+				Namespace: "example-tenant-ns",
+			},
+			Spec: v1alpha1.SubscriptionSpec{
+				OTTL: "route()",
+				Outputs: []v1alpha1.NamespacedName{
+					{
+						Name:      "otel-test-output",
+						Namespace: "collector",
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "subscription-example-2",
+				Namespace: "example-tenant-ns",
+			},
+			Spec: v1alpha1.SubscriptionSpec{
+				OTTL: "route()",
+				Outputs: []v1alpha1.NamespacedName{
+					{
+						Name:      "otel-test-output-2",
+						Namespace: "collector",
+					},
+				},
+			},
+		},
+	}
+	inputCfg := OtelColConfigInput{
+		Subscriptions: subscriptions,
+		Tenants: []v1alpha1.Tenant{
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "example-tenant",
+				},
+				Spec: v1alpha1.TenantSpec{
+					SubscriptionNamespaceSelectors: []metav1.LabelSelector{
+						{
+							MatchLabels: map[string]string{
+								"nsSelector": "example-tenant",
+							},
+						},
+					},
+					LogSourceNamespaceSelectors: []metav1.LabelSelector{
+						{
+							MatchLabels: map[string]string{
+								"nsSelector": "example-tenant",
+							},
+						},
+					},
+				},
+			},
+		},
+
+		Outputs: []v1alpha1.OtelOutput{
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "otelp-test-output",
+					Namespace: "collector",
+				},
+				Spec: v1alpha1.OtelOutputSpec{
+					OTLP: v1alpha1.OTLPgrpc{
+						GRPCClientSettings: v1alpha1.GRPCClientSettings{
+							Endpoint: "receiver-collector.example-tenant-ns.svc.cluster.local:4317",
+							TLSSetting: v1alpha1.TLSClientSetting{
+								Insecure: true,
+							},
+						},
+					},
+				},
+			},
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "otelp-test-output-2",
+					Namespace: "collector",
+				},
+				Spec: v1alpha1.OtelOutputSpec{
+					OTLP: v1alpha1.OTLPgrpc{
+						GRPCClientSettings: v1alpha1.GRPCClientSettings{
+							Endpoint: "receiver-collector.example-tenant-ns.svc.cluster.local:4317",
+							TLSSetting: v1alpha1.TLSClientSetting{
+								Insecure: true,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
 
-// 	// IR
-// 	generatedIR := inputCfg.ToIntermediateRepresentation()
+	// TODO extract this logic
 
-// 	generatedIR.Receivers = map[string]any{
-// 		"file/in": map[string]any{
-// 			"path": "/dev/stdin",
-// 		},
-// 	}
+	subscriptionOutputMap := map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{}
+	for _, subscription := range inputCfg.Subscriptions {
+		subscriptionOutputMap[subscription.NamespacedName()] = subscription.Spec.Outputs
+	}
+	inputCfg.SubscriptionOutputMap = subscriptionOutputMap
 
-// 	// Final YAML
-// 	generatedYAML, err := generatedIR.ToYAML()
-// 	if err != nil {
-// 		t.Fatalf("YAML formatting failed, err=%v", err)
-// 	}
-// 	t.Logf(`the generated YAML is:
-// ---
-// %v
-// ---`, generatedYAML)
+	inputCfg.TenantSubscriptionMap = map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{}
+	tenant := inputCfg.Tenants[0]
+	inputCfg.TenantSubscriptionMap[tenant.NamespacedName()] = getSubscriptionNamesFromSubscription(inputCfg.Subscriptions)
 
-// 	actualYAMLBytes, err := generatedIR.ToYAMLRepresentation()
-// 	if err != nil {
-// 		t.Fatalf("error %v", err)
-// 	}
-// 	actualYAML, err := generatedIR.ToYAML()
-// 	if err != nil {
-// 		t.Fatalf("error %v", err)
-// 	}
-// 	var actualUniversalMap map[string]any
-// 	if err := yaml.Unmarshal(actualYAMLBytes, &actualUniversalMap); err != nil {
-// 		t.Fatalf("error: %v", err)
-// 	}
+	// IR
+	generatedIR := inputCfg.ToIntermediateRepresentation()
 
-// 	var expectedUniversalMap map[string]any
-// 	if err := yaml.Unmarshal([]byte(otelColTargetYaml), &expectedUniversalMap); err != nil {
-// 		t.Fatalf("error: %v", err)
-// 	}
+	// Final YAML
+	generatedYAML, err := generatedIR.ToYAML()
+	if err != nil {
+		t.Fatalf("YAML formatting failed, err=%v", err)
+	}
+	t.Logf(`the generated YAML is:
+---
+%v
+---`, generatedYAML)
 
-// 	// use dyff for YAML comparison
-// 	if diff := cmp.Diff(expectedUniversalMap, actualUniversalMap); diff != "" {
-// 		t.Logf("mismatch:\n---%s\n---\n", diff)
-// 	}
+	actualYAMLBytes, err := generatedIR.ToYAMLRepresentation()
+	if err != nil {
+		t.Fatalf("error %v", err)
+	}
+	actualYAML, err := generatedIR.ToYAML()
+	if err != nil {
+		t.Fatalf("error %v", err)
+	}
+
+	var actualUniversalMap map[string]any
+	if err := yaml.Unmarshal(actualYAMLBytes, &actualUniversalMap); err != nil {
+		t.Fatalf("error: %v", err)
+	}
+
+	var expectedUniversalMap map[string]any
+	if err := yaml.Unmarshal([]byte(otelColTargetYaml), &expectedUniversalMap); err != nil {
+		t.Fatalf("error: %v", err)
+	}
 
-// 	if !reflect.DeepEqual(actualUniversalMap, expectedUniversalMap) {
-// 		t.Logf(`yaml mismatch:
-// expected=
-// ---
-// %s
-// ---
-// actual=
-// ---
-// %s
-// ---`, otelColTargetYaml, actualYAML)
-// 		t.Fatalf(`yaml marshaling failed
-// expected=
-// ---
-// %v
-// ---,
-// actual=
-// ---
-// %v
-// ---`,
-// 			expectedUniversalMap, actualUniversalMap)
-// 	}
-// }
+	// use dyff for YAML comparison
+	if diff := cmp.Diff(expectedUniversalMap, actualUniversalMap); diff != "" {
+		t.Logf("mismatch:\n---%s\n---\n", diff)
+	}
+
+	if !reflect.DeepEqual(actualUniversalMap, expectedUniversalMap) {
+		t.Logf(`yaml mismatch:
+expected=
+---
+%s
+---
+actual=
+---
+%s
+---`, otelColTargetYaml, actualYAML)
+		t.Fatalf(`yaml marshaling failed
+expected=
+---
+%v
+---,
+actual=
+---
+%v
+---`,
+			expectedUniversalMap, actualUniversalMap)
+	}
+}
 
 func Test_generateRootRoutingConnector(t *testing.T) {
 	type args struct {
@@ -158,121 +255,121 @@ func Test_generateRootRoutingConnector(t *testing.T) {
 	}
 }
 
-// func TestOtelColConfigInput_generateRoutingConnectorForTenantsSubscription(t *testing.T) {
-// 	type fields struct {
-// 		Tenants               []v1alpha1.Tenant
-// 		Subscriptions         []v1alpha1.Subscription
-// 		Outputs               []v1alpha1.OtelOutput
-// 		TenantSubscriptionMap map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName
-// 		SubscriptionOutputMap map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName
-// 	}
-// 	type args struct {
-// 		tenantName        string
-// 		subscriptionNames []v1alpha1.NamespacedName
-// 	}
-// 	tests := []struct {
-// 		name   string
-// 		fields fields
-// 		args   args
-// 		want   RoutingConnector
-// 	}{
-// 		{
-// 			name: "two_subscriptions",
-// 			fields: fields{
-// 				Tenants: []v1alpha1.Tenant{{
-// 					ObjectMeta: metav1.ObjectMeta{
-// 						Name:      "tenantA",
-// 						Namespace: "nsA",
-// 					},
-// 					Spec: v1alpha1.TenantSpec{},
-// 					Status: v1alpha1.TenantStatus{
-// 						LogSourceNamespaces: []string{"a", "b"},
-// 					},
-// 				}},
-// 				Subscriptions: []v1alpha1.Subscription{
-// 					{
-// 						ObjectMeta: metav1.ObjectMeta{
-// 							Name:      "subsA",
-// 							Namespace: "nsA",
-// 						},
-// 						Spec: v1alpha1.SubscriptionSpec{Outputs: []v1alpha1.NamespacedName{
-// 							{
-// 								Namespace: "xy",
-// 								Name:      "zq",
-// 							},
-// 						}, OTTL: `set(attributes["subscription"], "subscriptionA")`},
-// 					},
-// 					{
-// 						ObjectMeta: metav1.ObjectMeta{
-// 							Name:      "subsB",
-// 							Namespace: "nsA",
-// 						},
-// 						Spec: v1alpha1.SubscriptionSpec{Outputs: []v1alpha1.NamespacedName{
-// 							{
-// 								Namespace: "xy",
-// 								Name:      "zq",
-// 							},
-// 						}, OTTL: `set(attributes["subscription"], "subscriptionB")`},
-// 					},
-// 				},
-// 				Outputs: []v1alpha1.OtelOutput{},
-// 				TenantSubscriptionMap: map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{
-// 					{
-// 						Namespace: "nsA",
-// 						Name:      "tenantA",
-// 					}: {
-// 						{
-// 							Namespace: "nsA",
-// 							Name:      "subsA",
-// 						},
-// 						{
-// 							Namespace: "nsA",
-// 							Name:      "subsB",
-// 						},
-// 					},
-// 				},
-// 				SubscriptionOutputMap: map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{},
-// 			},
-// 			args: args{
-// 				tenantName: "tenantA",
-// 				subscriptionNames: []v1alpha1.NamespacedName{
-// 					{
-// 						Namespace: "nsA",
-// 						Name:      "subsA",
-// 					},
-// 					{
-// 						Namespace: "nsA",
-// 						Name:      "subsB",
-// 					},
-// 				},
-// 			},
-// 			want: RoutingConnector{
-// 				Name:             "routing/tenant_tenantA_subscriptions",
-// 				DefaultPipelines: []string{},
-// 				Table: []RoutingConnectorTableItem{
-// 					{
-// 						Statement: `set(attributes["subscription"], "subscriptionA")`,
-// 						Pipelines: []string{"logs/tenant_tenantA_subscription_subsA"},
-// 					},
-// 					{
-// 						Statement: `set(attributes["subscription"], "subscriptionB")`,
-// 						Pipelines: []string{"logs/tenant_tenantA_subscription_subsB"},
-// 					},
-// 				},
-// 			},
-// 		},
-// 	}
-// 	for _, tt := range tests {
-// 		t.Run(tt.name, func(t *testing.T) {
-// 			cfgInput := &OtelColConfigInput{
-// 				Tenants:               tt.fields.Tenants,
-// 				Subscriptions:         tt.fields.Subscriptions,
-// 				Outputs:               tt.fields.Outputs,
-// 				TenantSubscriptionMap: tt.fields.TenantSubscriptionMap,
-// 				SubscriptionOutputMap: tt.fields.SubscriptionOutputMap,
-// 			}
-// 			got := cfgInput.generateRoutingConnectorForTenantsSubscription(tt.args.tenantName, tt.args.subscriptionNames)
-// 			assert.Equal(t, got, tt.want)
-// 		})
-// 	}
-// }
+func TestOtelColConfigInput_generateRoutingConnectorForTenantsSubscription(t *testing.T) {
+	type fields struct {
+		Tenants               []v1alpha1.Tenant
+		Subscriptions         []v1alpha1.Subscription
+		Outputs               []v1alpha1.OtelOutput
+		TenantSubscriptionMap map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName
+		SubscriptionOutputMap map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName
+	}
+	type args struct {
+		tenantName        string
+		subscriptionNames []v1alpha1.NamespacedName
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   RoutingConnector
+	}{
+		{
+			name: "two_subscriptions",
+			fields: fields{
+				Tenants: []v1alpha1.Tenant{{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "tenantA",
+						Namespace: "nsA",
+					},
+					Spec: v1alpha1.TenantSpec{},
+					Status: v1alpha1.TenantStatus{
+						LogSourceNamespaces: []string{"a", "b"},
+					},
+				}},
+				Subscriptions: []v1alpha1.Subscription{
+					{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "subsA",
+							Namespace: "nsA",
+						},
+						Spec: v1alpha1.SubscriptionSpec{Outputs: []v1alpha1.NamespacedName{
+							{
+								Namespace: "xy",
+								Name:      "zq",
+							},
+						}, OTTL: `set(attributes["subscription"], "subscriptionA")`},
+					},
+					{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "subsB",
+							Namespace: "nsA",
+						},
+						Spec: v1alpha1.SubscriptionSpec{Outputs: []v1alpha1.NamespacedName{
+							{
+								Namespace: "xy",
+								Name:      "zq",
+							},
+						}, OTTL: `set(attributes["subscription"], "subscriptionB")`},
+					},
+				},
+				Outputs: []v1alpha1.OtelOutput{},
+				TenantSubscriptionMap: map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{
+					{
+						Namespace: "nsA",
+						Name:      "tenantA",
+					}: {
+						{
+							Namespace: "nsA",
+							Name:      "subsA",
+						},
+						{
+							Namespace: "nsA",
+							Name:      "subsB",
+						},
+					},
+				},
+				SubscriptionOutputMap: map[v1alpha1.NamespacedName][]v1alpha1.NamespacedName{},
+			},
+			args: args{
+				tenantName: "tenantA",
+				subscriptionNames: []v1alpha1.NamespacedName{
+					{
+						Namespace: "nsA",
+						Name:      "subsA",
+					},
+					{
+						Namespace: "nsA",
+						Name:      "subsB",
+					},
+				},
+			},
+			want: RoutingConnector{
+				Name:             "routing/tenant_tenantA_subscriptions",
+				DefaultPipelines: []string{},
+				Table: []RoutingConnectorTableItem{
+					{
+						Statement: `set(attributes["subscription"], "subscriptionA")`,
+						Pipelines: []string{"logs/tenant_tenantA_subscription_subsA"},
+					},
+					{
+						Statement: `set(attributes["subscription"], "subscriptionB") `,
+						Pipelines: []string{"logs/tenant_tenantA_subscription_subsB"},
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfgInput := &OtelColConfigInput{
+				Tenants:               tt.fields.Tenants,
+				Subscriptions:         tt.fields.Subscriptions,
+				Outputs:               tt.fields.Outputs,
+				TenantSubscriptionMap: tt.fields.TenantSubscriptionMap,
+				SubscriptionOutputMap: tt.fields.SubscriptionOutputMap,
+			}
+			got := cfgInput.generateRoutingConnectorForTenantsSubscription(tt.args.tenantName, tt.args.subscriptionNames)
+			assert.Equal(t, got, tt.want)
+		})
+	}
+}

From e1ca6a563bf5268ca2f1f899e4e43458a2be5c0b Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 14:16:13 +0100
Subject: [PATCH 06/18] fix(license): unify/add missing license

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 api/telemetry/v1alpha1/common.go           | 14 +++++++++++
 api/telemetry/v1alpha1/oteloutput_types.go | 28 ++++++++++------------
 api/telemetry/v1alpha1/otlp_config.go      | 14 +++++++++++
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/api/telemetry/v1alpha1/common.go b/api/telemetry/v1alpha1/common.go
index 3368d57..24b27c6 100644
--- a/api/telemetry/v1alpha1/common.go
+++ b/api/telemetry/v1alpha1/common.go
@@ -1,3 +1,17 @@
+// Copyright © 2023 Kube logging authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package v1alpha1
 
 type NamespacedName struct {
diff --git a/api/telemetry/v1alpha1/oteloutput_types.go b/api/telemetry/v1alpha1/oteloutput_types.go
index 34d9d90..42f54d4 100644
--- a/api/telemetry/v1alpha1/oteloutput_types.go
+++ b/api/telemetry/v1alpha1/oteloutput_types.go
@@ -1,18 +1,16 @@
-/*
-Copyright 2023.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright © 2023 Kube logging authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package v1alpha1
 
diff --git a/api/telemetry/v1alpha1/otlp_config.go b/api/telemetry/v1alpha1/otlp_config.go
index f9a93bf..dd00f04 100644
--- a/api/telemetry/v1alpha1/otlp_config.go
+++ b/api/telemetry/v1alpha1/otlp_config.go
@@ -1,3 +1,17 @@
+// Copyright © 2023 Kube logging authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package v1alpha1
 
 import (

From 5b642a5ec3547e0fa92955bade08add95cbae505 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 14:16:37 +0100
Subject: [PATCH 07/18] feat(ci): add license-check target

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/ci.yaml | 39 +++++++++++++++++++++++++++++++++++++--
 .licensei.toml            | 36 ++++++++++++++++++++++++++++++++++++
 Makefile                  | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 .licensei.toml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 14de3ea..f516a01 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -2,7 +2,10 @@ name: CI
 
 on:
   push:
-    branches: main
+    branches:
+    - main
+    - "release-[0-9]+.[0-9]+*"
+
   pull_request:
 
 jobs:
@@ -41,4 +44,36 @@ jobs:
       - name: Lint
         run: make lint
         env:
-          LINTER_FLAGS: '--timeout 5m'
\ No newline at end of file
+          LINTER_FLAGS: '--timeout 5m'
+
+  license-check:
+      name: License check
+      runs-on: ubuntu-latest
+        
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v3
+  
+        - name: Set up Go
+          uses: actions/setup-go@v4
+          with:
+            go-version: '1.21'
+  
+        - name: Cache licenses
+          uses: actions/cache@v3
+          with:
+            key: licensei-v2-${{ hashFiles('go.sum') }}
+            path: |
+              .licensei.cache
+            restore-keys: |
+              licensei-v2
+  
+        - name: Download license information for dependencies
+          env:
+            GITHUB_TOKEN: ${{ github.token }}
+          run: make license-cache
+  
+        - name: Check licenses
+          env:
+            GITHUB_TOKEN: ${{ github.token }}
+          run: make license-check
diff --git a/.licensei.toml b/.licensei.toml
new file mode 100644
index 0000000..c38905d
--- /dev/null
+++ b/.licensei.toml
@@ -0,0 +1,36 @@
+approved = [
+  "mit",
+  "mit-0",
+  "apache-2.0",
+  "bsd-3-clause",
+  "bsd-2-clause",
+  "mpl-2.0",
+  "isc"
+]
+
+ignored = [
+  # Unsupported VCS
+  "google.golang.org/protobuf",
+  "github.com/gogo/protobuf",
+  "sigs.k8s.io/yaml",
+  "gomodules.xyz/jsonpatch/v2",
+  "cloud.google.com/go",
+]
+
+[header]
+ignorePaths = ["vendor"]
+ignoreFiles = ["zz_generated.*.go", "generated.go","cache.go"]
+authors = ["Kube logging authors"]
+template = """// Copyright © :YEAR: :AUTHOR:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License."""
diff --git a/Makefile b/Makefile
index 91ff0a6..93cad3c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,11 @@
 
 # Image URL to use all building/pushing image targets
+BIN := ${PWD}/bin
+
+export PATH := $(BIN):$(PATH)
+
+GOVERSION := $(shell go env GOVERSION)
+
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.0
@@ -22,6 +28,9 @@ CONTAINER_TOOL ?= docker
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
+LICENSEI := ${BIN}/licensei
+LICENSEI_VERSION = v0.8.0
+
 .PHONY: all
 all: build
 
@@ -194,3 +203,32 @@ e2e-test: ## Run e2e tests, make sure subscription operator is running somewhere
 .PHONY: check-diff
 check-diff: generate
 	git diff --exit-code
+
+.PHONY: license-check
+license-check: ${LICENSEI} .licensei.cache ## Run license check
+	${LICENSEI} check
+	${LICENSEI} header
+
+## target: ci-run
+## target: licensei
+
+${LICENSEI}: ${LICENSEI}_${LICENSEI_VERSION}_${GOVERSION} | ${BIN}
+	ln -sf $(notdir $<) $@
+
+${LICENSEI}_${LICENSEI_VERSION}_${GOVERSION}: IMPORT_PATH := github.com/goph/licensei/cmd/licensei
+${LICENSEI}_${LICENSEI_VERSION}_${GOVERSION}: VERSION := ${LICENSEI_VERSION}
+${LICENSEI}_${LICENSEI_VERSION}_${GOVERSION}: | ${BIN}
+	${go_install_binary}
+
+.licensei.cache: ${LICENSEI}
+ifndef GITHUB_TOKEN
+	@>&2 echo "WARNING: building licensei cache without Github token, rate limiting might occur."
+	@>&2 echo "(Hint: If too many licenses are missing, try specifying a Github token via the environment variable GITHUB_TOKEN.)"
+endif
+	${LICENSEI} cache
+
+define go_install_binary
+find ${BIN} -name '$(notdir ${IMPORT_PATH})_*' -exec rm {} +
+GOBIN=${BIN} go install ${IMPORT_PATH}@${VERSION}
+mv ${BIN}/$(notdir ${IMPORT_PATH}) $@
+endef

From 524384ef3015cf24dd6c8a208938c027698e46f7 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 13:59:58 +0100
Subject: [PATCH 08/18] fix(rbac): add required rbac permissions to run inside
 k8s

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 config/rbac/role.yaml                         | 73 +++++++++++++++++++
 .../telemetry/collector_controller.go         |  9 ++-
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index b33c4eb..563c762 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -4,10 +4,80 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - endpoints
+  - namespaces
+  - nodes
+  - nodes/proxy
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - persistentvolumeclaims
+  - pods
+  - serviceaccounts
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - opentelemetry.io
+  resources:
+  - opentelemetrycollectors
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - clusterrolebindings
+  - clusterroles
+  - rolebindings
+  - roles
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - telemetry.kube-logging.dev
   resources:
   - collectors
+  - oteloutputs
+  - subscriptions
+  - tenants
   verbs:
   - create
   - delete
@@ -26,6 +96,9 @@ rules:
   - telemetry.kube-logging.dev
   resources:
   - collectors/status
+  - oteloutputs/status
+  - subscriptions/status
+  - tenants/status
   verbs:
   - get
   - patch
diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go
index 1651d24..4173e59 100644
--- a/internal/controller/telemetry/collector_controller.go
+++ b/internal/controller/telemetry/collector_controller.go
@@ -41,9 +41,14 @@ type CollectorReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=telemetry.kube-logging.dev,resources=collectors,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=telemetry.kube-logging.dev,resources=collectors/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=telemetry.kube-logging.dev,resources=collectors;tenants;subscriptions;oteloutputs;,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=telemetry.kube-logging.dev,resources=collectors/status;tenants/status;subscriptions/status;oteloutputs/status;,verbs=get;update;patch
 //+kubebuilder:rbac:groups=telemetry.kube-logging.dev,resources=collectors/finalizers,verbs=update
+//+kubebuilder:rbac:groups="",resources=nodes;namespaces;endpoints;nodes/proxy,verbs=get;list;watch
+//+kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=clusterroles;clusterrolebindings;roles;rolebindings,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups="",resources=services;persistentvolumeclaims;serviceaccounts;pods,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=apps,resources=statefulsets;daemonsets;replicasets,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=opentelemetry.io,resources=opentelemetrycollectors,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.

From 770674d1554b527726863f6770ad0abfcf7140d5 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 17:29:24 +0100
Subject: [PATCH 09/18] feat(ci): add artifacts.yaml

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/artifacts.yaml | 144 +++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 .github/workflows/artifacts.yaml

diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
new file mode 100644
index 0000000..fa40d22
--- /dev/null
+++ b/.github/workflows/artifacts.yaml
@@ -0,0 +1,144 @@
+name: Artifacts
+
+on:
+  workflow_call:
+    inputs:
+      publish:
+        description: Publish artifacts to the artifact store
+        default: false
+        required: false
+        type: boolean
+      release:
+        description: Whether this is a release build
+        default: false
+        required: false
+        type: boolean
+    outputs:
+      container-image-name:
+        description: Container image name
+        value: ${{ jobs.container-image.outputs.name }}
+      container-image-digest:
+        description: Container image digest
+        value: ${{ jobs.container-image.outputs.digest }}
+      container-image-tag:
+        description: Container image tag
+        value: ${{ jobs.container-image.outputs.tag }}
+      container-image-ref:
+        description: Container image ref
+        value: ${{ jobs.container-image.outputs.ref }}
+
+permissions:
+  contents: read
+
+jobs:
+  container-image:
+    name: Container image
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+      security-events: write
+
+    outputs:
+      name: ${{ steps.image-name.outputs.value }}
+      digest: ${{ steps.build.outputs.digest }}
+      tag: ${{ steps.meta.outputs.version }}
+      ref: ${{ steps.image-ref.outputs.value }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
+
+      - name: Set image name
+        id: image-name
+        run: echo "value=ghcr.io/${{ github.repository }}" >> "$GITHUB_OUTPUT"
+
+      - name: Gather build metadata
+        id: meta
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
+        with:
+          images: ${{ steps.image-name.outputs.value }}
+          flavor: |
+            latest = false
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr,prefix=pr-
+            type=semver,pattern={{raw}}
+            type=raw,value=latest,enable={{is_default_branch}}
+          labels: |
+            org.opencontainers.image.description=Telemetry controller
+            org.opencontainers.image.title=Telemetry controller
+            org.opencontainers.image.authors=Kube logging authors
+            org.opencontainers.image.documentation=https://todo.docs
+
+
+      # Multiple exporters are not supported yet
+      # See https://github.com/moby/buildkit/pull/2760
+      - name: Determine build output
+        uses: haya14busa/action-cond@1d6e8a12b20cdb4f1954feef9aa475b9c390cab5 # v1.1.1
+        id: build-output
+        with:
+          cond: ${{ inputs.publish }}
+          if_true: type=image,push=true
+          if_false: type=oci,dest=image.tar
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+        if: inputs.publish
+
+      - name: Build and push image
+        id: build
+        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          outputs: ${{ steps.build-output.outputs.value }},name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.description'] }}
+          # push: ${{ inputs.publish }}
+
+      - name: Set image ref
+        id: image-ref
+        run: echo "value=${{ steps.image-name.outputs.value }}@${{ steps.build.outputs.digest }}" >> "$GITHUB_OUTPUT"
+
+      - name: Fetch image
+        run: skopeo --insecure-policy copy docker://${{ steps.image-name.outputs.value }}:${{ steps.meta.outputs.version }} oci-archive:image.tar
+        if: inputs.publish
+
+      - name: Extract OCI tarball
+        run: |
+          mkdir -p image
+          tar -xf image.tar -C image
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # 0.16.1
+        with:
+          input: image
+          format: sarif
+          output: trivy-results.sarif
+
+      - name: Upload Trivy scan results as artifact
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: "[${{ github.job }}] Trivy scan results"
+          path: trivy-results.sarif
+          retention-days: 5
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
+        with:
+          sarif_file: trivy-results.sarif

From 6a69eecc2824c2c0f5e71bc5d7e665bd9493f07e Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 16:08:44 +0100
Subject: [PATCH 10/18] feat(ci): enable e2e-test in ci

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/ci.yaml         |  11 ++
 .github/workflows/e2e.yaml        | 161 ++++++++++++++++++++++++++++++
 Dockerfile                        |   2 +-
 Makefile                          |  34 ++++++-
 cmd/main.go                       |   2 +-
 config/manager/kustomization.yaml |   6 ++
 config/manager/manager.yaml       |   1 +
 e2e/e2e_test.sh                   |  20 +++-
 8 files changed, 228 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/e2e.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f516a01..28e2315 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,3 +77,14 @@ jobs:
           env:
             GITHUB_TOKEN: ${{ github.token }}
           run: make license-check
+          
+  artifacts:
+    name: Artifacts
+    uses: ./.github/workflows/artifacts.yaml
+    with:
+      publish: ${{ github.event_name == 'push' }}
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+      security-events: write
\ No newline at end of file
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
new file mode 100644
index 0000000..30eb4df
--- /dev/null
+++ b/.github/workflows/e2e.yaml
@@ -0,0 +1,161 @@
+name: E2E tests
+
+on:
+  push:
+    branches:
+      - master
+      - "release-[0-9]+.[0-9]+*"
+  pull_request:
+
+env:
+  GO_VERSION: '1.21'
+  KUBECTL_VERSION: 'v1.24.1'
+
+jobs:
+  build:
+    name: Image build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and export
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          tags: controller:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          outputs: type=docker,dest=/tmp/controller.tar
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: controller
+          path: /tmp/controller.tar
+
+  go:
+    name: Go end2end tests
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+#      matrix:
+#        SHARD: [0]
+#        SHARDS: [1]
+
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: controller
+          path: /tmp
+
+      - name: Load image
+        run: |
+          docker load --input /tmp/controller.tar
+          docker image ls -a
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Set up kubectl
+        uses: azure/setup-kubectl@v3
+        with:
+          version: ${{ env.KUBECTL_VERSION }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run e2e tests
+        run: make e2e-test-ci
+#        env:
+#          SHARD: ${{ matrix.SHARD }}
+#          SHARDS: ${{ matrix.SHARDS }}
+
+      - name: Archive Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: go-e2e-test-cluster-logs
+          path: build/_test
+          retention-days: 5
+
+  e2e-test:
+    name: Shell script tests with different k8s versions
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        kube: ["1.26", "1.27", "1.28", "1.29"]
+
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: controller
+          path: /tmp
+
+      - name: Load image
+        run: |
+          docker load --input /tmp/controller.tar
+          docker image ls -a
+
+      - name: Set up kubectl
+        uses: azure/setup-kubectl@v3
+        with:
+          version: ${{ env.KUBECTL_VERSION }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # See https://github.com/kubernetes-sigs/kind/releases/tag/v0.20.0
+      - name: Determine KinD node image version
+        id: node_image
+        run: |
+          case ${{ matrix.kube }} in
+            1.26)
+              NODE_IMAGE=kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb ;;
+            1.27)
+              NODE_IMAGE=kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 ;;
+            1.28)
+              NODE_IMAGE=kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 ;;
+            1.29)
+              NODE_IMAGE=kindest/node:v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 ;;
+            esac
+
+            echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT
+
+      - name: Make setup
+        run: make kind-cluster stern
+        env:
+          KIND_IMAGE: ${{ steps.node_image.outputs.image }}
+
+      - name: Test script for E2E
+        run: make e2e-test-ci
+
+      - name: Print last 10k kubernetes logs from default, collector and example-tenant-ns namespaces
+        if: always()
+        run: |
+          mkdir -p build/_test
+          bin/stern -n default,collector,example-tenant-ns ".*" --tail 100000 --no-follow > build/_test/cluster.logs
+
+      - name: Archive Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: script-e2e-test-cluster-logs
+          path: build/_test
+          retention-days: 5
diff --git a/Dockerfile b/Dockerfile
index c389c09..aa74435 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Makefile b/Makefile
index 93cad3c..207a873 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,13 @@ export PATH := $(BIN):$(PATH)
 
 GOVERSION := $(shell go env GOVERSION)
 
+KIND := ${BIN}/kind
+KIND_VERSION ?= v0.20.0
+KIND_IMAGE ?= kindest/node:v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 
+KIND_CLUSTER ?= kind
+
+CI_MODE_ENABLED := ""
+
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.0
@@ -130,7 +137,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 ##@ Deployment
 
 ifndef ignore-not-found
-  ignore-not-found = false
+ignore-not-found = false
 endif
 
 .PHONY: install
@@ -197,8 +204,13 @@ tidy: ## Tidy Go modules
 	find . -iname "go.mod" -not -path "./.devcontainer/*" | xargs -L1 sh -c 'cd $$(dirname $$0); go mod tidy'
 
 .PHONY: e2e-test
-e2e-test: ## Run e2e tests, make sure subscription operator is running somewhere
-	cd e2e && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
+e2e-test: ## Run e2e tests
+	cd e2e && export CI_MODE=$(CI_MODE_ENABLED) && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
+
+.PHONY: e2e-test-ci
+e2e-test-ci: CI_MODE_ENABLED=1 
+e2e-test-ci: IMG="controller:latest" ## Run e2e tests, telemetry collector runs inside k8s
+e2e-test-ci: docker-build e2e-test
 
 .PHONY: check-diff
 check-diff: generate
@@ -209,8 +221,22 @@ license-check: ${LICENSEI} .licensei.cache ## Run license check
 	${LICENSEI} check
 	${LICENSEI} header
 
+stern: | ${BIN}
+	GOBIN=${BIN} go install github.com/stern/stern@latest
+
+.PHONY: kind-cluster
+kind-cluster: ${KIND}
+	kind create cluster --name $(KIND_CLUSTER) --image $(KIND_IMAGE)
+
 ## target: ci-run
-## target: licensei
+
+${KIND}: ${KIND}_${KIND_VERSION}_${GOVERSION} | ${BIN}
+	ln -sf $(notdir $<) $@
+
+${KIND}_${KIND_VERSION}_${GOVERSION}: IMPORT_PATH := sigs.k8s.io/kind
+${KIND}_${KIND_VERSION}_${GOVERSION}: VERSION := ${KIND_VERSION}
+${KIND}_${KIND_VERSION}_${GOVERSION}: | ${BIN}
+	${go_install_binary}
 
 ${LICENSEI}: ${LICENSEI}_${LICENSEI_VERSION}_${GOVERSION} | ${BIN}
 	ln -sf $(notdir $<) $@
diff --git a/cmd/main.go b/cmd/main.go
index 6c48ce6..3294704 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -112,7 +112,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	setupLog.Info("starting manager")
+	setupLog.Info("starting telemetry controller manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 5c5f0b8..ad13e96 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,2 +1,8 @@
 resources:
 - manager.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: controller
+  newTag: latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index ecd3b66..068ec9a 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -71,6 +71,7 @@ spec:
         args:
         - --leader-elect
         image: controller:latest
+        imagePullPolicy: IfNotPresent
         name: manager
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index 7535aab..45f3ffa 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -9,7 +9,8 @@ create_if_does_not_exist() {
 }
 
 KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME_E2E:-so-e2e}
-# Backup current kubernetes context
+NO_KIND_CLEANUP=${NO_KIND_CLEANUP:-}
+  # Backup current kubernetes context
 CURRENT_K8S_CTX=$(kubectl config view | grep "current" | cut -f 2 -d : | xargs)
 
 # Prepare env
@@ -38,8 +39,21 @@ kubectl wait --namespace opentelemetry-operator-system --for=condition=available
 # Use example
 kubectl apply -f ../docs/examples/simple-demo
 
-
-(cd .. && timeout 5m make run &)
+if [[ -z "${CI_MODE}" ]]; then
+  $(cd .. && timeout 5m make run &)
+  #cd -
+else
+  kind load docker-image controller:latest --name "${KIND_CLUSTER_NAME}"
+  cd .. && make deploy && cd -
+  # helm upgrade --install \
+  #   --debug \
+  #   --wait \
+  #   --create-namespace \
+  #   --namespace example-tenant-ns \
+  #   -f values.yaml \
+  #   telemetry-controller \
+  #   "../charts/telemetry-controller" 
+fi
 
 # Create log-generator
 helm install --wait --create-namespace --namespace example-tenant-ns --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator

From b404b34cab869847bf5af940f04de3243ab8f7ed Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 14:24:03 +0100
Subject: [PATCH 11/18] fix(ci): add missing license-cache target

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 207a873..7059684 100644
--- a/Makefile
+++ b/Makefile
@@ -221,6 +221,10 @@ license-check: ${LICENSEI} .licensei.cache ## Run license check
 	${LICENSEI} check
 	${LICENSEI} header
 
+.PHONY: license-cache
+license-cache: ${LICENSEI} ## Generate license cache
+	${LICENSEI} cache
+
 stern: | ${BIN}
 	GOBIN=${BIN} go install github.com/stern/stern@latest
 

From 86046822267678711fe9f4bd8af6ea5a326ce330 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 15:50:53 +0100
Subject: [PATCH 12/18] fix(ci): remove go toolchain, update controller-gen
 tool

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/e2e.yaml | 2 +-
 Makefile                   | 2 +-
 go.mod                     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 30eb4df..8ac41d9 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.21.5'
   KUBECTL_VERSION: 'v1.24.1'
 
 jobs:
diff --git a/Makefile b/Makefile
index 7059684..a75c7ca 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.2.1
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
diff --git a/go.mod b/go.mod
index 14a2ea2..5a496c5 100644
--- a/go.mod
+++ b/go.mod
@@ -2,8 +2,6 @@ module github.com/kube-logging/subscription-operator
 
 go 1.21
 
-toolchain go1.21.5
-
 require (
 	emperror.dev/errors v0.8.1
 	github.com/cisco-open/operator-tools v0.34.0

From 8d2e86ac72d70e81dfe4fce59fdc4548bfa54d28 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 16:06:08 +0100
Subject: [PATCH 13/18] fix(ci): force newer go version

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/e2e.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8ac41d9..58473b6 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -118,6 +118,11 @@ jobs:
         with:
           version: ${{ env.KUBECTL_VERSION }}
 
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
       - name: Checkout code
         uses: actions/checkout@v3
 

From 36b662a156cedc94f778a43ead19753e23d1bdcc Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 16:19:13 +0100
Subject: [PATCH 14/18] fix(ci): do not clean up before grabbing logs

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a75c7ca..b87f42e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ KIND_IMAGE ?= kindest/node:v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e
 KIND_CLUSTER ?= kind
 
 CI_MODE_ENABLED := ""
+NO_KIND_CLEANUP := ""
 
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -205,10 +206,11 @@ tidy: ## Tidy Go modules
 
 .PHONY: e2e-test
 e2e-test: ## Run e2e tests
-	cd e2e && export CI_MODE=$(CI_MODE_ENABLED) && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
+	cd e2e && export CI_MODE=$(CI_MODE_ENABLED) NO_KIND_CLEANUP=$(NO_KIND_CLEANUP) && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
 
 .PHONY: e2e-test-ci
 e2e-test-ci: CI_MODE_ENABLED=1 
+e2e-test-ci: NO_KIND_CLEANUP=1
 e2e-test-ci: IMG="controller:latest" ## Run e2e tests, telemetry collector runs inside k8s
 e2e-test-ci: docker-build e2e-test
 

From 6f8e1ae9ff8505b84f18b23444050023bfdb3ff2 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 16:20:46 +0100
Subject: [PATCH 15/18] fix(e2e): cleanup e2e_test.sh

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 e2e/e2e_test.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index 45f3ffa..c3352bb 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -41,18 +41,9 @@ kubectl apply -f ../docs/examples/simple-demo
 
 if [[ -z "${CI_MODE}" ]]; then
   $(cd .. && timeout 5m make run &)
-  #cd -
 else
   kind load docker-image controller:latest --name "${KIND_CLUSTER_NAME}"
   cd .. && make deploy && cd -
-  # helm upgrade --install \
-  #   --debug \
-  #   --wait \
-  #   --create-namespace \
-  #   --namespace example-tenant-ns \
-  #   -f values.yaml \
-  #   telemetry-controller \
-  #   "../charts/telemetry-controller" 
 fi
 
 # Create log-generator

From 495d978dd78a3c7eeda4f26b06599cf266b2d3db Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 16:21:00 +0100
Subject: [PATCH 16/18] fix(ci): add back toolchain

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 go.mod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index 5a496c5..14a2ea2 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/kube-logging/subscription-operator
 
 go 1.21
 
+toolchain go1.21.5
+
 require (
 	emperror.dev/errors v0.8.1
 	github.com/cisco-open/operator-tools v0.34.0

From 22f8fc2ceff49bdb0f1a895d44592b8bc4ca0cc0 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Thu, 25 Jan 2024 16:30:20 +0100
Subject: [PATCH 17/18] fix(ci): do not try to restore old k8s ctx

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 e2e/e2e_test.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index c3352bb..30557ce 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -73,7 +73,3 @@ echo "E2E test: PASSED"
 if [[ -z "${NO_KIND_CLEANUP}" ]]; then
   kind delete cluster --name "${KIND_CLUSTER_NAME}"
 fi
-
-if [[ "${CURRENT_K8S_CTX}" != "" ]]; then
-  kubectl config get-contexts -o name | grep -q "${CURRENT_K8S_CTX}" && kubectl config set-context "${CURRENT_K8S_CTX}"
-fi

From 5cda59e5ea8c81ae8abc8e7c782a4491f20491bc Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Fri, 26 Jan 2024 08:16:40 +0100
Subject: [PATCH 18/18] fix(ci): disable codeql-action for now

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .github/workflows/artifacts.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
index fa40d22..49bdbcb 100644
--- a/.github/workflows/artifacts.yaml
+++ b/.github/workflows/artifacts.yaml
@@ -138,7 +138,8 @@ jobs:
           path: trivy-results.sarif
           retention-days: 5
 
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
-        with:
-          sarif_file: trivy-results.sarif
+      # TODO: Enable it once it can successfully run
+      # - name: Upload Trivy scan results to GitHub Security tab
+      #   uses: github/codeql-action/upload-sarif@6b5b95806324a3ee7e164709fbfc152595556fe9 # v2.16.1
+      #   with:
+      #     sarif_file: trivy-results.sarif