Skip to content

Commit

Permalink
update to demo 1.7
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre Tessier <[email protected]>
  • Loading branch information
puckpuck committed Dec 15, 2023
1 parent bdbdf99 commit 62b7dba
Show file tree
Hide file tree
Showing 145 changed files with 358 additions and 334 deletions.
12 changes: 6 additions & 6 deletions charts/opentelemetry-demo/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dependencies:
- name: opentelemetry-collector
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.73.1
version: 0.77.0
- name: jaeger
repository: https://jaegertracing.github.io/helm-charts
version: 0.72.0
version: 0.72.1
- name: prometheus
repository: https://prometheus-community.github.io/helm-charts
version: 25.4.0
version: 25.8.2
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 7.0.2
digest: sha256:ab2ac03e11a942d4a0db3534823d773de5830947d9142bc482e0113db8974749
generated: "2023-11-03T08:39:24.04441-04:00"
version: 7.0.17
digest: sha256:f250ab055f3220c955bac32729a6aeddf707af805cca528ffb143f91e6ccbbc7
generated: "2023-12-14T23:19:56.92245-05:00"
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
name: example-grafana-clusterrole
rules: []
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: example-grafana-clusterrolebinding
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
subjects:
- kind: ServiceAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
data:

grafana.ini: |
[analytics]
check_for_updates = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -26,10 +26,9 @@ spec:
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
annotations:
checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba
checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b
checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c
checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f
kubectl.kubernetes.io/default-container: grafana
spec:

Expand All @@ -43,7 +42,7 @@ spec:
enableServiceLinks: true
containers:
- name: grafana
image: "docker.io/grafana/grafana:10.1.5"
image: "docker.io/grafana/grafana:10.2.2"
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
rules: []
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
type: Opaque
data:

admin-user: "YWRtaW4="
admin-password: "YWRtaW4="
ldap-toml: ""
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-grafana
namespace: default
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
name: example-grafana
namespace: default
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ metadata:
"helm.sh/hook": test-success
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
data:
run.sh: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
name: example-grafana-test
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Pod
metadata:
name: example-grafana-test
labels:
helm.sh/chart: grafana-7.0.2
helm.sh/chart: grafana-7.0.17
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: example
app.kubernetes.io/version: "10.1.5"
app.kubernetes.io/version: "10.2.2"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": test-success
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-jaeger-agent
labels:
helm.sh/chart: jaeger-0.72.0
helm.sh/chart: jaeger-0.72.1
app.kubernetes.io/name: jaeger
app.kubernetes.io/instance: example
app.kubernetes.io/version: "1.51.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-jaeger-collector
labels:
helm.sh/chart: jaeger-0.72.0
helm.sh/chart: jaeger-0.72.1
app.kubernetes.io/name: jaeger
app.kubernetes.io/instance: example
app.kubernetes.io/version: "1.51.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-jaeger
labels:
helm.sh/chart: jaeger-0.72.0
helm.sh/chart: jaeger-0.72.1
app.kubernetes.io/name: jaeger
app.kubernetes.io/instance: example
app.kubernetes.io/version: "1.51.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-jaeger-query
labels:
helm.sh/chart: jaeger-0.72.0
helm.sh/chart: jaeger-0.72.1
app.kubernetes.io/name: jaeger
app.kubernetes.io/instance: example
app.kubernetes.io/version: "1.51.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-jaeger
labels:
helm.sh/chart: jaeger-0.72.0
helm.sh/chart: jaeger-0.72.1
app.kubernetes.io/name: jaeger
app.kubernetes.io/instance: example
app.kubernetes.io/version: "1.51.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ kind: ClusterRole
metadata:
name: example-otelcol
labels:
helm.sh/chart: opentelemetry-collector-0.73.1
helm.sh/chart: opentelemetry-collector-0.77.0
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

rules:
- apiGroups: [""]
resources: ["pods", "namespaces"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ kind: ClusterRoleBinding
metadata:
name: example-otelcol
labels:
helm.sh/chart: opentelemetry-collector-0.73.1
helm.sh/chart: opentelemetry-collector-0.77.0
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-otelcol-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.73.1
helm.sh/chart: opentelemetry-collector-0.77.0
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
connectors:
Expand All @@ -28,8 +29,6 @@ data:
insecure: true
extensions:
health_check: {}
memory_ballast:
size_in_percentage: 40
processors:
batch: {}
filter/ottl:
Expand Down Expand Up @@ -110,7 +109,6 @@ data:
service:
extensions:
- health_check
- memory_ballast
pipelines:
logs:
exporters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-otelcol-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.73.1
helm.sh/chart: opentelemetry-collector-0.77.0
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: ad59475fe580acaaa3e002b7dcca40b1a49c48b276e01c7ae9db1b31cc503987
checksum/config: c7fbf05ac1318742da91abac6b2ee05dce1f0185b15edbd994d43afd518f5707
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand All @@ -43,7 +44,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.88.0"
image: "otel/opentelemetry-collector-contrib:0.91.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down Expand Up @@ -87,6 +88,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: GOMEMLIMIT
value: 160MiB
livenessProbe:
httpGet:
path: /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-otelcol
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.73.1
helm.sh/chart: opentelemetry-collector-0.77.0
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/component: server
app.kubernetes.io/name: prometheus
app.kubernetes.io/instance: example
app.kubernetes.io/version: v2.47.2
helm.sh/chart: prometheus-25.4.0
app.kubernetes.io/version: v2.48.1
helm.sh/chart: prometheus-25.8.2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: prometheus
name: example-prometheus-server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/component: server
app.kubernetes.io/name: prometheus
app.kubernetes.io/instance: example
app.kubernetes.io/version: v2.47.2
helm.sh/chart: prometheus-25.4.0
app.kubernetes.io/version: v2.48.1
helm.sh/chart: prometheus-25.8.2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: prometheus
name: example-prometheus-server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/component: server
app.kubernetes.io/name: prometheus
app.kubernetes.io/instance: example
app.kubernetes.io/version: v2.47.2
helm.sh/chart: prometheus-25.4.0
app.kubernetes.io/version: v2.48.1
helm.sh/chart: prometheus-25.8.2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: prometheus
name: example-prometheus-server
Expand Down
Loading

0 comments on commit 62b7dba

Please sign in to comment.