From 102d2497654eec750e0d6836ffbd213e4982d400 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Mon, 15 Jan 2024 11:56:35 +0100
Subject: [PATCH 1/9] feat(otel col conf gen): add logging/debug

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 .../controller/telemetry/otel_conf_gen.go     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index 27522123..024b9a02 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -84,6 +84,9 @@ type OtelColConfigIR struct {
 
 func (cfgInput *OtelColConfigInput) generateExporters() map[string]any {
 	exporters := cfgInput.generateOTLPExporters()
+	exporters["logging/debug"] = map[string]any{
+		"verbosity": "detailed",
+	}
 	return exporters
 }
 
@@ -253,7 +256,7 @@ func generateSubscriptionAttributeProcessor(subscription v1alpha1.Subscription)
 }
 
 func generateRootPipeline() Pipeline {
-	return generatePipeline([]string{"filelog/kubernetes"}, []string{"k8sattributes"}, []string{"routing/tenants"})
+	return generatePipeline([]string{"filelog/kubernetes"}, []string{"k8sattributes"}, []string{"routing/tenants", "logging/debug"})
 }
 
 func (cfgInput *OtelColConfigInput) generateNamedPipelines() map[string]Pipeline {
@@ -362,27 +365,12 @@ func (cfgInput *OtelColConfigInput) generateDefaultKubernetesReceiver() map[stri
 					"output": "parser-docker",
 					"expr":   `body matches "^\\{"`,
 				},
-				{
-					"output": "parser-crio",
-					"expr":   `body matches "^[^ Z]+ "`,
-				},
 				{
 					"output": "parser-containerd",
 					"expr":   `body matches "^[^ Z]+Z"`,
 				},
 			},
 		},
-		{
-			"type":   "regex_parser",
-			"id":     "parser-crio",
-			"regex":  `'^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$'`,
-			"output": "extract_metadata_from_filepath",
-			"timestamp": map[string]string{
-				"parse_from":  "attributes.time",
-				"layout_type": "gotime",
-				"layout":      "2006-01-02T15:04:05.999999999Z07:00",
-			},
-		},
 		{
 			"type":   "regex_parser",
 			"id":     "parser-containerd",
@@ -479,6 +467,8 @@ func (cfgInput *OtelColConfigInput) ToIntermediateRepresentation() *OtelColConfi
 
 	result.Services.Pipelines.NamedPipelines = cfgInput.generateNamedPipelines()
 
+	result.Services.Telemetry = make(map[string]any)
+
 	return &result
 }
 

