From b40833c706450f040f5f78753adde6710b21ff63 Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Mon, 22 Jan 2024 19:53:29 +0100 Subject: [PATCH 1/3] [collector] Enable HPA when deploy mode is statefulset Signed-off-by: Husni Alhamdani --- charts/opentelemetry-collector/Chart.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap-agent.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap.yaml | 2 +- .../daemonset-and-deployment/rendered/daemonset.yaml | 4 ++-- .../daemonset-and-deployment/rendered/deployment.yaml | 4 ++-- .../daemonset-and-deployment/rendered/service.yaml | 2 +- .../daemonset-and-deployment/rendered/serviceaccount.yaml | 2 +- .../daemonset-collector-logs/rendered/configmap-agent.yaml | 2 +- .../daemonset-collector-logs/rendered/daemonset.yaml | 4 ++-- .../daemonset-collector-logs/rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-hostmetrics/rendered/daemonset.yaml | 4 ++-- .../daemonset-hostmetrics/rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../daemonset-lifecycle-hooks/rendered/daemonset.yaml | 4 ++-- .../daemonset-lifecycle-hooks/rendered/serviceaccount.yaml | 2 +- .../examples/daemonset-only/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-only/rendered/daemonset.yaml | 4 ++-- .../examples/daemonset-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/rendered/configmap.yaml | 2 +- .../examples/deployment-only/rendered/deployment.yaml | 4 ++-- .../examples/deployment-only/rendered/service.yaml | 2 +- .../examples/deployment-only/rendered/serviceaccount.yaml | 2 +- .../deployment-otlp-traces/rendered/configmap.yaml | 2 +- .../deployment-otlp-traces/rendered/deployment.yaml | 4 ++-- .../examples/deployment-otlp-traces/rendered/service.yaml | 2 +- .../deployment-otlp-traces/rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../kubernetesAttributes/rendered/clusterrole.yaml | 2 +- .../kubernetesAttributes/rendered/clusterrolebinding.yaml | 2 +- .../examples/kubernetesAttributes/rendered/configmap.yaml | 2 +- .../examples/kubernetesAttributes/rendered/deployment.yaml | 4 ++-- .../examples/kubernetesAttributes/rendered/service.yaml | 2 +- .../kubernetesAttributes/rendered/serviceaccount.yaml | 2 +- .../statefulset-only/rendered/configmap-statefulset.yaml | 2 +- .../examples/statefulset-only/rendered/service.yaml | 2 +- .../examples/statefulset-only/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-only/rendered/statefulset.yaml | 4 ++-- .../examples/using-GOMEMLIMIT/rendered/configmap.yaml | 2 +- .../examples/using-GOMEMLIMIT/rendered/deployment.yaml | 4 ++-- .../examples/using-GOMEMLIMIT/rendered/service.yaml | 2 +- .../examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml | 2 +- charts/opentelemetry-collector/templates/hpa.yaml | 7 ++++++- 45 files changed, 61 insertions(+), 56 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 11bfdf67d..74d929d7a 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.78.1 +version: 0.78.2 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ 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 147e0911d..9f7a70878 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 4fca72fc2..0298dd363 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 70bc3a014..045598122 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a48779289a36cd261e898a6fc6e3e1f67372f85a473e6f2857142be0d57eb6d5 + checksum/config: fb39898a2648ea8ed0c3efcdb70ec896a0c00648b925a707bd013293be5f5db9 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 a8c34624a..1808d3b5c 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: aee6e0960716856224ed13b82c28428449c96d20590129ac0133b4e72eba55fb + checksum/config: f00dc9e128c387ab0642b1549a310ad130230b4121eaa55dd9a59e3216f288be 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 831e10f3e..64f8df046 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 7a137bce5..62ab97b2d 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 9647343cb..f000b2da2 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 6f0dbd9cfb5b1aeb04853795f83d7694ad404180725225d9338032178c14eddc + checksum/config: acb45551cd5fdfa669938ce1a715b63ac3014666408628b4a4270d37da2a8ff3 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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 796c80fb1..92838d2ad 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 3a330aa68..567a558eb 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 53e440171d3fd866dad4a2f5d9188b4809fa0554040cd34b30302db93cdc8c75 + checksum/config: ec9b1ed0709fbbb6b075002defa83b2778a7e4e991904264b82b495421c6bc3c 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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 c0294dd20..0ba8e085d 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 @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" 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 88d33a626..99f8ef92d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 34da9e095b1e8977cd1e79e36c5876a6e42c2bd44a4fead400c1b0e9c612f048 + checksum/config: a098f93327d80effb53a5ccd20c38d735e7b6db18a24f9603f6b8eb6f974eed3 labels: app.kubernetes.io/name: opentelemetry-collector 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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" 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 c0294dd20..0ba8e085d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 4c509de65..d13b487df 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 34da9e095b1e8977cd1e79e36c5876a6e42c2bd44a4fead400c1b0e9c612f048 + checksum/config: a098f93327d80effb53a5ccd20c38d735e7b6db18a24f9603f6b8eb6f974eed3 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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 4fca72fc2..0298dd363 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 845318e0e..6a814b9ce 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: aee6e0960716856224ed13b82c28428449c96d20590129ac0133b4e72eba55fb + checksum/config: f00dc9e128c387ab0642b1549a310ad130230b4121eaa55dd9a59e3216f288be 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 831e10f3e..64f8df046 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 241d2bb7a..7133915bc 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 86bf6838e..a409b01ba 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: f0f80be7747d705faf3d878cce3bbe6cde6aa53bc7a4f593ff584a061b2223b2 + checksum/config: 2c938c2d740f87e99b788f6101cfa87a044c6235c1c55f241199fbb558936046 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 6f52f554f..df6d95ec4 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.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 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml index 8a0421508..c74147751 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index 831e10f3e..64f8df046 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 907884649..c4ce1ea36 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 36cdc1065..d2e12f47f 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 4ce72dace..bc041ab8f 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index 95fdd2bc7..e3f4d203b 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 0d4e1815db5463e371abe2e7aad59c35778f6fcca2e30e6444632ae46e78f634 + checksum/config: 0058bb8dbd75cb43cb0043ee503eacca1e1ff8ca3e129abad21ef09c3e8bb151 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml index 831e10f3e..64f8df046 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml index 528583e01..1a97d737a 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index e0ae3c509..a3542388c 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index ce83d989d..5d9b5bcd0 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: 995bbb026f5595eb3be83eb22939bc3c20d7f7aac48fbfee3218ad43aef94e82 + checksum/config: 13ea98823e4e5cf82493e61ae41a975bd2aeb679cba41d571bac84c613b28e0b labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml index 4fca72fc2..0298dd363 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index a8c34624a..1808d3b5c 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: aee6e0960716856224ed13b82c28428449c96d20590129ac0133b4e72eba55fb + checksum/config: f00dc9e128c387ab0642b1549a310ad130230b4121eaa55dd9a59e3216f288be labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml index 831e10f3e..64f8df046 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index 7bd9fa998..a59d98c37 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.78.1 + helm.sh/chart: opentelemetry-collector-0.78.2 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.92.0" diff --git a/charts/opentelemetry-collector/templates/hpa.yaml b/charts/opentelemetry-collector/templates/hpa.yaml index 4b644595d..37725143a 100644 --- a/charts/opentelemetry-collector/templates/hpa.yaml +++ b/charts/opentelemetry-collector/templates/hpa.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.autoscaling.enabled (eq .Values.mode "deployment") }} +{{- if and .Values.autoscaling.enabled (or (eq .Values.mode "deployment") (eq .Values.mode "statefulset")) }} apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: @@ -9,7 +9,12 @@ metadata: spec: scaleTargetRef: apiVersion: apps/v1 + {{- if and .Values.autoscaling.enabled (eq .Values.mode "deployment") }} kind: Deployment + {{- end }} + {{- if and .Values.autoscaling.enabled (eq .Values.mode "statefulset") }} + kind: StatefulSet + {{- end }} name: {{ include "opentelemetry-collector.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} From 3c14a11ede8fdb7696e00c73b157babd7c1ebead Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Mon, 22 Jan 2024 22:33:53 +0100 Subject: [PATCH 2/3] [collector] Enable HPA when deploy mode is statefulset Signed-off-by: Husni Alhamdani --- charts/opentelemetry-collector/templates/hpa.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/charts/opentelemetry-collector/templates/hpa.yaml b/charts/opentelemetry-collector/templates/hpa.yaml index 37725143a..d5150b21a 100644 --- a/charts/opentelemetry-collector/templates/hpa.yaml +++ b/charts/opentelemetry-collector/templates/hpa.yaml @@ -9,12 +9,7 @@ metadata: spec: scaleTargetRef: apiVersion: apps/v1 - {{- if and .Values.autoscaling.enabled (eq .Values.mode "deployment") }} - kind: Deployment - {{- end }} - {{- if and .Values.autoscaling.enabled (eq .Values.mode "statefulset") }} - kind: StatefulSet - {{- end }} + kind: {{ title .Values.mode }} name: {{ include "opentelemetry-collector.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} From ac85b095420257881c2ab34e3ae43b1339785fc1 Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Mon, 22 Jan 2024 23:48:13 +0100 Subject: [PATCH 3/3] Add test scenario for HPA of deployment and statefulset Signed-off-by: Husni Alhamdani --- .../ci/hpa-deployment-values.yaml | 9 +++++++++ .../ci/hpa-statefulset-values.yaml | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 charts/opentelemetry-collector/ci/hpa-deployment-values.yaml create mode 100644 charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml diff --git a/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml new file mode 100644 index 000000000..a53a0f560 --- /dev/null +++ b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml @@ -0,0 +1,9 @@ +mode: deployment + +autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + behavior: {} + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 diff --git a/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml new file mode 100644 index 000000000..fa1244569 --- /dev/null +++ b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml @@ -0,0 +1,9 @@ +mode: statefulset + +autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + behavior: {} + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80