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

[opentelemetry-kube-stack] Adding additional labels #1382

Closed
wants to merge 5 commits into from
Closed

[opentelemetry-kube-stack] Adding additional labels #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd3549c
Adding additional labels
suresh-target Oct 14, 2024
7e5b04f
uptick version
suresh-target Oct 14, 2024
7217d00
Merge branch 'additional_labels' of https://github.com/suresh-target/…
suresh-target Oct 16, 2024
e385a4f
update the version
suresh-target Oct 16, 2024
c0a092d
remove duplicate file
suresh-target Oct 16, 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.0
version: 0.3.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like the linter is still failing because of some whitespacing issues? Did your linter/formatter automatically remove extra spacing potentially?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if not, i can try running this locally and see what happens.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaronoff97 I'm closing this PR and created another one #1388

description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand Down
4 changes: 2 additions & 2 deletions 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,10 +5,10 @@ kind: OpAMPBridge
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
release: "example"
spec:
endpoint: http://opamp-server:8080
capabilities:
Expand Down
12 changes: 6 additions & 6 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 @@ -6,10 +6,10 @@ metadata:
name: example-cluster-stats
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
release: "example"
opentelemetry.io/opamp-reporting: "true"
spec:
managementState: managed
Expand Down Expand Up @@ -174,7 +174,7 @@ spec:
fieldPath: status.podIP
- name: OTEL_RESOURCE_ATTRIBUTES
value: "k8s.cluster.name=demo"

- name: ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand All @@ -189,10 +189,10 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
release: "example"
opentelemetry.io/opamp-reporting: "true"
spec:
managementState: managed
Expand Down Expand Up @@ -644,7 +644,7 @@ spec:
fieldPath: status.podIP
- name: OTEL_RESOURCE_ATTRIBUTES
value: "k8s.cluster.name=demo"

- name: ACCESS_TOKEN
valueFrom:
secretKeyRef:
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.0
-l helm.sh/chart=opentelemetry-kube-stack-0.3.1
6 changes: 3 additions & 3 deletions 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,10 +5,10 @@ kind: Instrumentation
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
release: "example"
spec:
exporter:
endpoint: http://${OTEL_K8S_NODE_NAME}:4317
Expand All @@ -20,7 +20,7 @@ spec:
- jaeger
- xray
- ottrace
env:
env:
- name: OTEL_K8S_NODE_NAME
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 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 @@ -6,10 +6,10 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
release: "example"
spec:
managementState: managed
mode: daemonset
Expand Down Expand Up @@ -341,7 +341,7 @@ spec:
fieldPath: status.podIP
- name: OTEL_RESOURCE_ATTRIBUTES
value: "k8s.cluster.name=demo"

- name: ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down
4 changes: 2 additions & 2 deletions ...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,12 +7,12 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-apiserver
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:

endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
port: https
Expand Down
2 changes: 1 addition & 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,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-controller-manager
jobLabel: kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions ...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,13 +7,13 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:
jobLabel: jobLabel

selector:
matchLabels:
app: opentelemetry-kube-stack-kube-controller-manager
Expand Down
2 changes: 1 addition & 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,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-dns
jobLabel: kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions ...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,13 +7,13 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:
jobLabel: jobLabel

selector:
matchLabels:
app: opentelemetry-kube-stack-kube-dns
Expand Down
2 changes: 1 addition & 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,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-etcd
jobLabel: kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions ...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,13 +7,13 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:
jobLabel: jobLabel

selector:
matchLabels:
app: opentelemetry-kube-stack-kube-etcd
Expand Down
2 changes: 1 addition & 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,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-proxy
jobLabel: kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions ...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,13 +7,13 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:
jobLabel: jobLabel

selector:
matchLabels:
app: opentelemetry-kube-stack-kube-proxy
Expand Down
2 changes: 1 addition & 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,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-scheduler
jobLabel: kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions ...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,13 +7,13 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.0
helm.sh/chart: opentelemetry-kube-stack-0.3.1
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
spec:
jobLabel: jobLabel

selector:
matchLabels:
app: opentelemetry-kube-stack-kube-scheduler
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.0
-l helm.sh/chart=opentelemetry-kube-stack-0.3.1
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3262,7 +3262,7 @@
},
"AdditionalLabels": {
"type": "object",
"additionalProperties": false,
"additionalProperties": true,
"title": "AdditionalLabels"
},
"EnableConfigBlock": {
Expand Down
Loading