From 57fa7d565730e15e5d7fceceb4ec30ce886e1b86 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Fri, 12 Jan 2024 16:31:05 +0100
Subject: [PATCH 2/9] fix(otel col conf gen): routing statement quoting

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 internal/controller/telemetry/otel_conf_gen.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index 024b9a02..b64ee30c 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -41,7 +41,7 @@ type RoutingConnectorTableItem struct {
 
 type RoutingConnector struct {
 	Name             string                      `yaml:"-"`
-	DefaultPipelines []string                    `yaml:"default_pipelines,flow"`
+	DefaultPipelines []string                    `yaml:"default_pipelines,flow,omitempty"`
 	Table            []RoutingConnectorTableItem `yaml:"table"`
 }
 

From c53d165f613cc8b9665738937f775c889e4d94a9 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Fri, 12 Jan 2024 16:31:38 +0100
Subject: [PATCH 3/9] refactor(otel col conf gen): move debugging exporter to
 routing root

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 internal/controller/telemetry/otel_conf_gen.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index b64ee30c..89bb7e52 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -256,7 +256,7 @@ func generateSubscriptionAttributeProcessor(subscription v1alpha1.Subscription)
 }
 
 func generateRootPipeline() Pipeline {
-	return generatePipeline([]string{"filelog/kubernetes"}, []string{"k8sattributes"}, []string{"routing/tenants", "logging/debug"})
+	return generatePipeline([]string{"filelog/kubernetes"}, []string{"k8sattributes"}, []string{"routing/tenants"})
 }
 
 func (cfgInput *OtelColConfigInput) generateNamedPipelines() map[string]Pipeline {

From 9ec226fff892310c9a85997341b0668f2150d09b Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Mon, 15 Jan 2024 11:49:31 +0100
Subject: [PATCH 4/9] feat(otel col conf gen): add note regarding crio parser

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 internal/controller/telemetry/otel_conf_gen.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
index 89bb7e52..8650ecc7 100644
--- a/internal/controller/telemetry/otel_conf_gen.go
+++ b/internal/controller/telemetry/otel_conf_gen.go
@@ -356,6 +356,7 @@ func (cfgInput *OtelColConfigInput) generateDefaultKubernetesProcessor() map[str
 
 func (cfgInput *OtelColConfigInput) generateDefaultKubernetesReceiver() map[string]any {
 
+	// TODO: fix parser-crio
 	operators := []map[string]any{
 		{
 			"type": "router",

From 9a58936fe35a17a7fcf799fa0073589def3990ac Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Fri, 12 Jan 2024 16:29:26 +0100
Subject: [PATCH 5/9] feat(test): add e2e test

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile                                  |   4 +
 e2e/e2e_test.sh                           | 100 ++++++++++++++++++++++
 e2e/kustomization.yaml                    |   7 ++
 e2e/otlp_receiver.yaml                    |  59 +++++++++++++
 e2e/telemetry_v1alpha1_collector.yaml     |  14 +++
 e2e/telemetry_v1alpha1_oteloutputs.yaml   |  34 ++++++++
 e2e/telemetry_v1alpha1_subscriptions.yaml |  29 +++++++
 e2e/telemetry_v1alpha1_tenant.yaml        |  14 +++
 8 files changed, 261 insertions(+)
 create mode 100755 e2e/e2e_test.sh
 create mode 100644 e2e/kustomization.yaml
 create mode 100644 e2e/otlp_receiver.yaml
 create mode 100644 e2e/telemetry_v1alpha1_collector.yaml
 create mode 100644 e2e/telemetry_v1alpha1_oteloutputs.yaml
 create mode 100644 e2e/telemetry_v1alpha1_subscriptions.yaml
 create mode 100644 e2e/telemetry_v1alpha1_tenant.yaml

diff --git a/Makefile b/Makefile
index e7542e05..0e9b4869 100644
--- a/Makefile
+++ b/Makefile
@@ -186,3 +186,7 @@ run-delve: generate fmt vet manifests
 .PHONY: tidy
 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"; return 1
diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
new file mode 100755
index 00000000..e3705145
--- /dev/null
+++ b/e2e/e2e_test.sh
@@ -0,0 +1,100 @@
+#!/bin/env bash
+
+create_namespace() {
+  local namespace_name=$1
+  kubectl get namespace ${namespace_name} > /dev/null 2>&1
+
+  if [[ $? -ne 0 ]]; then
+    kubectl create namespace ${namespace_name}
+  fi
+}
+
+KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME_E2E:-so-e2e}
+# Backup current kubernetes context
+CURRENT_K8S_CTX=$(kubectl config view | grep "current" | cut -f 2 -d : | xargs)
+
+# Prepare env
+kind create cluster --name ${KIND_CLUSTER_NAME} --wait 5m
+kubectl config set-context kind-${KIND_CLUSTER_NAME}
+
+# Install prerequisites
+helm repo add jetstack https://charts.jetstack.io
+helm repo update
+
+helm upgrade \
+  --install \
+  cert-manager jetstack/cert-manager \
+  --namespace cert-manager \
+  --create-namespace \
+  --version v1.13.3 \
+  --set installCRDs=true \
+  --wait
+
+kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/latest/download/opentelemetry-operator.yaml --wait
+echo "Wait until otel operator pod is in ready state..."
+OTEL_COL_OPERATOR_POD="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep opentelemetry-operator)"
+kubectl wait --namespace opentelemetry-operator-system --for=condition=Ready pod/${OTEL_COL_OPERATOR_POD}
+
+# Create receivers
+create_namespace "otlp-receiver-1"
+create_namespace "otlp-receiver-2"
+
+kubectl apply -f otlp_receiver.yaml
+
+
+# Create subscription operator resources
+cd .. && make manifests generate install && cd -
+
+create_namespace "outputs"
+kubectl apply -f telemetry_v1alpha1_oteloutputs.yaml
+
+create_namespace "subscriptions"
+kubectl label namespace subscriptions subscription=subscription-sample
+kubectl apply -f telemetry_v1alpha1_subscriptions.yaml
+
+kubectl apply -f telemetry_v1alpha1_tenant.yaml
+kubectl apply -f telemetry_v1alpha1_collector.yaml
+
+
+# TODO: Run subscription operator in the script
+# cd .. && nohup make run & 
+# cd -
+
+# Create log-generators
+helm install --wait --create-namespace --namespace log-generator-1 --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator
+LOG_GENERATOR_POD_1="$(kubectl get pods --namespace log-generator-1 --no-headers -o custom-columns=':metadata.name' | grep generator)"
+kubectl label --namespace log-generator-1 pod ${LOG_GENERATOR_POD_1} tenant=tenant-sample
+kubectl label --namespace log-generator-1 pod ${LOG_GENERATOR_POD_1} subscription=subscription-sample-1
+
+helm install --wait --create-namespace --namespace log-generator-2 --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator
+LOG_GENERATOR_POD_2="$(kubectl get pods --namespace log-generator-2 --no-headers -o custom-columns=':metadata.name' | grep generator)"
+kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} tenant=tenant-sample
+kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} subscription=subscription-sample-2
+
+# Check for received messages - subscription-sample-1
+OTLP_RECEIVER_POD_1="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep receiver-1)"
+while
+  echo "Checking for subscription-sample-1 in ${OTLP_RECEIVER_POD_1} pod logs"
+  kubectl logs --namespace otlp-receiver-1 pods/"${OTLP_RECEIVER_POD_1}" | grep -q "subscription-sample-1"
+  [[ $? -ne 0 ]]
+do true; done
+
+# Check for received messages - subscription-sample-2
+OTLP_RECEIVER_POD_2="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep receiver-2)"
+while
+  echo "Checking for subscription-sample-2 in ${OTLP_RECEIVER_POD_2} pod logs"
+  kubectl logs --namespace otlp-receiver-2 pods/"${OTLP_RECEIVER_POD_2}" | grep -q "subscription-sample-2"
+  [[ $? -ne 0 ]]
+do true; done
+
+echo "E2E test: PASSED"
+
+
+# Check if cluster should be removed, ctx restored
+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
diff --git a/e2e/kustomization.yaml b/e2e/kustomization.yaml
new file mode 100644
index 00000000..bb84a7f9
--- /dev/null
+++ b/e2e/kustomization.yaml
@@ -0,0 +1,7 @@
+## Append samples of your project ##
+resources:
+- telemetry_v1alpha1_collector.yaml
+- telemetry_v1alpha1_subscription.yaml
+- telemetry_v1alpha1_tenant.yaml
+- telemetry_v1alpha1_oteloutput.yaml
+#+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/e2e/otlp_receiver.yaml b/e2e/otlp_receiver.yaml
new file mode 100644
index 00000000..f3a7ca71
--- /dev/null
+++ b/e2e/otlp_receiver.yaml
@@ -0,0 +1,59 @@
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+  name: test-otlp-receiver-1
+  namespace: otlp-receiver-1
+  labels:
+    test-otlp-receiver: test
+spec:
+  config: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+
+    exporters:
+      debug:
+        verbosity: detailed
+        sampling_initial: 1
+        sampling_thereafter: 1
+
+    service:
+      telemetry:
+        metrics:
+          address: 0.0.0.0:8888
+          level: detailed
+      pipelines:
+        logs:
+          receivers: [otlp]
+          exporters: [debug]
+---
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+  name: test-otlp-receiver-2
+  namespace: otlp-receiver-2
+  labels:
+    test-otlp-receiver: test
+spec:
+  config: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+
+    exporters:
+      debug:
+        verbosity: detailed
+        sampling_initial: 1
+        sampling_thereafter: 1
+
+    service:
+      telemetry:
+        metrics:
+          address: 0.0.0.0:8888
+          level: detailed
+      pipelines:
+        logs:
+          receivers: [otlp]
+          exporters: [debug]
\ No newline at end of file
diff --git a/e2e/telemetry_v1alpha1_collector.yaml b/e2e/telemetry_v1alpha1_collector.yaml
new file mode 100644
index 00000000..12c942ff
--- /dev/null
+++ b/e2e/telemetry_v1alpha1_collector.yaml
@@ -0,0 +1,14 @@
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: Collector
+metadata:
+  labels:
+    app.kubernetes.io/name: collector
+    app.kubernetes.io/instance: collector-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+  name: collector-sample
+spec:
+  tenantSelectors:
+  - matchLabels:
+      tenant: tenantA
diff --git a/e2e/telemetry_v1alpha1_oteloutputs.yaml b/e2e/telemetry_v1alpha1_oteloutputs.yaml
new file mode 100644
index 00000000..dd9cdbf4
--- /dev/null
+++ b/e2e/telemetry_v1alpha1_oteloutputs.yaml
@@ -0,0 +1,34 @@
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: OtelOutput
+metadata:
+  labels:
+    app.kubernetes.io/name: oteloutput
+    app.kubernetes.io/instance: oteloutput-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+  name: oteloutput-1
+  namespace: outputs
+spec:
+  otlp:
+    endpoint: test-otlp-receiver-1-collector.otlp-receiver-1:4317
+    tls:
+      insecure: true
+---
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: OtelOutput
+metadata:
+  labels:
+    app.kubernetes.io/name: oteloutput
+    app.kubernetes.io/instance: oteloutput-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+  name: oteloutput-2
+  namespace: outputs
+spec:
+  otlp:
+    endpoint: test-otlp-receiver-2-collector.otlp-receiver-2:4317
+    tls:
+      insecure: true
+
diff --git a/e2e/telemetry_v1alpha1_subscriptions.yaml b/e2e/telemetry_v1alpha1_subscriptions.yaml
new file mode 100644
index 00000000..70a3dc8b
--- /dev/null
+++ b/e2e/telemetry_v1alpha1_subscriptions.yaml
@@ -0,0 +1,29 @@
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: Subscription
+metadata:
+  labels:
+    app.kubernetes.io/name: subscription
+    app.kubernetes.io/instance: subscription-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+  name: subscription-sample-1
+spec:
+  outputs:
+    - name: oteloutput-1
+      namespace: outputs
+---
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: Subscription
+metadata:
+  labels:
+    app.kubernetes.io/name: subscription
+    app.kubernetes.io/instance: subscription-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+  name: subscription-sample-2
+spec:
+  outputs:
+    - name: oteloutput-2
+      namespace: outputs
\ No newline at end of file
diff --git a/e2e/telemetry_v1alpha1_tenant.yaml b/e2e/telemetry_v1alpha1_tenant.yaml
new file mode 100644
index 00000000..aaa2c6e9
--- /dev/null
+++ b/e2e/telemetry_v1alpha1_tenant.yaml
@@ -0,0 +1,14 @@
+apiVersion: telemetry.kube-logging.dev/v1alpha1
+kind: Tenant
+metadata:
+  labels:
+    app.kubernetes.io/name: tenant
+    app.kubernetes.io/instance: tenant-sample
+    app.kubernetes.io/part-of: subscription-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: subscription-operator
+    tenant: tenantA
+  name: tenant-sample
+spec:
+  subscriptionNamespaceSelectors:
+    - {}

From a80ae41207a08234448628cada901f5f8c137ea6 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Fri, 19 Jan 2024 17:09:58 +0100
Subject: [PATCH 6/9] fix(test): simplify e2e test

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

diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index e3705145..c89d03e0 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -1,12 +1,9 @@
 #!/bin/env bash
 
-create_namespace() {
-  local namespace_name=$1
-  kubectl get namespace ${namespace_name} > /dev/null 2>&1
-
-  if [[ $? -ne 0 ]]; then
-    kubectl create namespace ${namespace_name}
-  fi
+create_if_does_not_exist() {
+  local resource_type=$1
+  local resource_name=$2
+  kubectl create  "${resource_type}" "${resource_name}" --dry-run=client -o yaml | kubectl apply -f-
 }
 
 KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME_E2E:-so-e2e}
@@ -18,12 +15,11 @@ kind create cluster --name ${KIND_CLUSTER_NAME} --wait 5m
 kubectl config set-context kind-${KIND_CLUSTER_NAME}
 
 # Install prerequisites
-helm repo add jetstack https://charts.jetstack.io
-helm repo update
 
 helm upgrade \
   --install \
-  cert-manager jetstack/cert-manager \
+  --repo https://charts.jetstack.io \
+  cert-manager cert-manager \
   --namespace cert-manager \
   --create-namespace \
   --version v1.13.3 \
@@ -32,12 +28,11 @@ helm upgrade \
 
 kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/latest/download/opentelemetry-operator.yaml --wait
 echo "Wait until otel operator pod is in ready state..."
-OTEL_COL_OPERATOR_POD="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep opentelemetry-operator)"
-kubectl wait --namespace opentelemetry-operator-system --for=condition=Ready pod/${OTEL_COL_OPERATOR_POD}
+kubectl wait --namespace opentelemetry-operator-system --for=condition=available deployment/opentelemetry-operator-controller-manager --timeout=300s
 
 # Create receivers
-create_namespace "otlp-receiver-1"
-create_namespace "otlp-receiver-2"
+create_if_does_not_exist "namespace" "otlp-receiver-1"
+create_if_does_not_exist "namespace" "otlp-receiver-2"
 
 kubectl apply -f otlp_receiver.yaml
 
@@ -45,10 +40,10 @@ kubectl apply -f otlp_receiver.yaml
 # Create subscription operator resources
 cd .. && make manifests generate install && cd -
 
-create_namespace "outputs"
+create_if_does_not_exist "namespace" "outputs"
 kubectl apply -f telemetry_v1alpha1_oteloutputs.yaml
 
-create_namespace "subscriptions"
+create_if_does_not_exist "namespace" "subscriptions"
 kubectl label namespace subscriptions subscription=subscription-sample
 kubectl apply -f telemetry_v1alpha1_subscriptions.yaml
 
@@ -72,18 +67,17 @@ kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} tenant=tena
 kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} subscription=subscription-sample-2
 
 # Check for received messages - subscription-sample-1
