Remove two-deployment mode

Makefile

@@ -7,10 +7,13 @@ generate-examples:
 		EXAMPLES_DIR=charts/$${chart_name}/examples; \
 		EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
 		for example in $${EXAMPLES}; do \
+			VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
 			rm -rf "$${EXAMPLES_DIR}/$${example}/rendered"; \
-			helm template example charts/$${chart_name} --values "$${EXAMPLES_DIR}/$${example}/values.yaml" --output-dir "$${EXAMPLES_DIR}/$${example}/rendered"; \
-			mv $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered"; \
-			rm -rf $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}; \
+			for value in $${VALUES}; do \
+				helm template example charts/$${chart_name} --values $${value} --output-dir "$${EXAMPLES_DIR}/$${example}/rendered"; \
+				mv $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered"; \
+				rm -rf $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}; \
+			done; \
 		done; \
 	done
 
@@ -21,7 +24,10 @@ check-examples:
 		EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
 		for example in $${EXAMPLES}; do \
 			echo "Checking example: $${example}"; \
-			helm template example charts/$${chart_name} --values "$${EXAMPLES_DIR}/$${example}/values.yaml" --output-dir "${TMP_DIRECTORY}/$${example}"; \
+			VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
+			for value in $${VALUES}; do \
+				helm template example charts/$${chart_name} --values $${value} --output-dir "${TMP_DIRECTORY}/$${example}"; \
+			done; \
 			if diff "$${EXAMPLES_DIR}/$${example}/rendered" "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates" > /dev/null; then \
 				echo "Passed $${example}"; \
 			else \
@@ -32,3 +38,4 @@ check-examples:
 			rm -rf ${TMP_DIRECTORY}; \
 		done; \
 	done
+

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.12.1
+version: 0.13.0
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

charts/opentelemetry-collector/ci/agent-collector-conatiner-logs-values.yaml

@@ -1,6 +1,2 @@
-agentCollector:
+containerLogs:
   enabled: true
-  containerLogs:
-    enabled: true
-standaloneCollector:
-  enabled: false

charts/opentelemetry-collector/ci/agent-collector-values.yaml

@@ -1,4 +0,0 @@
-agentCollector:
-  enabled: true
-standaloneCollector:
-  enabled: false

charts/opentelemetry-collector/ci/clusterrole-values.yaml

@@ -13,8 +13,3 @@ clusterRole:
       - 'watch'
   clusterRoleBinding:
     name: "testing-clusterrolebinding"
-
-agentCollector:
-  enabled: true
-standaloneCollector:
-  enabled: false

charts/opentelemetry-collector/ci/config-override-values.yaml

@@ -1,16 +1,13 @@
-agentCollector:
-  enabled: true
-  configOverride:
-    receivers:
-      hostmetrics:
-        scrapers:
-          cpu:
-          disk:
-          filesystem:
-    service:
-      pipelines:
-        metrics:
-          receivers: [prometheus, hostmetrics]
-
-standaloneCollector:
-  enabled: false
+config:
+  receivers:
+    jaeger: null
+    otlp: null
+    hostmetrics:
+      scrapers:
+        cpu:
+        disk:
+        filesystem:
+  service:
+    pipelines:
+      metrics:
+        receivers: [prometheus, hostmetrics]

charts/opentelemetry-collector/ci/disabling-protocols-values.yaml

@@ -7,8 +7,3 @@ ports:
     enabled: false
   zipkin:
     enabled: false
-
-agentCollector:
-  enabled: true
-standaloneCollector:
-  enabled: false

charts/opentelemetry-collector/ci/standalone-collector-values.yaml

@@ -1,4 +1 @@
-agentCollector:
-  enabled: false
-standaloneCollector:
-  enabled: true
+mode: deployment

charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml

@@ -0,0 +1,20 @@
+config:
+  exporters:
+    otlp:
+      endpoint: example-opentelemetry-collector:4317
+      tls:
+        insecure: true
+  service:
+    pipelines:
+      logs:
+        exporters:
+         - otlp
+         - logging
+      metrics:
+        exporters:
+         - otlp
+         - logging
+      traces:
+        exporters:
+         - otlp
+         - logging

charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml

@@ -0,0 +1 @@
+mode: deployment

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/configmap-agent.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
@@ -21,13 +21,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "204"
+        size_mib: "819"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 409
-        spike_limit_mib: 128
+        limit_mib: 1638
+        spike_limit_mib: 512
     receivers:
       jaeger:
         protocols:
@@ -61,6 +61,7 @@ data:
         logs:
           exporters:
           - otlp
+          - logging
           processors:
           - memory_limiter
           - batch
@@ -69,6 +70,7 @@ data:
         metrics:
           exporters:
           - otlp
+          - logging
           processors:
           - memory_limiter
           - batch
@@ -78,6 +80,7 @@ data:
         traces:
           exporters:
           - otlp
+          - logging
           processors:
           - memory_limiter
           - batch

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/configmap.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"

charts/opentelemetry-collector/examples/agent-only/rendered/daemonset.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
@@ -19,11 +19,13 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a4eaf97a54f468568eb69407489b2d1c3d4800fa22bee5c6b4fb593fc8eb2bfd
+        checksum/config: c9bc18bc466c9f91e528d3d493f4586709f65e49f52772145591db421401d9de
+
       labels:
         app.kubernetes.io/name: opentelemetry-collector
         app.kubernetes.io/instance: example
         component: agent-collector
+
     spec:
 
       serviceAccountName: example-opentelemetry-collector
@@ -79,8 +81,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 256m
-              memory: 512Mi
+              cpu: 1
+              memory: 2Gi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/deployment.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

@@ -5,11 +5,12 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   replicas: 1
   selector:
@@ -20,11 +21,13 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 16a2701362c0b0946768257cf9a681979ed9b6d6a274dd56cff0531cd938f4a0
+        checksum/config: b7652074334382cbe3cdb9599f0567efb9646e2d1897a4249a42638490a5a41b
+
       labels:
         app.kubernetes.io/name: opentelemetry-collector
         app.kubernetes.io/instance: example
         component: standalone-collector
+
     spec:
 
       serviceAccountName: example-opentelemetry-collector

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/service.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/serviceaccount.yaml → charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"

charts/opentelemetry-collector/examples/agent-only/rendered/configmap-agent.yaml → charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
@@ -17,13 +17,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "204"
+        size_mib: "819"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 409
-        spike_limit_mib: 128
+        limit_mib: 1638
+        spike_limit_mib: 512
     receivers:
       jaeger:
         protocols:

charts/opentelemetry-collector/examples/agent-and-standalone/rendered/daemonset.yaml → charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
@@ -19,11 +19,13 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: c0169178595958e64fddb5217b2e37306cd486549e563db94d46cf2af0cb0930
+        checksum/config: c7fc12f295730f4ad30d5f31a97650360dcc6ef381cc9007e35a72332f7a3f4b
+
       labels:
         app.kubernetes.io/name: opentelemetry-collector
         app.kubernetes.io/instance: example
         component: agent-collector
+
     spec:
 
       serviceAccountName: example-opentelemetry-collector
@@ -79,8 +81,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 256m
-              memory: 512Mi
+              cpu: 1
+              memory: 2Gi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

charts/opentelemetry-collector/examples/agent-only/rendered/serviceaccount.yaml → charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml

@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"

charts/opentelemetry-collector/examples/standalone-only/rendered/configmap.yaml → charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"

charts/opentelemetry-collector/examples/standalone-only/rendered/deployment.yaml → charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

@@ -5,11 +5,12 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.12.1
+    helm.sh/chart: opentelemetry-collector-0.13.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.47.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   replicas: 1
   selector:
@@ -20,11 +21,13 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 16a2701362c0b0946768257cf9a681979ed9b6d6a274dd56cff0531cd938f4a0
+        checksum/config: b7652074334382cbe3cdb9599f0567efb9646e2d1897a4249a42638490a5a41b
+
       labels:
         app.kubernetes.io/name: opentelemetry-collector
         app.kubernetes.io/instance: example
         component: standalone-collector
+
     spec:
 
       serviceAccountName: example-opentelemetry-collector