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.

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

[LS-59631] add opamp bridge to otel-cloud-stack chart #76

Merged
merged 26 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f1f5abf
add opamp bridge to otel-cloud-stack chart
jdcrouse Mar 13, 2024
cc6bc7a
undo some unintended changes
jdcrouse Mar 13, 2024
5971232
based on semver this seems like a new minor version
jdcrouse Mar 13, 2024
dd0d33b
go ahead and add the same chart to kube-otel-stack
jdcrouse Mar 13, 2024
0be699c
bump minor version
jdcrouse Mar 13, 2024
79a2dac
fix auth header variable
jdcrouse Mar 13, 2024
e15ca46
pull variable from secrets
jdcrouse Mar 13, 2024
29a79b0
new lines
jdcrouse Mar 14, 2024
681ccd5
fix variable substitution and include labels from values in collector…
jdcrouse Mar 14, 2024
3238621
fix variable subs and add labels to collectors
jdcrouse Mar 14, 2024
57088c2
optional label inclusion
jdcrouse Mar 14, 2024
502cb33
opamp-reporting prevents bridge modification of a collector, this val…
jdcrouse Mar 15, 2024
b62dcb9
set opampManaged as a collector attribute, and read that to optionall…
jdcrouse Mar 15, 2024
6680c57
same change to use an attribute instead of custom labels in kube-otel…
jdcrouse Mar 15, 2024
4ad3269
default opamp managd to true
jdcrouse Mar 15, 2024
d3ffea5
include opamp-reporting too, and set reporting default true managed d…
jdcrouse Mar 15, 2024
56b840a
pin to latest version tag
jdcrouse Mar 15, 2024
5d752cc
only set one of reporting or managed, giving reporting precedence
jdcrouse Mar 15, 2024
fbe14b9
whitespace
jdcrouse Mar 15, 2024
caced3d
merge in most of bridge chart from otel helm charts repo
jdcrouse Mar 15, 2024
71285ae
all or nothing opamp managed and reporting tags
jdcrouse Mar 15, 2024
69f8dbc
undo kube-otel-stack changes to slim down PR. these charts will be th…
jdcrouse Mar 15, 2024
8a5d135
idk
jdcrouse Mar 15, 2024
ac9580a
properly revert
jdcrouse Mar 15, 2024
1c15374
revert
jdcrouse Mar 15, 2024
4f90e6d
remove erroneous bridge
jdcrouse Mar 18, 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
Prev Previous commit
Next Next commit
properly revert
  • Loading branch information
jdcrouse committed Mar 15, 2024
commit ac9580a906eabcf63d2e399c14a9a569e87f1688
98 changes: 49 additions & 49 deletions charts/kube-otel-stack/templates/collector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,47 +143,47 @@ kind: ClusterRole
metadata:
name: "{{ $collectorName }}"
rules:
- apiGroups: [""]
resources:
- namespaces
- nodes
- nodes/proxy
- nodes/metrics
- services
- endpoints
- pods
- events
- secrets
verbs: ["get", "list", "watch"]
- apiGroups: ["monitoring.coreos.com"]
resources:
- servicemonitors
- podmonitors
verbs: ["get", "list", "watch"]
- apiGroups:
- extensions
resources:
- ingresses
verbs: ["get", "list", "watch"]
- apiGroups:
- apps
resources:
- daemonsets
- deployments
- replicasets
- statefulsets
verbs: ["get", "list", "watch"]
- apiGroups:
- networking.k8s.io
resources:
- ingresses
verbs: ["get", "list", "watch"]
- apiGroups: ["discovery.k8s.io"]
resources:
- endpointslices
verbs: ["get", "list", "watch"]
- nonResourceURLs: ["/metrics", "/metrics/cadvisor"]
verbs: ["get"]
- apiGroups: [""]
resources:
- namespaces
- nodes
- nodes/proxy
- nodes/metrics
- services
- endpoints
- pods
- events
- secrets
verbs: ["get", "list", "watch"]
- apiGroups: ["monitoring.coreos.com"]
resources:
- servicemonitors
- podmonitors
verbs: ["get", "list", "watch"]
- apiGroups:
- extensions
resources:
- ingresses
verbs: ["get", "list", "watch"]
- apiGroups:
- apps
resources:
- daemonsets
- deployments
- replicasets
- statefulsets
verbs: ["get", "list", "watch"]
- apiGroups:
- networking.k8s.io
resources:
- ingresses
verbs: ["get", "list", "watch"]
- apiGroups: ["discovery.k8s.io"]
resources:
- endpointslices
verbs: ["get", "list", "watch"]
- nonResourceURLs: ["/metrics", "/metrics/cadvisor"]
verbs: ["get"]
{{- if $collector.extraRbac }}
{{ toYaml $collector.extraRbac }}
{{- end }}
Expand All @@ -197,15 +197,15 @@ roleRef:
kind: ClusterRole
name: "{{ $collectorName }}"
subjects:
- kind: ServiceAccount
# quirk of the Operator
name: "{{ $collectorName }}-collector"
namespace: {{ $.Release.Namespace }}
- kind: ServiceAccount
# quirk of the Operator
name: "{{ $collectorName }}-collector"
namespace: {{ $.Release.Namespace }}
{{- if eq $collector.mode "statefulset" }}
- kind: ServiceAccount
name: {{ $collectorName }}-targetallocator
namespace: {{ $.Release.Namespace }}
- kind: ServiceAccount
name: {{ $collectorName }}-targetallocator
namespace: {{ $.Release.Namespace }}
{{- end }}
---
{{ end }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/kube-otel-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ autoinstrumentation:
## For instance for parentbased_traceidratio sampler type it is a number in range [0..1] e.g. 0.25.
argument: "0.25"
languageSettings: {}
# LanguageSettings defines the language specific settings for auto-instrumentation. Example:
# LanguageSettings defines the language specific settings for auto-instrumentation. Example:
# python:
# env:
# - name: OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED
# value: "true"
# - name: OTEL_TRACES_EXPORTER
# value: "otlp"
# image: "<custom-image>"
# resources: {}
# resources: {}
## A list of corev1.EnvVars
env: []

Expand Down Expand Up @@ -1241,4 +1241,4 @@ prometheus-node-exporter:
rbac:
## If true, create PSPs for node-exporter
##
pspEnabled: false
pspEnabled: false
Loading