-OTLP_RECEIVER_POD_1="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep receiver-1)"
 while
-  echo "Checking for subscription-sample-1 in ${OTLP_RECEIVER_POD_1} pod logs"
-  kubectl logs --namespace otlp-receiver-1 pods/"${OTLP_RECEIVER_POD_1}" | grep -q "subscription-sample-1"
+  echo "Checking for subscription-sample-1 in deployments/test-otlp-receiver-1-collector logs"
+  kubectl logs --namespace otlp-receiver-1 deployments/test-otlp-receiver-1-collector | grep -q "subscription-sample-1"
   [[ $? -ne 0 ]]
 do true; done
 
 # Check for received messages - subscription-sample-2
-OTLP_RECEIVER_POD_2="$(kubectl get pods -A --no-headers -o custom-columns=':metadata.name' | grep receiver-2)"
 while
-  echo "Checking for subscription-sample-2 in ${OTLP_RECEIVER_POD_2} pod logs"
-  kubectl logs --namespace otlp-receiver-2 pods/"${OTLP_RECEIVER_POD_2}" | grep -q "subscription-sample-2"
+  echo "Checking for subscription-sample-2 in deployments/test-otlp-receiver-2-collector logs"
+  kubectl logs --namespace otlp-receiver-2 deployments/test-otlp-receiver-2-collector | grep -q "subscription-sample-2"
+
   [[ $? -ne 0 ]]
 do true; done
 

