Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix collector label addition issue #1427

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix collector label addition issue #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86346fa
fix the collector label addition failure
suresh-target Nov 21, 2024
7c791e7
uptick the version
suresh-target Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-kube-stack
version: 0.3.3
version: 0.3.4
description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ kind: OpAMPBridge
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: OpenTelemetryCollector
metadata:
name: example-cluster-stats
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.3
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -188,8 +188,8 @@ kind: OpenTelemetryCollector
metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.3
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ spec:
- -c
- |
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-l helm.sh/chart=opentelemetry-kube-stack-0.3.3
-l helm.sh/chart=opentelemetry-kube-stack-0.3.4
3 changes: 2 additions & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ kind: Instrumentation
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: OpenTelemetryCollector
metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.3
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...ube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-apiserver
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...be-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-controller-manager
jobLabel: kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...k/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...pentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-dns
jobLabel: kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...metry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...entelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-etcd
jobLabel: kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...etry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...ntelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-proxy
jobLabel: kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...try-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...emetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-scheduler
jobLabel: kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
3 changes: 2 additions & 1 deletion ...kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.3

helm.sh/chart: opentelemetry-kube-stack-0.3.4
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ spec:
- -c
- |
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-l helm.sh/chart=opentelemetry-kube-stack-0.3.3
-l helm.sh/chart=opentelemetry-kube-stack-0.3.4
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Print a map of key values in a YAML block. This is useful for labels and annotat
{{- define "opentelemetry-kube-stack.renderkv" -}}
{{- with . -}}
{{- range $key, $value := . -}}
{{- printf "%s: %s" $key $value }}
{{- printf "\n%s: %s" $key $value }}
{{- end -}}
{{- end -}}
{{- end }}
Expand Down Expand Up @@ -115,7 +115,7 @@ Create chart name and version as used by the chart label.
{{/*
Common labels
*/}}
{{- define "opentelemetry-kube-stack.labels" -}}
{{- define "opentelemetry-kube-stack.labels" }}
helm.sh/chart: {{ include "opentelemetry-kube-stack.chart" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/templates/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
name: {{ $fullname }}
namespace: {{ include "opentelemetry-kube-stack.namespace" $ }}
labels:
{{- include "opentelemetry-kube-stack.labels" $ | nindent 4 }}
{{- include "opentelemetry-kube-stack.labels" $ | indent 4 }}
{{- include "opentelemetry-kube-stack.renderkv" $collector.labels | indent 4 }}
{{- include "opentelemetry-kube-stack.collectorOpAMPLabels" $.Values | indent 4 }}
{{- with $collector.annotations }}
Expand Down
Loading