From b8d11b63916bc40cd1aa2875a880f3995978d434 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:45:42 -0600 Subject: [PATCH] [collector] Provide alternateConfig option for use in subcharts to workaround null issue (#1301) * Allow alternate blank config * Fix template for older helm versions * remove debug template * Update values.yaml Co-authored-by: Dmitrii Anoshin * bump version --------- Co-authored-by: Dmitrii Anoshin Co-authored-by: Jared Tan --- charts/opentelemetry-collector/Chart.yaml | 2 +- .../rendered/clusterrole.yaml | 41 +++++++ .../rendered/clusterrolebinding.yaml | 21 ++++ .../alternate-config/rendered/configmap.yaml | 68 ++++++++++++ .../alternate-config/rendered/deployment.yaml | 100 ++++++++++++++++++ .../alternate-config/rendered/service.yaml | 49 +++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../examples/alternate-config/values.yaml | 34 ++++++ .../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 | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.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 +- .../rendered/deployment.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/clusterrole.yaml | 2 +- .../rendered/clusterrolebinding.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-statefulset.yaml | 2 +- .../statefulset-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 4 +- .../rendered/configmap-statefulset.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 4 +- .../using-GOMEMLIMIT/rendered/configmap.yaml | 2 +- .../using-GOMEMLIMIT/rendered/deployment.yaml | 4 +- .../using-GOMEMLIMIT/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../using-custom-config/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/_config.tpl | 36 +++++-- .../values.schema.json | 4 + charts/opentelemetry-collector/values.yaml | 17 +++ 65 files changed, 440 insertions(+), 79 deletions(-) create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/alternate-config/values.yaml diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index ac910343a..333415f4a 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.103.0 +version: 0.104.0 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml new file mode 100644 index 000000000..7877a7fd7 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml @@ -0,0 +1,41 @@ +--- +# Source: opentelemetry-collector/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm + +rules: + - apiGroups: [""] + resources: ["pods", "namespaces"] + verbs: ["get", "watch", "list"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["events", "namespaces", "namespaces/status", "nodes", "nodes/spec", "pods", "pods/status", "replicationcontrollers", "replicationcontrollers/status", "resourcequotas", "services" ] + verbs: ["get", "list", "watch"] + - apiGroups: ["apps"] + resources: ["daemonsets", "deployments", "replicasets", "statefulsets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["daemonsets", "deployments", "replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["batch"] + resources: ["jobs", "cronjobs"] + verbs: ["get", "list", "watch"] + - apiGroups: ["autoscaling"] + resources: ["horizontalpodautoscalers"] + verbs: ["get", "list", "watch"] + - apiGroups: ["events.k8s.io"] + resources: ["events"] + verbs: ["watch", "list"] diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml new file mode 100644 index 000000000..31ebf19d5 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml @@ -0,0 +1,21 @@ +--- +# Source: opentelemetry-collector/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm + +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: example-opentelemetry-collector +subjects: +- kind: ServiceAccount + name: example-opentelemetry-collector + namespace: default diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml new file mode 100644 index 000000000..72cb5ba40 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml @@ -0,0 +1,68 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm + +data: + relay: | + exporters: + debug: {} + processors: + k8sattributes: + extract: + metadata: + - k8s.namespace.name + - k8s.deployment.name + - k8s.statefulset.name + - k8s.daemonset.name + - k8s.cronjob.name + - k8s.job.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.start_time + passthrough: false + pod_association: + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: connection + receivers: + k8s_cluster: + collection_interval: 10s + k8sobjects: + objects: + - exclude_watch_type: + - DELETED + group: events.k8s.io + mode: watch + name: events + service: + pipelines: + logs: + exporters: + - debug + processors: + - k8sattributes + receivers: + - k8sobjects + metrics: + exporters: + - debug + processors: + - k8sattributes + receivers: + - k8s_cluster diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml new file mode 100644 index 000000000..40c8943f1 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml @@ -0,0 +1,100 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm + +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + strategy: + type: RollingUpdate + template: + metadata: + annotations: + checksum/config: b9ee8f766c36fa6c45f49fdc4a2d4107c8afcd5faf20ab829f12b54d12dde201 + + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + + spec: + + serviceAccountName: example-opentelemetry-collector + securityContext: + {} + containers: + - name: opentelemetry-collector + command: + - /otelcol-k8s + args: + - --config=/conf/relay.yaml + securityContext: + {} + image: "otel/opentelemetry-collector-k8s:0.108.0" + imagePullPolicy: IfNotPresent + ports: + + - name: jaeger-compact + containerPort: 6831 + protocol: UDP + - name: jaeger-grpc + containerPort: 14250 + protocol: TCP + - name: jaeger-thrift + containerPort: 14268 + protocol: TCP + - name: otlp + containerPort: 4317 + protocol: TCP + - name: otlp-http + containerPort: 4318 + protocol: TCP + - name: zipkin + containerPort: 9411 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + - name: GOMEMLIMIT + value: "3276MiB" + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + resources: + limits: + cpu: 2 + memory: 4Gi + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: example-opentelemetry-collector + items: + - key: relay + path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml new file mode 100644 index 000000000..3f59f772f --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml @@ -0,0 +1,49 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm + + component: standalone-collector +spec: + type: ClusterIP + ports: + + - name: jaeger-compact + port: 6831 + targetPort: 6831 + protocol: UDP + - name: jaeger-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - name: jaeger-thrift + port: 14268 + targetPort: 14268 + protocol: TCP + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + - name: otlp-http + port: 4318 + targetPort: 4318 + protocol: TCP + - name: zipkin + port: 9411 + targetPort: 9411 + protocol: TCP + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml new file mode 100644 index 000000000..8904aa512 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.104.0 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/alternate-config/values.yaml b/charts/opentelemetry-collector/examples/alternate-config/values.yaml new file mode 100644 index 000000000..e0f6a5fd5 --- /dev/null +++ b/charts/opentelemetry-collector/examples/alternate-config/values.yaml @@ -0,0 +1,34 @@ +mode: deployment + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + +replicaCount: 1 + +resources: + limits: + cpu: 2 + memory: 4Gi + +presets: + clusterMetrics: + enabled: true + kubernetesAttributes: + enabled: true + kubernetesEvents: + enabled: true + +alternateConfig: + exporters: + debug: {} + service: + pipelines: + logs: + exporters: + - debug + metrics: + exporters: + - debug 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 1fd6e0322..99008865f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 f0ad87bc9..ea0a3efe0 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 2ba1d98b3..49ecfa100 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a7aeccb5f9f0128c581ced25b423b60bd130885d25179ac94c325e011e4df354 + checksum/config: 885667b513b9bf70dba20a85fc7d3d8fe2d81f6d9c5a0e7bb9be12bfeb37fc8f 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 bde25ec25..4c7bd1562 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 1eb50b6ff752ed29085af31ddc42f0e46602f38d62360076a0df48fdd2194b55 + checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6 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 c7e0d4727..3f59f772f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 79da0e0b3..1b8bf8f40 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 3dfbb4fa1..236803acc 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 256a44a812e98126d89f6d87c58884e3fcd8d30343e43629e2de27cea1f00aaf + checksum/config: 503472364f1736c3a4e4b54b00eda70e75429f9570783b89ee2394aade71055c 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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 77c4fc0c0..7f49a2d94 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 55f99d735..09af999ff 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 7478c32ebf032ab91794060613ee1d0675bb05624d6498faab542a2674bea794 + checksum/config: db63ebb2d34e12be8bd9865848567b85863c57038e15ba7b88938b673aacd20b 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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 23f4aab7d..30299443f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 925919623..7e1835c8c 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 8da602bbe44fd7fed9fcc7569fd268df4836d2e309d09e0cdfee984125a5fd15 + checksum/config: 73c39189877d6da16524f8b024ebac618a120a784474f025717f8ccf21d1d462 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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 23f4aab7d..30299443f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 36c06ff73..470695bf1 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 8da602bbe44fd7fed9fcc7569fd268df4836d2e309d09e0cdfee984125a5fd15 + checksum/config: 73c39189877d6da16524f8b024ebac618a120a784474f025717f8ccf21d1d462 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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index f0ad87bc9..ea0a3efe0 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 9ca942007..123f108fc 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 1eb50b6ff752ed29085af31ddc42f0e46602f38d62360076a0df48fdd2194b55 + checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6 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 c7e0d4727..3f59f772f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 f30036dec..18d2777e7 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 b5950279d..f8dcbb52d 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 1d17a5d5a691e8e9b61cd8ce89b4929961f9620c2ca4d989ebbc1cddfce3340b + checksum/config: 44aa8a07bfe558ef84f8996876d923ef0c9482223b2599f68c9b6d96b7ce48fa 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 9700df25a..a6cb6b91b 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 050bea5bb..aeb25604c 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 c7e0d4727..3f59f772f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 14a9763fb..7c594aca7 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index a307e0663..31ebf19d5 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 7b2eb9949..2de3804e0 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index 15c2fac43..150b9fe6b 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: e05940761e72aaec42f16b27df1af2f6397cda4e7d40c96a3cfaa55116fecf1f + checksum/config: 083a29084cae3b777f0301931d2219abcabe6b6fffc807f8fefb0bae3c4debbd 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 c7e0d4727..3f59f772f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.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 d33ede20d..172525b4f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index 737ba0597..f71656ad8 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 9da13195e..090ce4381 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: fbe7ac90e6e6e5da996280ec3a0facd2feb207910cfdf1491228088ff15d3069 + checksum/config: 606d240c6b499a1762d0e030d326aba44e55964d5da37bc0a546e73555ebef80 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml index d33ede20d..172525b4f 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml index 737ba0597..f71656ad8 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml index 598b518c1..8904aa512 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml index c118a3a5c..5a599b8af 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -29,7 +29,7 @@ spec: template: metadata: annotations: - checksum/config: fbe7ac90e6e6e5da996280ec3a0facd2feb207910cfdf1491228088ff15d3069 + checksum/config: 606d240c6b499a1762d0e030d326aba44e55964d5da37bc0a546e73555ebef80 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 f0ad87bc9..ea0a3efe0 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index bde25ec25..4c7bd1562 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 1eb50b6ff752ed29085af31ddc42f0e46602f38d62360076a0df48fdd2194b55 + checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6 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 c7e0d4727..3f59f772f 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index 598b518c1..8904aa512 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.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml index 57eee45a9..471690ad3 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml index c7e0d4727..3f59f772f 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml index 598b518c1..8904aa512 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml index f0ad87bc9..ea0a3efe0 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml index 767409c11..3acf563bb 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 1eb50b6ff752ed29085af31ddc42f0e46602f38d62360076a0df48fdd2194b55 + checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml index c7e0d4727..3f59f772f 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml index 598b518c1..8904aa512 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.103.0 + helm.sh/chart: opentelemetry-collector-0.104.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.108.0" diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl index e6edb4fb3..5aaf3393c 100644 --- a/charts/opentelemetry-collector/templates/_config.tpl +++ b/charts/opentelemetry-collector/templates/_config.tpl @@ -1,6 +1,10 @@ {{- define "opentelemetry-collector.baseConfig" -}} +{{- if .Values.alternateConfig }} +{{- .Values.alternateConfig | toYaml }} +{{- else}} {{- .Values.config | toYaml }} {{- end }} +{{- end }} {{/* Build config file for daemonset OpenTelemetry Collector @@ -56,7 +60,7 @@ Build config file for deployment OpenTelemetry Collector {{- end }} {{- define "opentelemetry-collector.applyHostMetricsConfig" -}} -{{- $config := mustMergeOverwrite (include "opentelemetry-collector.hostMetricsConfig" .Values | fromYaml) .config }} +{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.hostMetricsConfig" .Values | fromYaml) .config }} {{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "hostmetrics" | uniq) }} {{- $config | toYaml }} {{- end }} @@ -112,7 +116,7 @@ receivers: {{- end }} {{- define "opentelemetry-collector.applyClusterMetricsConfig" -}} -{{- $config := mustMergeOverwrite (include "opentelemetry-collector.clusterMetricsConfig" .Values | fromYaml) .config }} +{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.clusterMetricsConfig" .Values | fromYaml) .config }} {{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "k8s_cluster" | uniq) }} {{- $config | toYaml }} {{- end }} @@ -124,7 +128,7 @@ receivers: {{- end }} {{- define "opentelemetry-collector.applyKubeletMetricsConfig" -}} -{{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubeletMetricsConfig" .Values | fromYaml) .config }} +{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.kubeletMetricsConfig" .Values | fromYaml) .config }} {{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "kubeletstats" | uniq) }} {{- $config | toYaml }} {{- end }} @@ -138,9 +142,10 @@ receivers: {{- end }} {{- define "opentelemetry-collector.applyLogsCollectionConfig" -}} -{{- $config := mustMergeOverwrite (include "opentelemetry-collector.logsCollectionConfig" .Values | fromYaml) .config }} +{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "receivers" list)))) (include "opentelemetry-collector.logsCollectionConfig" .Values | fromYaml) .config }} {{- $_ := set $config.service.pipelines.logs "receivers" (append $config.service.pipelines.logs.receivers "filelog" | uniq) }} {{- if .Values.Values.presets.logsCollection.storeCheckpoints}} +{{- $config := mustMergeOverwrite (dict "service" (dict "extensions" list)) $config }} {{- $_ := set $config.service "extensions" (append $config.service.extensions "file_storage" | uniq) }} {{- end }} {{- $config | toYaml }} @@ -178,14 +183,23 @@ receivers: {{- define "opentelemetry-collector.applyKubernetesAttributesConfig" -}} {{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubernetesAttributesConfig" .Values | fromYaml) .config }} -{{- if and ($config.service.pipelines.logs) (not (has "k8sattributes" $config.service.pipelines.logs.processors)) }} -{{- $_ := set $config.service.pipelines.logs "processors" (prepend $config.service.pipelines.logs.processors "k8sattributes" | uniq) }} +{{- if $config.service.pipelines.logs }} + {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "processors" list)))) $config }} + {{- if not (has "k8sattributes" $config.service.pipelines.logs.processors) }} + {{- $_ := set $config.service.pipelines.logs "processors" (prepend $config.service.pipelines.logs.processors "k8sattributes" | uniq) }} + {{- end }} {{- end }} -{{- if and ($config.service.pipelines.metrics) (not (has "k8sattributes" $config.service.pipelines.metrics.processors)) }} -{{- $_ := set $config.service.pipelines.metrics "processors" (prepend $config.service.pipelines.metrics.processors "k8sattributes" | uniq) }} +{{- if and $config.service.pipelines.metrics }} + {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "processors" list)))) $config }} + {{- if not (has "k8sattributes" $config.service.pipelines.metrics.processors) }} + {{- $_ := set $config.service.pipelines.metrics "processors" (prepend $config.service.pipelines.metrics.processors "k8sattributes" | uniq) }} + {{- end }} {{- end }} -{{- if and ($config.service.pipelines.traces) (not (has "k8sattributes" $config.service.pipelines.traces.processors)) }} -{{- $_ := set $config.service.pipelines.traces "processors" (prepend $config.service.pipelines.traces.processors "k8sattributes" | uniq) }} +{{- if and $config.service.pipelines.traces }} + {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "traces" (dict "processors" list)))) $config }} + {{- if not (has "k8sattributes" $config.service.pipelines.traces.processors) }} + {{- $_ := set $config.service.pipelines.traces "processors" (prepend $config.service.pipelines.traces.processors "k8sattributes" | uniq) }} + {{- end }} {{- end }} {{- $config | toYaml }} {{- end }} @@ -268,7 +282,7 @@ processors: {{- end }} {{- define "opentelemetry-collector.applyKubernetesEventsConfig" -}} -{{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubernetesEventsConfig" .Values | fromYaml) .config }} +{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "receivers" list)))) (include "opentelemetry-collector.kubernetesEventsConfig" .Values | fromYaml) .config }} {{- $_ := set $config.service.pipelines.logs "receivers" (append $config.service.pipelines.logs.receivers "k8sobjects" | uniq) }} {{- $config | toYaml }} {{- end }} diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index fb2cccff5..74ce2a4ec 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -142,6 +142,10 @@ } } }, + "alternateConfig": { + "description": "When not empty, will be used instead of config. Presets will be merged in the same way they are for config.", + "type": "object" + }, "config": { "description": "Configuration that applies to both standalone and agent collector. Overwritable by standalone and agent specific configs.", "type": "object" diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 348614f32..fcd004195 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -169,6 +169,23 @@ config: - jaeger - zipkin +# Helm currently has an issue (https://github.com/helm/helm/pull/12879) when using null to remove +# default configuration from a subchart. The result is that you cannot remove default configuration +# from `config`, such as a specific recevier or a specific pipeline, when the chart is used as a +# subchart. +# +# Until the helm bug is fixed, this field is provided as an alternative when using this chart as a subchart. +# It is not recommended to use this field when installing the chart directly. +# +# When not empty, `alternateConfig` will be used to set the collector's configuration. It has NO default +# values and IS NOT MERGED with config. Any configuration provided via `config` will be ignored when +# `alternateConfig` is set. You MUST provide your own collector configuration. +# +# Reminder that the healthcheck extension (or something else that provides the same functionality) is required. +# +# Components configured by presets will be injected in the same way they are for `config`. +alternateConfig: {} + image: # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`. repository: ""