From ea2ed608472512df8bd236e71af1f1131a5318fa Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Tue, 23 Jan 2024 14:47:18 +0100
Subject: [PATCH 7/9] docs(examples): rename another-subscription to
 subscription-2 for easier grepping

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 docs/examples/one_tenant_two_subscriptions.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/one_tenant_two_subscriptions.yaml b/docs/examples/one_tenant_two_subscriptions.yaml
index e61d9d4a..773ed447 100644
--- a/docs/examples/one_tenant_two_subscriptions.yaml
+++ b/docs/examples/one_tenant_two_subscriptions.yaml
@@ -37,7 +37,7 @@ spec:
 apiVersion: telemetry.kube-logging.dev/v1alpha1
 kind: Subscription
 metadata:
-  name: subscription-sample
+  name: subscription-sample-1
   namespace: example-tenant-ns
 spec:
   ottl: 'route()'
@@ -48,7 +48,7 @@ spec:
 apiVersion: telemetry.kube-logging.dev/v1alpha1
 kind: Subscription
 metadata:
-  name: another-subscription-sample
+  name: subscription-sample-2
   namespace: example-tenant-ns
 spec:
   ottl: 'route()'

From 81f5d4962394a02cd7b0e763cf89f2bb1559899b Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Tue, 23 Jan 2024 14:48:03 +0100
Subject: [PATCH 8/9] feat(test): use docs/example for e2e test

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 e2e/e2e_test.sh                           | 51 ++++++--------------
 e2e/kustomization.yaml                    |  7 ---
 e2e/otlp_receiver.yaml                    | 59 -----------------------
 e2e/telemetry_v1alpha1_collector.yaml     | 14 ------
 e2e/telemetry_v1alpha1_oteloutputs.yaml   | 34 -------------
 e2e/telemetry_v1alpha1_subscriptions.yaml | 29 -----------
 e2e/telemetry_v1alpha1_tenant.yaml        | 14 ------
 7 files changed, 15 insertions(+), 193 deletions(-)
 delete mode 100644 e2e/kustomization.yaml
 delete mode 100644 e2e/otlp_receiver.yaml
 delete mode 100644 e2e/telemetry_v1alpha1_collector.yaml
 delete mode 100644 e2e/telemetry_v1alpha1_oteloutputs.yaml
 delete mode 100644 e2e/telemetry_v1alpha1_subscriptions.yaml
 delete mode 100644 e2e/telemetry_v1alpha1_tenant.yaml

diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index c89d03e0..24633f75 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -11,8 +11,8 @@ KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME_E2E:-so-e2e}
 CURRENT_K8S_CTX=$(kubectl config view | grep "current" | cut -f 2 -d : | xargs)
 
 # Prepare env
-kind create cluster --name ${KIND_CLUSTER_NAME} --wait 5m
-kubectl config set-context kind-${KIND_CLUSTER_NAME}
+kind create cluster --name "${KIND_CLUSTER_NAME}" --wait 5m
+kubectl config set-context kind-"${KIND_CLUSTER_NAME}"
 
 # Install prerequisites
 
@@ -30,53 +30,32 @@ kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releas
 echo "Wait until otel operator pod is in ready state..."
 kubectl wait --namespace opentelemetry-operator-system --for=condition=available deployment/opentelemetry-operator-controller-manager --timeout=300s
 
-# Create receivers
-create_if_does_not_exist "namespace" "otlp-receiver-1"
-create_if_does_not_exist "namespace" "otlp-receiver-2"
-
-kubectl apply -f otlp_receiver.yaml
-
-
 # Create subscription operator resources
 cd .. && make manifests generate install && cd -
 
-create_if_does_not_exist "namespace" "outputs"
-kubectl apply -f telemetry_v1alpha1_oteloutputs.yaml
-
-create_if_does_not_exist "namespace" "subscriptions"
-kubectl label namespace subscriptions subscription=subscription-sample
-kubectl apply -f telemetry_v1alpha1_subscriptions.yaml
-
-kubectl apply -f telemetry_v1alpha1_tenant.yaml
-kubectl apply -f telemetry_v1alpha1_collector.yaml
+# Use example
+kubectl apply -f ../docs/examples
 
 
-# TODO: Run subscription operator in the script
-# cd .. && nohup make run & 
-# cd -
+cd .. && timeout 5m make run & 
+cd -
 
