From 7a9309da0b47eae2853c010fd4ee8e45cb9999f3 Mon Sep 17 00:00:00 2001
From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:57:20 -0600
Subject: [PATCH] Remove agentCollector and standaloneCollector (#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     |   2 +-
 charts/opentelemetry-collector/README.md      |   7 +-
 charts/opentelemetry-collector/UPGRADING.md   |   6 +
 .../ci/default-values.yaml                    |   0
 .../ci/standalone-collector-values.yaml       |   4 -
 .../rendered/configmap-agent.yaml             |   2 +-
 .../rendered/configmap.yaml                   |   2 +-
 .../rendered/daemonset.yaml                   |   4 +-
 .../rendered/deployment.yaml                  |   4 +-
 .../rendered/service.yaml                     |   2 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../rendered/configmap-agent.yaml             |   2 +-
 .../rendered/daemonset.yaml                   |   4 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../rendered/configmap-agent.yaml             |   2 +-
 .../rendered/daemonset.yaml                   |   4 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../rendered/configmap-agent.yaml             |   8 +-
 .../rendered/daemonset.yaml                   |   8 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../daemonset-lifecycle-hooks/values.yaml     |   2 +
 .../rendered/configmap-agent.yaml             |   2 +-
 .../daemonset-only/rendered/daemonset.yaml    |   4 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../deployment-only/rendered/configmap.yaml   |   2 +-
 .../deployment-only/rendered/deployment.yaml  |   4 +-
 .../deployment-only/rendered/service.yaml     |   2 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../rendered/configmap.yaml                   |   2 +-
 .../rendered/deployment.yaml                  |   4 +-
 .../rendered/service.yaml                     |   2 +-
 .../rendered/serviceaccount.yaml              |   2 +-
 .../templates/NOTES.txt                       |   8 +-
 .../templates/_config.tpl                     |  31 +---
 .../templates/_helpers.tpl                    |  49 +-----
 .../templates/_pod.tpl                        |   4 +-
 .../templates/configmap-agent.yaml            |   2 +-
 .../templates/configmap.yaml                  |   2 +-
 .../templates/daemonset.yaml                  |  17 +-
 .../templates/deployment.yaml                 |  17 +-
 .../templates/hpa.yaml                        |   2 +-
 .../templates/ingress.yaml                    |   2 +-
 .../templates/pdb.yaml                        |   2 +-
 .../templates/podmonitor.yaml                 |   2 +-
 .../templates/service.yaml                    |   4 +-
 .../templates/servicemonitor.yaml             |   2 +-
 .../values.schema.json                        | 166 +-----------------
 charts/opentelemetry-collector/values.yaml    |  54 +-----
 48 files changed, 95 insertions(+), 368 deletions(-)
 delete mode 100644 charts/opentelemetry-collector/ci/default-values.yaml
 delete mode 100644 charts/opentelemetry-collector/ci/standalone-collector-values.yaml

diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
index 1e9ff9f2d..7e07119a9 100644
--- a/charts/opentelemetry-collector/Chart.yaml
+++ b/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/
diff --git a/charts/opentelemetry-collector/README.md b/charts/opentelemetry-collector/README.md
index cf0bdc3cd..4369fd83c 100644
--- a/charts/opentelemetry-collector/README.md
+++ b/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.
 
diff --git a/charts/opentelemetry-collector/UPGRADING.md b/charts/opentelemetry-collector/UPGRADING.md
index 6e09f46d5..6448ed1fc 100644
--- a/charts/opentelemetry-collector/UPGRADING.md
+++ b/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)
diff --git a/charts/opentelemetry-collector/ci/default-values.yaml b/charts/opentelemetry-collector/ci/default-values.yaml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/charts/opentelemetry-collector/ci/standalone-collector-values.yaml b/charts/opentelemetry-collector/ci/standalone-collector-values.yaml
deleted file mode 100644
index b1974f19c..000000000
--- a/charts/opentelemetry-collector/ci/standalone-collector-values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-standaloneCollector:
-  enabled: true
-agentCollector:
-  enabled: false
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
index fc98e6416..58721ca90 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
index 6986abfc3..61c5a95b6 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
index 02c2fc03a..291f7c1e4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
index e79d4a05d..f134c1939 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
index 81dedca71..0d0d50ff0 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
index d063c9be4..d10d029cd 100644
--- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
index 3513dbddf..ce2f0e12a 100644
--- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
index 3eb2d4102..b9f5a0c32 100644
--- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
index 978255d3a..bdecf723f 100644
--- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
index b9b4caef8..9d4449e76 100644
--- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
+++ b/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:
diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
index 3f463c72a..cd89b2fbc 100644
--- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
index fe8916988..12033c606 100644
--- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
+++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
@@ -1,3 +1,5 @@
+mode: daemonset
+
 initContainers:
   - name: test
     command:
diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
index 3c8d4ac5a..9d4449e76 100644
--- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
index a0409dd25..b4eaafbe4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
index b2f7a157d..7c198bf06 100644
--- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
index 9e40c8bcc..29f48df26 100644
--- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
index 81dedca71..0d0d50ff0 100644
--- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
index 9512d84da..d2aeca7a3 100644
--- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
index 299538b2a..3c7996887 100644
--- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
+++ b/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
diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
index 06edf6ea7..19567f6b6 100644
--- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
index 19039b799..418ce74c4 100644
--- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
+++ b/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"
diff --git a/charts/opentelemetry-collector/templates/NOTES.txt b/charts/opentelemetry-collector/templates/NOTES.txt
index 9d2aee140..f300fc7b9 100644
--- a/charts/opentelemetry-collector/templates/NOTES.txt
+++ b/charts/opentelemetry-collector/templates/NOTES.txt
@@ -10,10 +10,6 @@
 [WARNING] "secretMounts" parameter is deprecated, please use "extraVolumes" or "extraVolumesMounts" instead.
 {{ end }}
 
-{{- if not .Values.mode }}
-[WARNING] "standaloneCollector" and "agentCollector" are deprecated, please use "mode". See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions.
+{{- if and (not (eq .Values.mode "daemonset")) (not (eq .Values.mode "deployment")) }}
+{{ fail "[ERROR] 'mode' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }}
 {{ end }}
-
-{{- if and .Values.standaloneCollector.enabled .Values.agentCollector.enabled  }}
-{{ fail "[ERROR] Using 'standaloneCollector' and 'agentCollector' together is not supported anymore. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }}
-{{ end }}
\ No newline at end of file
diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl
index 759a5cea6..4abbc57f8 100644
--- a/charts/opentelemetry-collector/templates/_config.tpl
+++ b/charts/opentelemetry-collector/templates/_config.tpl
@@ -13,7 +13,7 @@ spike_limit_mib: {{ include "opentelemetry-collector.getMemSpikeLimitMib" .Value
 {{- end }}
 
 {{/*
-Merge user supplied top-level (not particular to standalone or agent) config into memory limiter config.
+Merge user supplied config into memory limiter config.
 */}}
 {{- define "opentelemetry-collector.baseConfig" -}}
 {{- $processorsConfig := get .Values.config "processors" }}
@@ -24,7 +24,7 @@ Merge user supplied top-level (not particular to standalone or agent) config int
 {{- end }}
 
 {{/*
-Merge user supplied top-level (not particular to standalone or agent) config into memory ballast config.
+Merge user supplied config into memory ballast config.
 */}}
 {{- define "opentelemetry-collector.ballastConfig" -}}
 {{- $memoryBallastConfig := get .Values.config.extensions "memory_ballast" }}
@@ -38,36 +38,22 @@ Merge user supplied top-level (not particular to standalone or agent) config int
 Build config file for daemonset OpenTelemetry Collector
 */}}
 {{- define "opentelemetry-collector.daemonsetConfig" -}}
-{{- $values := deepCopy .Values.agentCollector | mustMergeOverwrite (deepCopy .Values) }}
-{{- if eq .Values.mode "daemonset" }}
-{{- $values = deepCopy .Values }}
-{{- end}}
+{{- $values := deepCopy .Values }}
 {{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
 {{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
 {{- $config := include "opentelemetry-collector.ballastConfig" $data | fromYaml | mustMergeOverwrite $config }}
 {{- $config := mustMergeOverwrite (include "opentelemetry-collector.daemonset.containerLogsConfig" $data | fromYaml) $config }}
-{{- if eq .Values.mode "daemonset" }}
 {{- $config | toYaml }}
-{{- else }}
-{{- .Values.agentCollector.configOverride | mustMergeOverwrite $config | toYaml }}
-{{- end}}
 {{- end }}
 
 {{/*
 Build config file for deployment OpenTelemetry Collector
 */}}
 {{- define "opentelemetry-collector.deploymentConfig" -}}
-{{- $values := deepCopy .Values.standaloneCollector | mustMergeOverwrite (deepCopy .Values) }}
-{{- if eq .Values.mode "deployment" }}
-{{- $values = deepCopy .Values }}
-{{- end}}
+{{- $values := deepCopy .Values }}
 {{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
 {{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
-{{- if eq .Values.mode "deployment" }}
 {{- $config | toYaml }}
-{{- else }}
-{{- .Values.standaloneCollector.configOverride | mustMergeOverwrite $config | toYaml }}
-{{- end}}
 {{- end }}
 
 {{/*
@@ -126,7 +112,7 @@ Get otel memory_limiter ballast_size_mib value based on 40% of resources.memory.
 {{- end -}}
 
 {{- define "opentelemetry-collector.daemonset.containerLogsConfig" -}}
-{{- if or .Values.agentCollector.containerLogs.enabled .Values.containerLogs.enabled }}
+{{- if .Values.containerLogs.enabled }}
 receivers:
   filelog:
     include: [ /var/log/pods/*/*/*.log ]
@@ -207,12 +193,9 @@ service:
 {{- end }}
 {{- end }}
 
-{{/* Build the list of port for standalone service */}}
-{{- define "opentelemetry-collector.standalonePortsConfig" -}}
+{{/* Build the list of port for deployment service */}}
+{{- define "opentelemetry-collector.deploymentPortsConfig" -}}
 {{- $ports := deepCopy .Values.ports }}
-{{- if and (.Values.standaloneCollector.ports) (not (eq .Values.mode "deployment")) }}
-{{- $ports = deepCopy .Values.standaloneCollector.ports | mustMergeOverwrite (deepCopy .Values.ports) }}
-{{- end }}
 {{- range $key, $port := $ports }}
 {{- if $port.enabled }}
 - name: {{ $key }}
diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl
index bd35d0400..36c3856b9 100644
--- a/charts/opentelemetry-collector/templates/_helpers.tpl
+++ b/charts/opentelemetry-collector/templates/_helpers.tpl
@@ -112,54 +112,21 @@ Return if ingress is stable.
 {{- end -}}
 
 
-{{- define "opentelemetry-collector.daemonset-podAnnotations" -}}
-{{- if eq .Values.mode "daemonset" }}
-  {{- if .Values.podAnnotations }}
-  {{- .Values.podAnnotations | toYaml }}
-  {{- end }}
-{{- else if .Values.agentCollector.podAnnotations }}
-{{- .Values.agentCollector.podAnnotations | toYaml }}
+{{- define "opentelemetry-collector.podAnnotations" -}}
+{{- if .Values.podAnnotations }}
+{{- .Values.podAnnotations | toYaml }}
 {{- end }}
 {{- end }}
 
-{{- define "opentelemetry-collector.deployment-podAnnotations" -}}
-{{- if eq .Values.mode "deployment" }}
-  {{- if .Values.podAnnotations }}
-  {{- .Values.podAnnotations | toYaml }}
-  {{- end }}
-{{- else if .Values.standaloneCollector.podAnnotations }}
-{{- .Values.standaloneCollector.podAnnotations | toYaml }}
-{{- end }}
-{{- end }}
-
-{{- define "opentelemetry-collector.daemonset-podLabels" -}}
-{{- if eq .Values.mode "daemonset" }}
-  {{- if .Values.podLabels }}
-  {{- .Values.podLabels | toYaml }}
-  {{- end }}
-{{- else if .Values.agentCollector.podLabels }}
-{{- .Values.agentCollector.podLabels | toYaml }}
-{{- end }}
-{{- end }}
-
-{{- define "opentelemetry-collector.deployment-podLabels" -}}
-{{- if eq .Values.mode "deployment" }}
-  {{- if .Values.podLabels }}
-  {{- .Values.podLabels | toYaml }}
-  {{- end }}
-{{- else if .Values.standaloneCollector.podLabels }}
-{{- .Values.standaloneCollector.podLabels | toYaml }}
+{{- define "opentelemetry-collector.podLabels" -}}
+{{- if .Values.podLabels }}
+{{- .Values.podLabels | toYaml }}
 {{- end }}
 {{- end }}
 
 {{- define "opentelemetry-collector.annotations" -}}
-{{- if eq .Values.mode "deployment" }}
-{{- if .Values.annotations }}
-annotations:
-{{- .Values.annotations | toYaml | nindent 2  }}
-{{- end }}
-{{- else if .Values.standaloneCollector.annotations }}
+{{- if and (eq .Values.mode "deployment") .Values.annotations }}
 annotations:
-{{- .Values.standaloneCollector.annotations | toYaml | nindent 2  }}
+  {{- .Values.annotations | toYaml | nindent 2  }}
 {{- end }}
 {{- end }}
diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl
index db7b2bc44..417e26f61 100644
--- a/charts/opentelemetry-collector/templates/_pod.tpl
+++ b/charts/opentelemetry-collector/templates/_pod.tpl
@@ -79,7 +79,7 @@ containers:
         subPath: {{ .subPath }}
         {{- end }}
       {{- end }}
-      {{- if and $.isAgent (or .Values.containerLogs.enabled .Values.agentCollector.containerLogs.enabled) }}
+      {{- if and $.isAgent .Values.containerLogs.enabled }}
       - name: varlogpods
         mountPath: /var/log/pods
         readOnly: true
@@ -119,7 +119,7 @@ volumes:
     secret:
       secretName: {{ .secretName }}
   {{- end }}
-  {{- if and $.isAgent (or .Values.containerLogs.enabled .Values.agentCollector.containerLogs.enabled) }}
+  {{- if and $.isAgent .Values.containerLogs.enabled }}
   - name: varlogpods
     hostPath:
       path: /var/log/pods
diff --git a/charts/opentelemetry-collector/templates/configmap-agent.yaml b/charts/opentelemetry-collector/templates/configmap-agent.yaml
index 39388caad..a17d15b06 100644
--- a/charts/opentelemetry-collector/templates/configmap-agent.yaml
+++ b/charts/opentelemetry-collector/templates/configmap-agent.yaml
@@ -1,4 +1,4 @@
-{{- if or (and .Values.agentCollector.enabled (not (eq .Values.mode "deployment"))) (eq .Values.mode "daemonset") -}}
+{{- if eq .Values.mode "daemonset" -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/opentelemetry-collector/templates/configmap.yaml b/charts/opentelemetry-collector/templates/configmap.yaml
index 37bf03c2a..15a579e34 100644
--- a/charts/opentelemetry-collector/templates/configmap.yaml
+++ b/charts/opentelemetry-collector/templates/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.standaloneCollector.enabled (eq .Values.mode "deployment") -}}
+{{- if eq .Values.mode "deployment" -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/opentelemetry-collector/templates/daemonset.yaml b/charts/opentelemetry-collector/templates/daemonset.yaml
index 800973aa5..e16c82f8e 100644
--- a/charts/opentelemetry-collector/templates/daemonset.yaml
+++ b/charts/opentelemetry-collector/templates/daemonset.yaml
@@ -1,4 +1,4 @@
-{{- if or (and .Values.agentCollector.enabled (not (eq .Values.mode "deployment"))) (eq .Values.mode "daemonset") -}}
+{{- if eq .Values.mode "daemonset" -}}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -14,23 +14,16 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap-agent.yaml") . | sha256sum }}
-        {{- include "opentelemetry-collector.daemonset-podAnnotations" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podAnnotations" . | nindent 8 }}
       labels:
         {{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
         component: agent-collector
-        {{- include "opentelemetry-collector.daemonset-podLabels" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podLabels" . | nindent 8 }}
     spec:
-      {{- $podValues := deepCopy .Values.agentCollector | mustMergeOverwrite (deepCopy .Values) }}
-      {{- if eq .Values.mode "daemonset" }}
-      {{- $podValues = deepCopy .Values }}
-      {{- end }}
+      {{- $podValues := deepCopy .Values }}
       {{- $podData := dict "Values" $podValues "configmapSuffix" "-agent" "isAgent" true }}
       {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }}
-{{- $hostNetwork := .Values.agentCollector.hostNetwork -}}
-{{- if eq .Values.mode "daemonset" }}
-{{- $hostNetwork = .Values.hostNetwork -}}
-{{- end }}
-      hostNetwork: {{ $hostNetwork }}
+      hostNetwork: {{ .Values.hostNetwork }}
       {{- with .Values.dnsPolicy }}
       dnsPolicy: {{ . }}
       {{- end }}
diff --git a/charts/opentelemetry-collector/templates/deployment.yaml b/charts/opentelemetry-collector/templates/deployment.yaml
index bfd503122..7149fdc9a 100644
--- a/charts/opentelemetry-collector/templates/deployment.yaml
+++ b/charts/opentelemetry-collector/templates/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.standaloneCollector.enabled (eq .Values.mode "deployment") -}}
+{{- if eq .Values.mode "deployment" -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -8,11 +8,7 @@ metadata:
   {{- include "opentelemetry-collector.annotations" . | nindent 2 }}
 spec:
 {{- if not .Values.autoscaling.enabled }}
-{{- $replicas := .Values.standaloneCollector.replicaCount -}}
-{{- if eq .Values.mode "deployment" }}
-{{- $replicas = .Values.replicaCount -}}
-{{- end }}
-  replicas: {{ $replicas }}
+  replicas: {{ .Values.replicaCount }}
 {{- end }}
   selector:
     matchLabels:
@@ -22,16 +18,13 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- include "opentelemetry-collector.deployment-podAnnotations" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podAnnotations" . | nindent 8 }}
       labels:
         {{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
         component: standalone-collector
-        {{- include "opentelemetry-collector.deployment-podLabels" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podLabels" . | nindent 8 }}
     spec:
-      {{- $podValues := deepCopy .Values.standaloneCollector | mustMergeOverwrite (deepCopy .Values) }}
-      {{- if eq .Values.mode "deployment" }}
-      {{- $podValues = deepCopy .Values }}
-      {{- end }}
+      {{- $podValues := deepCopy .Values }}
       {{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }}
       {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }}
 {{- end }}
diff --git a/charts/opentelemetry-collector/templates/hpa.yaml b/charts/opentelemetry-collector/templates/hpa.yaml
index 67618a54f..51f2c84ec 100644
--- a/charts/opentelemetry-collector/templates/hpa.yaml
+++ b/charts/opentelemetry-collector/templates/hpa.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.autoscaling.enabled (or .Values.standaloneCollector.enabled (eq .Values.mode "deployment")) }}
+{{- if and .Values.autoscaling.enabled (eq .Values.mode "deployment") }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/charts/opentelemetry-collector/templates/ingress.yaml b/charts/opentelemetry-collector/templates/ingress.yaml
index d8161fc64..47f06ebbf 100644
--- a/charts/opentelemetry-collector/templates/ingress.yaml
+++ b/charts/opentelemetry-collector/templates/ingress.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.standaloneCollector.enabled (eq .Values.mode "deployment")) .Values.ingress.enabled -}}
+{{- if and (eq .Values.mode "deployment") .Values.ingress.enabled -}}
 {{- $ingressApiIsStable := eq (include "ingress.isStable" .) "true" -}}
 {{- $ingressSupportsPathType := eq (include "ingress.supportsPathType" .) "true" -}}
 apiVersion: {{ include "ingress.apiVersion" . }}
diff --git a/charts/opentelemetry-collector/templates/pdb.yaml b/charts/opentelemetry-collector/templates/pdb.yaml
index 0cf8123d8..bb026f502 100644
--- a/charts/opentelemetry-collector/templates/pdb.yaml
+++ b/charts/opentelemetry-collector/templates/pdb.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.podDisruptionBudget.enabled (or .Values.standaloneCollector.enabled (eq .Values.mode "deployment")) }}
+{{- if and .Values.podDisruptionBudget.enabled (eq .Values.mode "deployment") }}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
diff --git a/charts/opentelemetry-collector/templates/podmonitor.yaml b/charts/opentelemetry-collector/templates/podmonitor.yaml
index ae76a56c7..703abe7a5 100644
--- a/charts/opentelemetry-collector/templates/podmonitor.yaml
+++ b/charts/opentelemetry-collector/templates/podmonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.podMonitor.enabled .Values.podMonitor.metricsEndpoints (or .Values.agentCollector.enabled (eq .Values.mode "daemonset")) }}
+{{- if and .Values.podMonitor.enabled .Values.podMonitor.metricsEndpoints (eq .Values.mode "daemonset") }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
diff --git a/charts/opentelemetry-collector/templates/service.yaml b/charts/opentelemetry-collector/templates/service.yaml
index 21263e33a..66b53df04 100644
--- a/charts/opentelemetry-collector/templates/service.yaml
+++ b/charts/opentelemetry-collector/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.standaloneCollector.enabled (eq .Values.mode "deployment") -}}
+{{- if eq .Values.mode "deployment" -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,7 +15,7 @@ spec:
   {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
-  ports: {{ include "opentelemetry-collector.standalonePortsConfig" . | nindent 4 }}
+  ports: {{ include "opentelemetry-collector.deploymentPortsConfig" . | nindent 4 }}
   selector:
     {{- include "opentelemetry-collector.selectorLabels" . | nindent 4 }}
     component: standalone-collector
diff --git a/charts/opentelemetry-collector/templates/servicemonitor.yaml b/charts/opentelemetry-collector/templates/servicemonitor.yaml
index 0f9cc82e8..31fed7e42 100644
--- a/charts/opentelemetry-collector/templates/servicemonitor.yaml
+++ b/charts/opentelemetry-collector/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.serviceMonitor.enabled .Values.serviceMonitor.metricsEndpoints (or (eq .Values.mode "deployment") (.Values.standaloneCollector.enabled)) }}
+{{- if and .Values.serviceMonitor.enabled .Values.serviceMonitor.metricsEndpoints (eq .Values.mode "deployment") }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json
index d2342ea94..469958e4b 100644
--- a/charts/opentelemetry-collector/values.schema.json
+++ b/charts/opentelemetry-collector/values.schema.json
@@ -16,7 +16,7 @@
       "type": "string"
     },
     "mode": {
-      "type": ["string"],
+      "type": "string",
       "enum": [
         "daemonset",
         "deployment",
@@ -405,131 +405,6 @@
     "annotations": {
       "type": "object"
     },
-    "agentCollector": {
-      "description": "Configuration for OpenTelemetry Collector daemonset",
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "containerLogs": {
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "type": "boolean"
-            }
-          },
-          "required": [
-            "enabled"
-          ]
-        },
-        "resources": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "limits": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "cpu": {
-                  "type": [
-                    "string",
-                    "integer"
-                  ]
-                },
-                "memory": {
-                  "type": "string"
-                }
-              }
-            },
-            "requests": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "cpu": {
-                  "type": [
-                    "string",
-                    "integer"
-                  ]
-                },
-                "memory": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        },
-        "podAnnotations": {
-          "type": "object"
-        },
-        "podLabels": {
-          "type": "object"
-        },
-        "hostNetwork": {
-          "type": "boolean"
-        },
-        "configOverride": {
-          "type": "object"
-        }
-      }
-    },
-    "standaloneCollector": {
-      "description": "Configuration for standalone OpenTelemetry Collector deployment",
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "replicaCount": {
-          "type": "integer"
-        },
-        "resources": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "limits": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "cpu": {
-                  "type": [
-                    "string",
-                    "integer"
-                  ]
-                },
-                "memory": {
-                  "type": "string"
-                }
-              }
-            },
-            "requests": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "cpu": {
-                  "type": [
-                    "string",
-                    "integer"
-                  ]
-                },
-                "memory": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        },
-        "podAnnotations": {
-          "type": "object"
-        },
-        "annotations": {
-          "type": "object"
-        },
-        "configOverride": {
-          "type": "object"
-        }
-      }
-    },
     "service": {
       "type": "object",
       "additionalProperties": false,
@@ -654,42 +529,7 @@
       ]
     }
   },
-  "anyOf": [
-    {
-      "properties": {
-        "agentCollector": {
-          "properties": {
-            "enabled": {
-              "const": true
-            }
-          }
-        }
-      }
-    },
-    {
-      "properties": {
-        "standaloneCollector": {
-          "properties": {
-            "enabled": {
-              "const": true
-            }
-          }
-        }
-      }
-    },
-    {
-      "properties": {
-        "mode": {
-          "const": "deployment"
-        }
-      }
-    },
-    {
-      "properties": {
-        "mode": {
-          "const": "daemonset"
-        }
-      }
-    }
+  "required": [
+    "mode"
   ]
 }
diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
index 2ad8192ed..b8bff1451 100644
--- a/charts/opentelemetry-collector/values.yaml
+++ b/charts/opentelemetry-collector/values.yaml
@@ -6,7 +6,6 @@ nameOverride: ""
 fullnameOverride: ""
 
 # Valid values are "daemonset" and "deployment".
-# If set, agentCollector and standaloneCollector are ignored.
 mode: ""
 
 config:
@@ -80,9 +79,6 @@ config:
           - jaeger
           - zipkin
 
-# Shared params for agentCollector daemonset and standaloneCollector deployment pods.
-# Can be overridden here or for any component independently using the same keys.
-
 image:
   # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`.
   repository: otel/opentelemetry-collector-contrib
@@ -140,15 +136,13 @@ tolerations: []
 affinity: {}
 
 # Allows for pod scheduler prioritisation
-# Can be overridden here or for agentCollector and standaloneCollector independently.
 priorityClassName: ""
 
 extraEnvs: []
 extraVolumes: []
 extraVolumeMounts: []
 
-# Configuration for ports, shared between agentCollector, standaloneCollector and service.
-# Can be overridden here or for agentCollector and standaloneCollector independently.
+# Configuration for ports
 ports:
   otlp:
     enabled: true
@@ -240,48 +234,6 @@ lifecycleHooks: {}
 #       - /test/sleep
 #       - "5"
 
-# DEPRECATED. See UPGRADING.md
-standaloneCollector:
-  enabled: false
-
-  replicaCount: 1
-
-  resources:
-    limits:
-      cpu: 1
-      memory: 2Gi
-
-  podAnnotations: {}
-
-  podLabels: {}
-
-  annotations: {}
-
-  # Configuration override that will be merged into the standalone collector default config
-  configOverride: {}
-
-# DEPRECATED. See UPGRADING.md
-agentCollector:
-  enabled: true
-
-  containerLogs:
-    enabled: false
-
-  resources:
-    limits:
-      cpu: 256m
-      memory: 512Mi
-
-  podAnnotations: {}
-
-  podLabels: {}
-
-  # Host networking requested for this pod. Use the host's network namespace.
-  hostNetwork: false
-
-  # Configuration override that will be merged into the agent's default config
-  configOverride: {}
-
 service:
   type: ClusterIP
   annotations: {}
@@ -325,13 +277,13 @@ serviceMonitor:
   extraLabels: {}
   #  release: kube-prometheus-stack
 
-# PodDisruptionBudget is used only if standaloneCollector enabled
+# PodDisruptionBudget is used only if deployment enabled
 podDisruptionBudget:
   enabled: false
 #   minAvailable: 2
 #   maxUnavailable: 1
 
-# autoscaling is used only if standaloneCollector enabled
+# autoscaling is used only if deployment enabled
 autoscaling:
   enabled: false
   minReplicas: 1