set proper resources for collector (open-telemetry#273)

* set proper resources for collector

* increase resources and bump chart

* bump limits

* generate example

* Update charts/opentelemetry-collector/values.yaml

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* generate-examples

* add upgrading example

* change version

* bump version

* bump

* comment

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Co-authored-by: birca <birca@adobe.com>

charts/opentelemetry-collector/Chart.yaml

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

charts/opentelemetry-collector/UPGRADING.md

@@ -1,5 +1,20 @@
 # Upgrade guidelines
 
+## 0.28.0 to 0.29.0
+
+[Reduce requested resources](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/273)
+
+Resource `limits` have been reduced. Upgrades/installs of chart 0.29.0 will now use fewer resources. In order to set the resources back to what they were, you will need to override the `resources` section in the `values.yaml`.
+
+*Example*:
+
+```yaml
+resources:
+  limits:
+    cpu: 1
+    memory: 2Gi
+```
+
 ## 0.23.1 to 0.24.0
 
 [Remove containerLogs in favor of presets.logsCollection]()
@@ -78,7 +93,7 @@ See the [daemonset-and-deployment](examples/daemonset-and-deployment) example to
 
 ### Migrate to `mode`:
 
-The `agentCollector` and `standaloneCollector` sections in values.yaml have been deprecated. Instead there is a new field, `mode`, that determines if the collector is being installed as a daemonset or deployment.  
+The `agentCollector` and `standaloneCollector` sections in values.yaml have been deprecated. Instead there is a new field, `mode`, that determines if the collector is being installed as a daemonset or deployment.
 
 ```yaml
 # Valid values are "daemonset" and "deployment".

charts/opentelemetry-collector/examples/README.md

@@ -9,3 +9,4 @@ Here is a collection of common configurations for the OpenTelemetry collector.
 - [Add component (hostmetrics)](daemonset-hostmetrics)
 
 The manifests are rendered using the `helm template` command and the specific example folder's values.yaml.
+

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

@@ -25,3 +25,4 @@ resources:
   limits:
     cpu: 100m
     memory: 200M
+

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

@@ -4,3 +4,4 @@ resources:
   limits:
     cpu: 100m
     memory: 200M
+

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: f4650242f513449a31f809224037f39a5556e304cc391d722f8444343cb3b739
+        checksum/config: e218a580a60a3a652d52d9c5108f51ec4f8839fabd41740159695362c2185fed
 
       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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 4ebc5747b195df8a6142d3ba91cc6c1a08d2baba303a3e559bd68607206b0667
+        checksum/config: c59fe779f7555ac1fad952a4eca8431a9d6607892e0f759fea56e2fd381be810
 
       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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -17,13 +17,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "819"
+        size_mib: "204"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 1638
-        spike_limit_mib: 512
+        limit_mib: 409
+        spike_limit_mib: 128
     receivers:
       filelog:
         exclude: []

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: be28f8ffe0b6cc708b0659ea338a5a17afebf2cfe7a4370b2ffd2d5fdf239a25
+        checksum/config: 2f629acdafbe89e5109800a5c7bedf948447afb94965f0646e00c396f6956a69
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -81,8 +81,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 1
-              memory: 2Gi
+              cpu: 256m
+              memory: 512Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

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

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

@@ -4,3 +4,4 @@ presets:
   logsCollection:
     enabled: true
     includeCollectorLogs: true
+

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -17,13 +17,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "819"
+        size_mib: "204"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 1638
-        spike_limit_mib: 512
+        limit_mib: 409
+        spike_limit_mib: 128
     receivers:
       hostmetrics:
         collection_interval: 10s

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 8dd1805d8d9c50cd7014c7da293561bd06cff9b8fa611ce96e2b3cefe42a3f2d
+        checksum/config: 20d7d0e3dbb0d1d932588a01db1cd2cdbb1339b110b68bb44b519f2f9d5776b7
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -93,8 +93,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 1
-              memory: 2Gi
+              cpu: 256m
+              memory: 512Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

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

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

@@ -3,3 +3,4 @@ mode: daemonset
 presets:
   hostMetrics:
     enabled: true
+

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -17,13 +17,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "819"
+        size_mib: "204"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 1638
-        spike_limit_mib: 512
+        limit_mib: 409
+        spike_limit_mib: 128
     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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 5dc276688313240edc02b5c7e09a0d62250bfbe8f4776e4c9efc7e078a88d7b0
+        checksum/config: 5a22554eb36d1fd2929395003bd88fe35bf07f7f158240c65dbb1bb6ba120359
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -87,8 +87,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 1
-              memory: 2Gi
+              cpu: 256m
+              memory: 512Mi
           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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"

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

@@ -26,3 +26,4 @@ lifecycleHooks:
       command:
       - /test/sleep
       - "5"
+

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -17,13 +17,13 @@ data:
     extensions:
       health_check: {}
       memory_ballast:
-        size_mib: "819"
+        size_mib: "204"
     processors:
       batch: {}
       memory_limiter:
         check_interval: 5s
-        limit_mib: 1638
-        spike_limit_mib: 512
+        limit_mib: 409
+        spike_limit_mib: 128
     receivers:
       jaeger:
         protocols:

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.28.0
+    helm.sh/chart: opentelemetry-collector-0.29.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.58.0"
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 5dc276688313240edc02b5c7e09a0d62250bfbe8f4776e4c9efc7e078a88d7b0
+        checksum/config: 5a22554eb36d1fd2929395003bd88fe35bf07f7f158240c65dbb1bb6ba120359
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -81,8 +81,8 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 1
-              memory: 2Gi
+              cpu: 256m
+              memory: 512Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

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

charts/opentelemetry-collector/examples/daemonset-only/values.yaml

@@ -1 +1,2 @@
 mode: daemonset
+