Remove extra whitespace added by Helm 4

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Author: douglascamata

otel-ecs-ec2/Makefile

@@ -13,6 +13,7 @@ EBPF_ENABLE_SET ?= --set opentelemetry-ebpf-profiler.enabled=true
 
 HELM ?= helm
 YQ ?= yq
+MANIFEST_CLEANUP ?= sed 's/[[:space:]]*$$//' | sed -e ':a' -e 'N' -e '$$!ba' -e 's/\n\n*---/\n---/g'
 
 .PHONY: all otel-config otel-config-ebpf manifest manifest-ebpf
 
@@ -35,7 +36,8 @@ manifest:
 	@command -v $(HELM) >/dev/null 2>&1 || { echo "Error: helm not found in PATH" >&2; exit 1; }
 	@mkdir -p $(OUTPUT_DIR)
 	@$(HELM) dependency build $(CHART_PATH) >/dev/null
-	@$(HELM) template $(RELEASE) $(CHART_PATH) -f $(VALUES_FILE) > $(MANIFEST_FILE)
+	@$(HELM) template $(RELEASE) $(CHART_PATH) -f $(VALUES_FILE) \
+		| $(MANIFEST_CLEANUP) > $(MANIFEST_FILE)
 	@echo "Wrote $(MANIFEST_FILE)"
 
 # Render OpenTelemetry config with eBPF profiler enabled via --set
@@ -55,5 +57,6 @@ manifest-ebpf:
 	@command -v $(HELM) >/dev/null 2>&1 || { echo "Error: helm not found in PATH" >&2; exit 1; }
 	@mkdir -p $(OUTPUT_DIR)
 	@$(HELM) dependency build $(CHART_PATH) >/dev/null
-	@$(HELM) template $(RELEASE) $(CHART_PATH) -f $(VALUES_FILE) $(EBPF_ENABLE_SET) > $(MANIFEST_EBPF_FILE)
+	@$(HELM) template $(RELEASE) $(CHART_PATH) -f $(VALUES_FILE) $(EBPF_ENABLE_SET) \
+		| $(MANIFEST_CLEANUP) > $(MANIFEST_EBPF_FILE)
 	@echo "Wrote $(MANIFEST_EBPF_FILE)"

otel-ecs-ec2/examples/manifest-ebpf.yaml

@@ -11,9 +11,6 @@ metadata:
     app.kubernetes.io/instance: ecs-ec2-example
     app.kubernetes.io/version: "0.154.0"
     app.kubernetes.io/managed-by: Helm
-
-
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-ebpf-profiler/templates/serviceaccount.yaml
 apiVersion: v1
@@ -27,9 +24,6 @@ metadata:
     app.kubernetes.io/instance: ecs-ec2-example
     app.kubernetes.io/version: "0.154.0"
     app.kubernetes.io/managed-by: Helm
-
-
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/configmap-agent.yaml
 apiVersion: v1
@@ -894,7 +888,6 @@ data:
         resource:
           cx.agent.type: agent
           service.name: opentelemetry-collector
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-ebpf-profiler/templates/configmap-agent.yaml
 apiVersion: v1
@@ -969,7 +962,6 @@ data:
       telemetry:
         logs:
           encoding: json
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -993,7 +985,6 @@ rules:
   - apiGroups: ["extensions"]
     resources: ["replicasets"]
     verbs: ["get", "list", "watch"]
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/clusterrolebinding.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1015,7 +1006,6 @@ subjects:
 - kind: ServiceAccount
   name: ecs-ec2-example-opentelemetry-agent
   namespace: default
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/daemonset.yaml
 apiVersion: apps/v1
@@ -1153,7 +1143,6 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-ebpf-profiler/templates/daemonset.yaml
 apiVersion: apps/v1

otel-ecs-ec2/examples/manifest.yaml

@@ -11,9 +11,6 @@ metadata:
     app.kubernetes.io/instance: ecs-ec2-example
     app.kubernetes.io/version: "0.154.0"
     app.kubernetes.io/managed-by: Helm
-
-
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/configmap-agent.yaml
 apiVersion: v1
@@ -878,7 +875,6 @@ data:
         resource:
           cx.agent.type: agent
           service.name: opentelemetry-collector
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -902,7 +898,6 @@ rules:
   - apiGroups: ["extensions"]
     resources: ["replicasets"]
     verbs: ["get", "list", "watch"]
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/clusterrolebinding.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -924,7 +919,6 @@ subjects:
 - kind: ServiceAccount
   name: ecs-ec2-example-opentelemetry-agent
   namespace: default
-
 ---
 # Source: ecs-ec2-integration/charts/opentelemetry-agent/templates/daemonset.yaml
 apiVersion: apps/v1