Skip to content

Commit c281f7c

Browse files
[chore] Update k8s manifests (#1822)
1 parent 615449a commit c281f7c

File tree

1 file changed

+74
-72
lines changed

1 file changed

+74
-72
lines changed

kubernetes/opentelemetry-demo.yaml

+74-72
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
labels:
3333
app.kubernetes.io/name: grafana
3434
app.kubernetes.io/instance: opentelemetry-demo
35-
app.kubernetes.io/version: "11.3.0"
35+
app.kubernetes.io/version: "11.3.1"
3636
name: opentelemetry-demo-grafana
3737
namespace: otel-demo
3838
---
@@ -57,7 +57,8 @@ metadata:
5757
labels:
5858
app.kubernetes.io/name: otelcol
5959
app.kubernetes.io/instance: opentelemetry-demo
60-
app.kubernetes.io/version: "0.113.0"
60+
app.kubernetes.io/version: "0.114.0"
61+
app.kubernetes.io/component: standalone-collector
6162
---
6263
# Source: opentelemetry-demo/charts/prometheus/templates/serviceaccount.yaml
6364
apiVersion: v1
@@ -67,7 +68,7 @@ metadata:
6768
app.kubernetes.io/component: server
6869
app.kubernetes.io/name: prometheus
6970
app.kubernetes.io/instance: opentelemetry-demo
70-
app.kubernetes.io/version: v2.55.1
71+
app.kubernetes.io/version: v3.0.0
7172
app.kubernetes.io/part-of: prometheus
7273
name: opentelemetry-demo-prometheus-server
7374
namespace: otel-demo
@@ -96,7 +97,7 @@ metadata:
9697
labels:
9798
app.kubernetes.io/name: grafana
9899
app.kubernetes.io/instance: opentelemetry-demo
99-
app.kubernetes.io/version: "11.3.0"
100+
app.kubernetes.io/version: "11.3.1"
100101
type: Opaque
101102
data:
102103

@@ -113,7 +114,7 @@ metadata:
113114
labels:
114115
app.kubernetes.io/name: grafana
115116
app.kubernetes.io/instance: opentelemetry-demo
116-
app.kubernetes.io/version: "11.3.0"
117+
app.kubernetes.io/version: "11.3.1"
117118
data:
118119

119120
plugins: grafana-opensearch-datasource
@@ -210,44 +211,44 @@ data:
210211
211212
# Start OpenSearch Security Demo Configuration
212213
# WARNING: revise all the lines below before you go into production
213-
plugins:
214-
security:
215-
ssl:
216-
transport:
217-
pemcert_filepath: esnode.pem
218-
pemkey_filepath: esnode-key.pem
219-
pemtrustedcas_filepath: root-ca.pem
220-
enforce_hostname_verification: false
221-
http:
222-
enabled: true
223-
pemcert_filepath: esnode.pem
224-
pemkey_filepath: esnode-key.pem
225-
pemtrustedcas_filepath: root-ca.pem
226-
allow_unsafe_democertificates: true
227-
allow_default_init_securityindex: true
228-
authcz:
229-
admin_dn:
230-
- CN=kirk,OU=client,O=client,L=test,C=de
231-
audit.type: internal_opensearch
232-
enable_snapshot_restore_privilege: true
233-
check_snapshot_restore_write_privileges: true
234-
restapi:
235-
roles_enabled: ["all_access", "security_rest_api_access"]
236-
system_indices:
237-
enabled: true
238-
indices:
239-
[
240-
".opendistro-alerting-config",
241-
".opendistro-alerting-alert*",
242-
".opendistro-anomaly-results*",
243-
".opendistro-anomaly-detector*",
244-
".opendistro-anomaly-checkpoints",
245-
".opendistro-anomaly-detection-state",
246-
".opendistro-reports-*",
247-
".opendistro-notifications-*",
248-
".opendistro-notebooks",
249-
".opendistro-asynchronous-search-response*",
250-
]
214+
# plugins:
215+
# security:
216+
# ssl:
217+
# transport:
218+
# pemcert_filepath: esnode.pem
219+
# pemkey_filepath: esnode-key.pem
220+
# pemtrustedcas_filepath: root-ca.pem
221+
# enforce_hostname_verification: false
222+
# http:
223+
# enabled: true
224+
# pemcert_filepath: esnode.pem
225+
# pemkey_filepath: esnode-key.pem
226+
# pemtrustedcas_filepath: root-ca.pem
227+
# allow_unsafe_democertificates: true
228+
# allow_default_init_securityindex: true
229+
# authcz:
230+
# admin_dn:
231+
# - CN=kirk,OU=client,O=client,L=test,C=de
232+
# audit.type: internal_opensearch
233+
# enable_snapshot_restore_privilege: true
234+
# check_snapshot_restore_write_privileges: true
235+
# restapi:
236+
# roles_enabled: ["all_access", "security_rest_api_access"]
237+
# system_indices:
238+
# enabled: true
239+
# indices:
240+
# [
241+
# ".opendistro-alerting-config",
242+
# ".opendistro-alerting-alert*",
243+
# ".opendistro-anomaly-results*",
244+
# ".opendistro-anomaly-detector*",
245+
# ".opendistro-anomaly-checkpoints",
246+
# ".opendistro-anomaly-detection-state",
247+
# ".opendistro-reports-*",
248+
# ".opendistro-notifications-*",
249+
# ".opendistro-notebooks",
250+
# ".opendistro-asynchronous-search-response*",
251+
# ]
251252
######## End OpenSearch Security Demo Configuration ########
252253
---
253254
# Source: opentelemetry-demo/charts/opentelemetry-collector/templates/configmap.yaml
@@ -259,8 +260,8 @@ metadata:
259260
labels:
260261
app.kubernetes.io/name: otelcol
261262
app.kubernetes.io/instance: opentelemetry-demo
262-
app.kubernetes.io/version: "0.113.0"
263-
263+
app.kubernetes.io/version: "0.114.0"
264+
app.kubernetes.io/component: standalone-collector
264265
data:
265266
relay: |
266267
connectors:
@@ -416,7 +417,7 @@ metadata:
416417
app.kubernetes.io/component: server
417418
app.kubernetes.io/name: prometheus
418419
app.kubernetes.io/instance: opentelemetry-demo
419-
app.kubernetes.io/version: v2.55.1
420+
app.kubernetes.io/version: v3.0.0
420421
app.kubernetes.io/part-of: prometheus
421422
name: opentelemetry-demo-prometheus-server
422423
namespace: otel-demo
@@ -8252,7 +8253,7 @@ metadata:
82528253
labels:
82538254
app.kubernetes.io/name: grafana
82548255
app.kubernetes.io/instance: opentelemetry-demo
8255-
app.kubernetes.io/version: "11.3.0"
8256+
app.kubernetes.io/version: "11.3.1"
82568257
name: opentelemetry-demo-grafana-clusterrole
82578258
rules: []
82588259
---
@@ -8264,8 +8265,8 @@ metadata:
82648265
labels:
82658266
app.kubernetes.io/name: otelcol
82668267
app.kubernetes.io/instance: opentelemetry-demo
8267-
app.kubernetes.io/version: "0.113.0"
8268-
8268+
app.kubernetes.io/version: "0.114.0"
8269+
app.kubernetes.io/component: standalone-collector
82698270
rules:
82708271
- apiGroups: [""]
82718272
resources: ["pods", "namespaces"]
@@ -8285,7 +8286,7 @@ metadata:
82858286
app.kubernetes.io/component: server
82868287
app.kubernetes.io/name: prometheus
82878288
app.kubernetes.io/instance: opentelemetry-demo
8288-
app.kubernetes.io/version: v2.55.1
8289+
app.kubernetes.io/version: v3.0.0
82898290
app.kubernetes.io/part-of: prometheus
82908291
name: opentelemetry-demo-prometheus-server
82918292
rules:
@@ -8335,7 +8336,7 @@ metadata:
83358336
labels:
83368337
app.kubernetes.io/name: grafana
83378338
app.kubernetes.io/instance: opentelemetry-demo
8338-
app.kubernetes.io/version: "11.3.0"
8339+
app.kubernetes.io/version: "11.3.1"
83398340
subjects:
83408341
- kind: ServiceAccount
83418342
name: opentelemetry-demo-grafana
@@ -8353,8 +8354,8 @@ metadata:
83538354
labels:
83548355
app.kubernetes.io/name: otelcol
83558356
app.kubernetes.io/instance: opentelemetry-demo
8356-
app.kubernetes.io/version: "0.113.0"
8357-
8357+
app.kubernetes.io/version: "0.114.0"
8358+
app.kubernetes.io/component: standalone-collector
83588359
roleRef:
83598360
apiGroup: rbac.authorization.k8s.io
83608361
kind: ClusterRole
@@ -8372,7 +8373,7 @@ metadata:
83728373
app.kubernetes.io/component: server
83738374
app.kubernetes.io/name: prometheus
83748375
app.kubernetes.io/instance: opentelemetry-demo
8375-
app.kubernetes.io/version: v2.55.1
8376+
app.kubernetes.io/version: v3.0.0
83768377
app.kubernetes.io/part-of: prometheus
83778378
name: opentelemetry-demo-prometheus-server
83788379
subjects:
@@ -8393,7 +8394,7 @@ metadata:
83938394
labels:
83948395
app.kubernetes.io/name: grafana
83958396
app.kubernetes.io/instance: opentelemetry-demo
8396-
app.kubernetes.io/version: "11.3.0"
8397+
app.kubernetes.io/version: "11.3.1"
83978398
rules: []
83988399
---
83998400
# Source: opentelemetry-demo/charts/grafana/templates/rolebinding.yaml
@@ -8405,7 +8406,7 @@ metadata:
84058406
labels:
84068407
app.kubernetes.io/name: grafana
84078408
app.kubernetes.io/instance: opentelemetry-demo
8408-
app.kubernetes.io/version: "11.3.0"
8409+
app.kubernetes.io/version: "11.3.1"
84098410
roleRef:
84108411
apiGroup: rbac.authorization.k8s.io
84118412
kind: Role
@@ -8424,7 +8425,7 @@ metadata:
84248425
labels:
84258426
app.kubernetes.io/name: grafana
84268427
app.kubernetes.io/instance: opentelemetry-demo
8427-
app.kubernetes.io/version: "11.3.0"
8428+
app.kubernetes.io/version: "11.3.1"
84288429
spec:
84298430
type: ClusterIP
84308431
ports:
@@ -8598,8 +8599,8 @@ metadata:
85988599
labels:
85998600
app.kubernetes.io/name: otelcol
86008601
app.kubernetes.io/instance: opentelemetry-demo
8601-
app.kubernetes.io/version: "0.113.0"
8602-
8602+
app.kubernetes.io/version: "0.114.0"
8603+
app.kubernetes.io/component: standalone-collector
86038604
component: standalone-collector
86048605
spec:
86058606
type: ClusterIP
@@ -8652,7 +8653,7 @@ metadata:
86528653
app.kubernetes.io/component: server
86538654
app.kubernetes.io/name: prometheus
86548655
app.kubernetes.io/instance: opentelemetry-demo
8655-
app.kubernetes.io/version: v2.55.1
8656+
app.kubernetes.io/version: v3.0.0
86568657
app.kubernetes.io/part-of: prometheus
86578658
name: opentelemetry-demo-prometheus-server
86588659
namespace: otel-demo
@@ -9075,7 +9076,7 @@ metadata:
90759076
labels:
90769077
app.kubernetes.io/name: grafana
90779078
app.kubernetes.io/instance: opentelemetry-demo
9078-
app.kubernetes.io/version: "11.3.0"
9079+
app.kubernetes.io/version: "11.3.1"
90799080
spec:
90809081
replicas: 1
90819082
revisionHistoryLimit: 10
@@ -9090,6 +9091,7 @@ spec:
90909091
labels:
90919092
app.kubernetes.io/name: grafana
90929093
app.kubernetes.io/instance: opentelemetry-demo
9094+
app.kubernetes.io/version: "11.3.1"
90939095
annotations:
90949096
checksum/config: 66402109ab73b3549330f38a66f20b78067ca4fdd1b77fc12fd760727d05f34c
90959097
checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24
@@ -9107,7 +9109,7 @@ spec:
91079109
enableServiceLinks: true
91089110
containers:
91099111
- name: grafana
9110-
image: "docker.io/grafana/grafana:11.3.0"
9112+
image: "docker.io/grafana/grafana:11.3.1"
91119113
imagePullPolicy: IfNotPresent
91129114
securityContext:
91139115
allowPrivilegeEscalation: false
@@ -9311,8 +9313,8 @@ metadata:
93119313
labels:
93129314
app.kubernetes.io/name: otelcol
93139315
app.kubernetes.io/instance: opentelemetry-demo
9314-
app.kubernetes.io/version: "0.113.0"
9315-
9316+
app.kubernetes.io/version: "0.114.0"
9317+
app.kubernetes.io/component: standalone-collector
93169318
spec:
93179319
replicas: 1
93189320
revisionHistoryLimit: 10
@@ -9326,7 +9328,7 @@ spec:
93269328
template:
93279329
metadata:
93289330
annotations:
9329-
checksum/config: 2d923ab8c3aa2c63ec32fe4a7aa4993b12f3e03b2e255f1909b97f5e43b58226
9331+
checksum/config: c953028ca96450ba37c5dbeb9458b2c6a8a733dc3fc5784339c7b2df5619a16a
93309332
opentelemetry_community_demo: "true"
93319333
prometheus.io/port: "9464"
93329334
prometheus.io/scrape: "true"
@@ -9346,7 +9348,7 @@ spec:
93469348
- --config=/conf/relay.yaml
93479349
securityContext:
93489350
{}
9349-
image: "otel/opentelemetry-collector-contrib:0.113.0"
9351+
image: "otel/opentelemetry-collector-contrib:0.114.0"
93509352
imagePullPolicy: IfNotPresent
93519353
ports:
93529354

@@ -9413,7 +9415,7 @@ metadata:
94139415
app.kubernetes.io/component: server
94149416
app.kubernetes.io/name: prometheus
94159417
app.kubernetes.io/instance: opentelemetry-demo
9416-
app.kubernetes.io/version: v2.55.1
9418+
app.kubernetes.io/version: v3.0.0
94179419
app.kubernetes.io/part-of: prometheus
94189420
name: opentelemetry-demo-prometheus-server
94199421
namespace: otel-demo
@@ -9434,15 +9436,15 @@ spec:
94349436
app.kubernetes.io/component: server
94359437
app.kubernetes.io/name: prometheus
94369438
app.kubernetes.io/instance: opentelemetry-demo
9437-
app.kubernetes.io/version: v2.55.1
9439+
app.kubernetes.io/version: v3.0.0
94389440
app.kubernetes.io/part-of: prometheus
94399441
spec:
94409442
enableServiceLinks: true
94419443
serviceAccountName: opentelemetry-demo-prometheus-server
94429444
containers:
94439445

94449446
- name: prometheus-server
9445-
image: "quay.io/prometheus/prometheus:v2.55.1"
9447+
image: "quay.io/prometheus/prometheus:v3.0.0"
94469448
imagePullPolicy: "IfNotPresent"
94479449
args:
94489450
- --storage.tsdb.retention.time=15d
@@ -9545,7 +9547,7 @@ spec:
95459547
- name: KAFKA_SERVICE_ADDR
95469548
value: 'opentelemetry-demo-kafka:9092'
95479549
- name: OTEL_EXPORTER_OTLP_ENDPOINT
9548-
value: http://$(OTEL_COLLECTOR_NAME):4317
9550+
value: http://$(OTEL_COLLECTOR_NAME):4318
95499551
- name: OTEL_RESOURCE_ATTRIBUTES
95509552
value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0
95519553
resources:
@@ -9999,7 +10001,7 @@ spec:
999910001
- name: FLAGD_METRICS_EXPORTER
1000010002
value: otel
1000110003
- name: OTEL_EXPORTER_OTLP_ENDPOINT
10002-
value: http://$(OTEL_COLLECTOR_NAME):4317
10004+
value: http://$(OTEL_COLLECTOR_NAME):4318
1000310005
- name: OTEL_RESOURCE_ATTRIBUTES
1000410006
value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0
1000510007
resources:
@@ -10910,7 +10912,7 @@ spec:
1091010912
app.kubernetes.io/version: "2.18.0"
1091110913
app.kubernetes.io/component: otel-demo-opensearch
1091210914
annotations:
10913-
configchecksum: e8c450687c20323f6f710672deb70783c1872772b09c7e40d93ae72e602bec3
10915+
configchecksum: 6b540fc53745495be7b7bc6fdf907e4fa78e90b008ac9ff231c3b50a12e2d80
1091410916
spec:
1091510917
securityContext:
1091610918
fsGroup: 1000

0 commit comments

Comments
 (0)