-# Create log-generators
-helm install --wait --create-namespace --namespace log-generator-1 --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator
-LOG_GENERATOR_POD_1="$(kubectl get pods --namespace log-generator-1 --no-headers -o custom-columns=':metadata.name' | grep generator)"
-kubectl label --namespace log-generator-1 pod ${LOG_GENERATOR_POD_1} tenant=tenant-sample
-kubectl label --namespace log-generator-1 pod ${LOG_GENERATOR_POD_1} subscription=subscription-sample-1
+# Create log-generator
+helm install --wait --create-namespace --namespace example-tenant-ns --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator
 
-helm install --wait --create-namespace --namespace log-generator-2 --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator
-LOG_GENERATOR_POD_2="$(kubectl get pods --namespace log-generator-2 --no-headers -o custom-columns=':metadata.name' | grep generator)"
-kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} tenant=tenant-sample
-kubectl label --namespace log-generator-2 pod ${LOG_GENERATOR_POD_2} subscription=subscription-sample-2
 
-# Check for received messages - subscription-sample-1
+# Check for received messages - subscription-sample
 while
-  echo "Checking for subscription-sample-1 in deployments/test-otlp-receiver-1-collector logs"
-  kubectl logs --namespace otlp-receiver-1 deployments/test-otlp-receiver-1-collector | grep -q "subscription-sample-1"
+  echo "Checking for subscription-sample-1 in deployments/receiver-collector logs"
+  kubectl logs --namespace example-tenant-ns deployments/receiver-collector | grep -q "subscription-sample-1"
+  
   [[ $? -ne 0 ]]
 do true; done
 
 # Check for received messages - subscription-sample-2
 while
