diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml index f9eef9c43..6985162ac 100644 --- a/charts/opentelemetry-kube-stack/Chart.yaml +++ b/charts/opentelemetry-kube-stack/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-kube-stack -version: 0.2.1 +version: 0.2.2 description: | OpenTelemetry Quickstart chart for Kubernetes. Installs an operator and collector for an easy way to get started with Kubernetes observability. diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml index 2c2fd03ab..7250cb54f 100644 --- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml +++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml @@ -5,9 +5,10 @@ kind: OpAMPBridge metadata: name: example labels: - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm + release: "example" spec: endpoint: http://opamp-server:8080 capabilities: diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml index e6cacba7c..121652f70 100644 --- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml @@ -6,9 +6,10 @@ metadata: name: example-cluster-stats namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm + release: "example" opentelemetry.io/opamp-reporting: "true" spec: managementState: managed @@ -188,9 +189,10 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm + release: "example" opentelemetry.io/opamp-reporting: "true" spec: managementState: managed diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml index e345ba81f..1e6943d0d 100644 --- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml @@ -62,4 +62,4 @@ spec: - -c - | kubectl delete instrumentations,opampbridges,opentelemetrycollectors \ - -l helm.sh/chart=opentelemetry-kube-stack-0.2.1 + -l helm.sh/chart=opentelemetry-kube-stack-0.2.2 diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml index 0a09f48b3..38c99edb2 100644 --- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml +++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml @@ -5,9 +5,10 @@ kind: Instrumentation metadata: name: example labels: - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm + release: "example" spec: exporter: endpoint: http://${OTEL_K8S_NODE_NAME}:4317 diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml index 4fa74d1aa..31085f6b9 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml @@ -6,9 +6,10 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm + release: "example" spec: managementState: managed mode: daemonset diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml index 8ea8f330e..20a5fb4d1 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-apiserver - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: endpoints: diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml index 89eb5fbe9..8713da159 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml @@ -7,9 +7,10 @@ metadata: labels: app: opentelemetry-kube-stack-kube-controller-manager jobLabel: kube-controller-manager - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" namespace: kube-system spec: clusterIP: None diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml index 8dec65903..628c061fc 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-kube-controller-manager - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: jobLabel: jobLabel diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml index b54d80201..051d02cc8 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml @@ -7,9 +7,10 @@ metadata: labels: app: opentelemetry-kube-stack-kube-dns jobLabel: kube-dns - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" namespace: kube-system spec: clusterIP: None diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml index 65255a882..13b0911a0 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-kube-dns - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: jobLabel: jobLabel diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml index 3870b56b3..48e91050a 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml @@ -7,9 +7,10 @@ metadata: labels: app: opentelemetry-kube-stack-kube-etcd jobLabel: kube-etcd - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" namespace: kube-system spec: clusterIP: None diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml index c618bb95a..75393f81f 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-kube-etcd - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: jobLabel: jobLabel diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml index 481177174..437285c74 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml @@ -7,9 +7,10 @@ metadata: labels: app: opentelemetry-kube-stack-kube-proxy jobLabel: kube-proxy - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" namespace: kube-system spec: clusterIP: None diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml index fb73a7be2..d884068bf 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-kube-proxy - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: jobLabel: jobLabel diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml index 35feeae79..c1208a519 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml @@ -7,9 +7,10 @@ metadata: labels: app: opentelemetry-kube-stack-kube-scheduler jobLabel: kube-scheduler - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" namespace: kube-system spec: clusterIP: None diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml index dde0fae79..9ba403657 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml @@ -7,9 +7,10 @@ metadata: namespace: default labels: app: opentelemetry-kube-stack-kube-scheduler - helm.sh/chart: opentelemetry-kube-stack-0.2.1 + helm.sh/chart: opentelemetry-kube-stack-0.2.2 app.kubernetes.io/version: "0.107.0" app.kubernetes.io/managed-by: Helm + release: "example" spec: jobLabel: jobLabel diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml index e345ba81f..1e6943d0d 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml @@ -62,4 +62,4 @@ spec: - -c - | kubectl delete instrumentations,opampbridges,opentelemetrycollectors \ - -l helm.sh/chart=opentelemetry-kube-stack-0.2.1 + -l helm.sh/chart=opentelemetry-kube-stack-0.2.2 diff --git a/charts/opentelemetry-kube-stack/templates/_helpers.tpl b/charts/opentelemetry-kube-stack/templates/_helpers.tpl index eb24a625a..b8bb2d423 100644 --- a/charts/opentelemetry-kube-stack/templates/_helpers.tpl +++ b/charts/opentelemetry-kube-stack/templates/_helpers.tpl @@ -121,6 +121,7 @@ helm.sh/chart: {{ include "opentelemetry-kube-stack.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +release: {{ .Release.Name | quote }} {{- end }} {{/*