Remove agentCollector and standaloneCollector (open-telemetry#216)

* First pass removing sections

* fixed template name

* set default mode

* updated examples and CI

* remove default mode value

* cleanup examples

* update UPGRADING.md

* update component to deployment-collector

* switch back to "standalone-collector"

charts/opentelemetry-collector/Chart.yaml

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

charts/opentelemetry-collector/README.md

@@ -30,10 +30,9 @@ See [UPGRADING.md](UPGRADING.md).
 ### Default configuration
 
 By default this chart will deploy an OpenTelemetry Collector as daemonset with three pipelines (logs, metrics and traces)
-and logging exporter enabled by default. Besides daemonset (agent), it can be also installed as standalone deployment.
-Both modes can be enabled together, in that case logs, metrics and traces will be flowing from agents to standalone collectors.
+and logging exporter enabled by default. Besides daemonset (agent), it can be also installed as deployment.
 
-*Example*: Install collector as a standalone deployment, and do not run it as an agent.
+*Example*: Install collector as a deployment, and do not run it as an agent.
 
 ```yaml
 mode: deployment
@@ -115,7 +114,7 @@ extraHostPathMounts:
 The collector can be used to collect logs sent to standard output by Kubernetes containers.
 This feature is disabled by default. It has the following requirements:
 
-- It needs agent collector to be deployed, which means it will not work if only standalone collector is enabled.
+- It needs agent collector to be deployed.
 - It requires the [contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) version
 of the collector image.
 

charts/opentelemetry-collector/UPGRADING.md

@@ -1,5 +1,11 @@
 # Upgrade guidelines
 
+## 0.18.0 to 0.19.0
+
+[Remove agentCollector and standaloneCollector settings](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/216)
+
+The `agentCollector` and `standaloneCollector` config sections have been removed.  Upgrades/installs of chart 0.19.0 will fail if `agentCollector` or `standaloneCollector` are in the values.yaml.  See the [Migrate to mode](#migrate-to-mode) steps for instructions on how to replace `agentCollector` and `standaloneCollector` with `mode`.
+
 ## 0.13.0 to 0.14.0
 
 [Remove two-deployment mode](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/159)

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: d134ebef14b4a264fac32e89493c2a438aaf760d528fdb38a651a5f477545f98
+        checksum/config: 2e21693664e4ad5804a6be5bad4b3a97a0131daee39fd7468a4649ca8c21efc3
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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

@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 9241b81cd28a8596b304b7f2e509fde9f5374c4981fe86ce69761f7915d983b5
+        checksum/config: c307cb787f8361f486c63f4cf4e45e209f53b35fcbf413a4f5eab55573f49b11
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 9349e74c19e5dc88c877efc9b9ba40c7b512caa76f35d8b2906fb195a419c2c1
+        checksum/config: 16a09ce51b108f6cc03ef89c4900251b1ed922939e62e889fa6d919586d75487
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

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

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

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 46ac4a0b69d8043315802369a0660d36b930891238bd207274fad60554972483
+        checksum/config: e93679a2a864a02cca1701d20cf563f5d97f66c4ceeb70f7cc6136a8dd3ed31e
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

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

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml

@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.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/daemonset-lifecycle-hooks/rendered/daemonset.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-collector-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 3e47cc02add099214b390093a8689ce904a7cf115dae41a0edb30d43613246bb
+        checksum/config: d7a382f35ecfd111315b3f3d8c6bf5be7037137c22ab36ebc5f2c80be5810816
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -87,8 +87,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/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml

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

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml

@@ -1,3 +1,5 @@
+mode: daemonset
+
 initContainers:
   - name: test
     command:

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 1703505d8829d464837489ddd1af01b656fd2b41050eb127eed9e44d22c2a58d
+        checksum/config: d7a382f35ecfd111315b3f3d8c6bf5be7037137c22ab36ebc5f2c80be5810816
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"

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

@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 7ad3932addfa0646271777066b3b82356d1b39d5cde7f6cca589e2ebad7b9a24
+        checksum/config: 7795dc89d81cfcfb5121d93328dfeee60a25b73b0951eecd1c962c1560a360d2
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml

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

charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml

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

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml

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

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml

@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.18.0
+    helm.sh/chart: opentelemetry-collector-0.19.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.51.0"
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a89fb13a97dc0577f5bf53583f4712390e0268cb465fa4621979970b0e95dde9
+        checksum/config: a56b297a43052b7366f2f44a984dca0a8f74b9d25c0b6736113dcc8e434e204e
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml

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

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml

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