-  echo "Checking for subscription-sample-2 in deployments/test-otlp-receiver-2-collector logs"
-  kubectl logs --namespace otlp-receiver-2 deployments/test-otlp-receiver-2-collector | grep -q "subscription-sample-2"
+  echo "Checking for subscription-sample-2 in deployments/receiver-collector logs"
+  kubectl logs --namespace example-tenant-ns deployments/receiver-collector | grep -q "subscription-sample-2"
 
   [[ $? -ne 0 ]]
 do true; done
@@ -86,7 +65,7 @@ echo "E2E test: PASSED"
 
 # Check if cluster should be removed, ctx restored
 if [[ -z "${NO_KIND_CLEANUP}" ]]; then
-  kind delete cluster --name ${KIND_CLUSTER_NAME}
+  kind delete cluster --name "${KIND_CLUSTER_NAME}"
 fi
 
 if [[ "${CURRENT_K8S_CTX}" != "" ]]; then
diff --git a/e2e/kustomization.yaml b/e2e/kustomization.yaml
deleted file mode 100644
index bb84a7f9..00000000
--- a/e2e/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-## Append samples of your project ##
-resources:
-- telemetry_v1alpha1_collector.yaml
-- telemetry_v1alpha1_subscription.yaml
-- telemetry_v1alpha1_tenant.yaml
-- telemetry_v1alpha1_oteloutput.yaml
-#+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/e2e/otlp_receiver.yaml b/e2e/otlp_receiver.yaml
deleted file mode 100644
index f3a7ca71..00000000
--- a/e2e/otlp_receiver.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-apiVersion: opentelemetry.io/v1alpha1
-kind: OpenTelemetryCollector
-metadata:
-  name: test-otlp-receiver-1
-  namespace: otlp-receiver-1
-  labels:
-    test-otlp-receiver: test
-spec:
-  config: |
-    receivers:
-      otlp:
-        protocols:
-          grpc:
-
-    exporters:
-      debug:
-        verbosity: detailed
-        sampling_initial: 1
-        sampling_thereafter: 1
-
-    service:
-      telemetry:
-        metrics:
-          address: 0.0.0.0:8888
-          level: detailed
-      pipelines:
-        logs:
-          receivers: [otlp]
-          exporters: [debug]
----
-apiVersion: opentelemetry.io/v1alpha1
-kind: OpenTelemetryCollector
-metadata:
-  name: test-otlp-receiver-2
-  namespace: otlp-receiver-2
-  labels:
-    test-otlp-receiver: test
-spec:
-  config: |
-    receivers:
-      otlp:
-        protocols:
-          grpc:
-
-    exporters:
-      debug:
-        verbosity: detailed
-        sampling_initial: 1
-        sampling_thereafter: 1
-
-    service:
-      telemetry:
-        metrics:
-          address: 0.0.0.0:8888
-          level: detailed
-      pipelines:
-        logs:
-          receivers: [otlp]
-          exporters: [debug]
\ No newline at end of file
diff --git a/e2e/telemetry_v1alpha1_collector.yaml b/e2e/telemetry_v1alpha1_collector.yaml
deleted file mode 100644
index 12c942ff..00000000
--- a/e2e/telemetry_v1alpha1_collector.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: Collector
-metadata:
-  labels:
-    app.kubernetes.io/name: collector
-    app.kubernetes.io/instance: collector-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-  name: collector-sample
-spec:
-  tenantSelectors:
-  - matchLabels:
-      tenant: tenantA
diff --git a/e2e/telemetry_v1alpha1_oteloutputs.yaml b/e2e/telemetry_v1alpha1_oteloutputs.yaml
deleted file mode 100644
index dd9cdbf4..00000000
--- a/e2e/telemetry_v1alpha1_oteloutputs.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: OtelOutput
-metadata:
-  labels:
-    app.kubernetes.io/name: oteloutput
-    app.kubernetes.io/instance: oteloutput-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-  name: oteloutput-1
-  namespace: outputs
-spec:
-  otlp:
-    endpoint: test-otlp-receiver-1-collector.otlp-receiver-1:4317
-    tls:
-      insecure: true
----
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: OtelOutput
-metadata:
-  labels:
-    app.kubernetes.io/name: oteloutput
-    app.kubernetes.io/instance: oteloutput-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-  name: oteloutput-2
-  namespace: outputs
-spec:
-  otlp:
-    endpoint: test-otlp-receiver-2-collector.otlp-receiver-2:4317
-    tls:
-      insecure: true
-
diff --git a/e2e/telemetry_v1alpha1_subscriptions.yaml b/e2e/telemetry_v1alpha1_subscriptions.yaml
deleted file mode 100644
index 70a3dc8b..00000000
--- a/e2e/telemetry_v1alpha1_subscriptions.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: Subscription
-metadata:
-  labels:
-    app.kubernetes.io/name: subscription
-    app.kubernetes.io/instance: subscription-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-  name: subscription-sample-1
-spec:
-  outputs:
-    - name: oteloutput-1
-      namespace: outputs
----
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: Subscription
-metadata:
-  labels:
-    app.kubernetes.io/name: subscription
-    app.kubernetes.io/instance: subscription-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-  name: subscription-sample-2
-spec:
-  outputs:
-    - name: oteloutput-2
-      namespace: outputs
\ No newline at end of file
diff --git a/e2e/telemetry_v1alpha1_tenant.yaml b/e2e/telemetry_v1alpha1_tenant.yaml
deleted file mode 100644
index aaa2c6e9..00000000
--- a/e2e/telemetry_v1alpha1_tenant.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: telemetry.kube-logging.dev/v1alpha1
-kind: Tenant
-metadata:
-  labels:
-    app.kubernetes.io/name: tenant
-    app.kubernetes.io/instance: tenant-sample
-    app.kubernetes.io/part-of: subscription-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: subscription-operator
-    tenant: tenantA
-  name: tenant-sample
-spec:
-  subscriptionNamespaceSelectors:
-    - {}

