From 555d2409776c01e348a0c06ea4a0401324b21397 Mon Sep 17 00:00:00 2001 From: chenlujjj <953546398@qq.com> Date: Sun, 14 Sep 2025 09:27:07 +0800 Subject: [PATCH] [target-allocator] add support for pod labels and annotations --- charts/opentelemetry-target-allocator/Chart.yaml | 2 +- .../examples/collector-fleet/rendered/clusterRole.yaml | 2 +- .../collector-fleet/rendered/clusterRoleBinding.yaml | 2 +- .../examples/collector-fleet/rendered/configmap.yaml | 2 +- .../examples/collector-fleet/rendered/deployment.yaml | 6 +++--- .../examples/collector-fleet/rendered/serviceAccount.yaml | 2 +- .../examples/consistent-hashing/rendered/clusterRole.yaml | 2 +- .../consistent-hashing/rendered/clusterRoleBinding.yaml | 2 +- .../examples/consistent-hashing/rendered/configmap.yaml | 2 +- .../examples/consistent-hashing/rendered/deployment.yaml | 6 +++--- .../consistent-hashing/rendered/serviceAccount.yaml | 2 +- .../existing-service-account/rendered/configmap.yaml | 2 +- .../existing-service-account/rendered/deployment.yaml | 6 +++--- .../prometheus-scrape-config/rendered/clusterRole.yaml | 2 +- .../rendered/clusterRoleBinding.yaml | 2 +- .../prometheus-scrape-config/rendered/configmap.yaml | 2 +- .../prometheus-scrape-config/rendered/deployment.yaml | 6 +++--- .../prometheus-scrape-config/rendered/serviceAccount.yaml | 2 +- .../templates/deployment.yaml | 6 ++++++ charts/opentelemetry-target-allocator/values.yaml | 6 ++++++ 20 files changed, 38 insertions(+), 26 deletions(-) diff --git a/charts/opentelemetry-target-allocator/Chart.yaml b/charts/opentelemetry-target-allocator/Chart.yaml index fe6bfb494b..aff15a27c4 100644 --- a/charts/opentelemetry-target-allocator/Chart.yaml +++ b/charts/opentelemetry-target-allocator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-target-allocator -version: 0.126.5 +version: 0.126.6 description: OpenTelemetry Target Allocator Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRole.yaml b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRole.yaml index 03da439b9c..1728616ade 100644 --- a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRole.yaml +++ b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta-clusterRole labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRoleBinding.yaml b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRoleBinding.yaml index b3d40f6fe2..e9485e2be9 100644 --- a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRoleBinding.yaml +++ b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRoleBinding.yaml @@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-opentelemetry-target-allocator-ta-clusterRoleBinding labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/configmap.yaml b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/configmap.yaml index b9ec70067d..9953adfe2b 100644 --- a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/configmap.yaml +++ b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-target-allocator-ta-configmap namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/deployment.yaml b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/deployment.yaml index a29df9a878..e624bbe6d5 100644 --- a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/deployment.yaml +++ b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" @@ -21,9 +21,9 @@ spec: template: metadata: annotations: - checksum/config: 3922e001e8151954654b177014bd20fcdefec338e1db0857c987b39cfc37cc95 + checksum/config: fd8ec0693b549baef971dea5e84757866b740f69cf95767c0150a054e6dfe7cd labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/serviceAccount.yaml b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/serviceAccount.yaml index b813e5caf9..3444b3c3f3 100644 --- a/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/serviceAccount.yaml +++ b/charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/serviceAccount.yaml @@ -7,7 +7,7 @@ metadata: name: example-opentelemetry-target-allocator-ta namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRole.yaml b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRole.yaml index 03da439b9c..1728616ade 100644 --- a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRole.yaml +++ b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta-clusterRole labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRoleBinding.yaml b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRoleBinding.yaml index b3d40f6fe2..e9485e2be9 100644 --- a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRoleBinding.yaml +++ b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRoleBinding.yaml @@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-opentelemetry-target-allocator-ta-clusterRoleBinding labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/configmap.yaml b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/configmap.yaml index 47002cd77c..e1cc94b2b0 100644 --- a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/configmap.yaml +++ b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-target-allocator-ta-configmap namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/deployment.yaml b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/deployment.yaml index b6c9cdc107..7050a6f6ed 100644 --- a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/deployment.yaml +++ b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" @@ -21,9 +21,9 @@ spec: template: metadata: annotations: - checksum/config: aa81093891579c5e2cb7695efee136e74ec98e9f912a053d6fa82cd7d6600ad2 + checksum/config: 6085b11ef61d77af5587abe54d561414037a50a0d340836b6229a25586e6cd2b labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/serviceAccount.yaml b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/serviceAccount.yaml index b813e5caf9..3444b3c3f3 100644 --- a/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/serviceAccount.yaml +++ b/charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/serviceAccount.yaml @@ -7,7 +7,7 @@ metadata: name: example-opentelemetry-target-allocator-ta namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/configmap.yaml b/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/configmap.yaml index 47002cd77c..e1cc94b2b0 100644 --- a/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/configmap.yaml +++ b/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-target-allocator-ta-configmap namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/deployment.yaml b/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/deployment.yaml index bfe531f8df..0d5ce984da 100644 --- a/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/deployment.yaml +++ b/charts/opentelemetry-target-allocator/examples/existing-service-account/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" @@ -21,9 +21,9 @@ spec: template: metadata: annotations: - checksum/config: aa81093891579c5e2cb7695efee136e74ec98e9f912a053d6fa82cd7d6600ad2 + checksum/config: 6085b11ef61d77af5587abe54d561414037a50a0d340836b6229a25586e6cd2b labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRole.yaml b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRole.yaml index 03da439b9c..1728616ade 100644 --- a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRole.yaml +++ b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta-clusterRole labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRoleBinding.yaml b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRoleBinding.yaml index b3d40f6fe2..e9485e2be9 100644 --- a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRoleBinding.yaml +++ b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/clusterRoleBinding.yaml @@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-opentelemetry-target-allocator-ta-clusterRoleBinding labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/configmap.yaml b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/configmap.yaml index 4e8a02f71a..328ef2f3c8 100644 --- a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/configmap.yaml +++ b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-target-allocator-ta-configmap namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/deployment.yaml b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/deployment.yaml index a7d347afbd..d8b0609b3e 100644 --- a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/deployment.yaml +++ b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: namespace: default name: example-opentelemetry-target-allocator-ta labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" @@ -21,9 +21,9 @@ spec: template: metadata: annotations: - checksum/config: 51cce3db606626a7f76487aa82e4006812336df53cd78749f08fcfd627bdaeb7 + checksum/config: efa3638ec533718f8eed9cb01c35cb1003b2dd00508a8f1b97def3731ba81f53 labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/serviceAccount.yaml b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/serviceAccount.yaml index b813e5caf9..3444b3c3f3 100644 --- a/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/serviceAccount.yaml +++ b/charts/opentelemetry-target-allocator/examples/prometheus-scrape-config/rendered/serviceAccount.yaml @@ -7,7 +7,7 @@ metadata: name: example-opentelemetry-target-allocator-ta namespace: default labels: - helm.sh/chart: opentelemetry-target-allocator-0.126.5 + helm.sh/chart: opentelemetry-target-allocator-0.126.6 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: opentelemetry-target-allocator app.kubernetes.io/version: "0.126.0" diff --git a/charts/opentelemetry-target-allocator/templates/deployment.yaml b/charts/opentelemetry-target-allocator/templates/deployment.yaml index 2c0922c608..70cbad032b 100644 --- a/charts/opentelemetry-target-allocator/templates/deployment.yaml +++ b/charts/opentelemetry-target-allocator/templates/deployment.yaml @@ -14,8 +14,14 @@ spec: metadata: annotations: {{- include "helper.configTemplateChecksumAnnotation" . | nindent 8 }} + {{- if .Values.targetAllocator.podAnnotations }} + {{- toYaml .Values.targetAllocator.podAnnotations | nindent 8 }} + {{- end }} labels: {{- include "helper.commonLabels" . | nindent 8 }} + {{- if .Values.targetAllocator.podLabels }} + {{- toYaml .Values.targetAllocator.podLabels | nindent 8 }} + {{- end }} spec: serviceAccountName: {{ template "helper.targetAllocatorServiceAccountName" . }} automountServiceAccountToken: false diff --git a/charts/opentelemetry-target-allocator/values.yaml b/charts/opentelemetry-target-allocator/values.yaml index 1a1285a830..1dfe003f6a 100644 --- a/charts/opentelemetry-target-allocator/values.yaml +++ b/charts/opentelemetry-target-allocator/values.yaml @@ -55,3 +55,9 @@ targetAllocator: # requests: # cpu: 100m # memory: 64Mi + + # Pod annotations to add to the target allocator pod + podAnnotations: {} + + # Pod labels to add to the target allocator pod + podLabels: {}