From 6595583b23f18d248b21690e235fdb7c6d20e684 Mon Sep 17 00:00:00 2001
From: Szilard Parrag <szilard.parrag@axoflow.com>
Date: Wed, 24 Jan 2024 12:21:26 +0100
Subject: [PATCH 9/9] feat(e2e): simplify script

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
---
 Makefile                                                 | 2 +-
 .../{ => simple-demo}/one_tenant_two_subscriptions.yaml  | 0
 docs/examples/{ => simple-demo}/receiver.yaml            | 0
 e2e/e2e_test.sh                                          | 9 +++++----
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename docs/examples/{ => simple-demo}/one_tenant_two_subscriptions.yaml (100%)
 rename docs/examples/{ => simple-demo}/receiver.yaml (100%)

diff --git a/Makefile b/Makefile
index 0e9b4869..4f705a66 100644
--- a/Makefile
+++ b/Makefile
@@ -189,4 +189,4 @@ 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"; return 1
+	cd e2e && timeout --foreground 15m ./e2e_test.sh || (echo "E2E test failed"; exit 1)
diff --git a/docs/examples/one_tenant_two_subscriptions.yaml b/docs/examples/simple-demo/one_tenant_two_subscriptions.yaml
similarity index 100%
rename from docs/examples/one_tenant_two_subscriptions.yaml
rename to docs/examples/simple-demo/one_tenant_two_subscriptions.yaml
diff --git a/docs/examples/receiver.yaml b/docs/examples/simple-demo/receiver.yaml
similarity index 100%
rename from docs/examples/receiver.yaml
rename to docs/examples/simple-demo/receiver.yaml
diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
index 24633f75..7535aabb 100755
--- a/e2e/e2e_test.sh
+++ b/e2e/e2e_test.sh
@@ -1,5 +1,7 @@
 #!/bin/env bash
 
+set -eou pipefail
+
 create_if_does_not_exist() {
   local resource_type=$1
   local resource_name=$2
@@ -31,14 +33,13 @@ echo "Wait until otel operator pod is in ready state..."
 kubectl wait --namespace opentelemetry-operator-system --for=condition=available deployment/opentelemetry-operator-controller-manager --timeout=300s
 
 # Create subscription operator resources
-cd .. && make manifests generate install && cd -
+(cd .. && make manifests generate install)
 
 # Use example
-kubectl apply -f ../docs/examples
+kubectl apply -f ../docs/examples/simple-demo
 
 
-cd .. && timeout 5m make run & 
-cd -
+(cd .. && timeout 5m make run &)
 
 # Create log-generator
 helm install --wait --create-namespace --namespace example-tenant-ns --generate-name oci://ghcr.io/kube-logging/helm-charts/log-generator