From c432b2bec2628f212ee6d7f62b26b914b4885109 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 28 Jun 2024 12:25:03 -0400 Subject: [PATCH] update to 1.11.0 release --- kubernetes/opentelemetry-demo.yaml | 303 +++++++++++++++-------------- 1 file changed, 153 insertions(+), 150 deletions(-) diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml index 3f1516cb7b..82cd2925bb 100644 --- a/kubernetes/opentelemetry-demo.yaml +++ b/kubernetes/opentelemetry-demo.yaml @@ -46,6 +46,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/version: "1.53.0" app.kubernetes.io/component: all-in-one +automountServiceAccountToken: true --- # Source: opentelemetry-demo/charts/opentelemetry-collector/templates/serviceaccount.yaml apiVersion: v1 @@ -56,7 +57,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" --- # Source: opentelemetry-demo/charts/prometheus/templates/serviceaccount.yaml apiVersion: v1 @@ -66,7 +67,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server namespace: otel-demo @@ -83,7 +84,7 @@ metadata: opentelemetry.io/name: opentelemetry-demo app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/name: opentelemetry-demo - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo --- # Source: opentelemetry-demo/charts/grafana/templates/secret.yaml @@ -258,7 +259,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" data: relay: | @@ -349,7 +350,7 @@ data: - ${env:MY_POD_IP}:8888 redis: collection_interval: 10s - endpoint: redis-cart:6379 + endpoint: valkey-cart:6379 zipkin: endpoint: ${env:MY_POD_IP}:9411 service: @@ -407,7 +408,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server namespace: otel-demo @@ -455,7 +456,7 @@ metadata: opentelemetry.io/name: opentelemetry-demo app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/name: opentelemetry-demo - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo data: @@ -583,7 +584,7 @@ metadata: opentelemetry.io/name: opentelemetry-demo app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/name: opentelemetry-demo - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo data: @@ -8228,7 +8229,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" rules: - apiGroups: [""] @@ -8249,7 +8250,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server rules: @@ -8317,7 +8318,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" roleRef: apiGroup: rbac.authorization.k8s.io @@ -8336,7 +8337,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server subjects: @@ -8559,7 +8560,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" component: standalone-collector spec: @@ -8613,7 +8614,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server namespace: otel-demo @@ -8641,7 +8642,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: adservice app.kubernetes.io/name: opentelemetry-demo-adservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8664,7 +8665,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: cartservice app.kubernetes.io/name: opentelemetry-demo-cartservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8687,7 +8688,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: opentelemetry-demo-checkoutservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8710,7 +8711,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: currencyservice app.kubernetes.io/name: opentelemetry-demo-currencyservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8733,7 +8734,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: emailservice app.kubernetes.io/name: opentelemetry-demo-emailservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8756,7 +8757,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: flagd app.kubernetes.io/name: opentelemetry-demo-flagd - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8779,7 +8780,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: frontend app.kubernetes.io/name: opentelemetry-demo-frontend - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8802,7 +8803,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: opentelemetry-demo-frontendproxy - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8825,7 +8826,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: imageprovider app.kubernetes.io/name: opentelemetry-demo-imageprovider - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8848,7 +8849,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: kafka app.kubernetes.io/name: opentelemetry-demo-kafka - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8874,7 +8875,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: opentelemetry-demo-loadgenerator - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8897,7 +8898,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: paymentservice app.kubernetes.io/name: opentelemetry-demo-paymentservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8920,7 +8921,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: opentelemetry-demo-productcatalogservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8943,7 +8944,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: quoteservice app.kubernetes.io/name: opentelemetry-demo-quoteservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8966,7 +8967,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: opentelemetry-demo-recommendationservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP @@ -8982,47 +8983,47 @@ spec: apiVersion: v1 kind: Service metadata: - name: opentelemetry-demo-redis + name: opentelemetry-demo-shippingservice labels: - opentelemetry.io/name: opentelemetry-demo-redis + opentelemetry.io/name: opentelemetry-demo-shippingservice app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: redis - app.kubernetes.io/name: opentelemetry-demo-redis - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/component: shippingservice + app.kubernetes.io/name: opentelemetry-demo-shippingservice + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP ports: - - port: 6379 - name: redis - targetPort: 6379 + - port: 8080 + name: tcp-service + targetPort: 8080 selector: - opentelemetry.io/name: opentelemetry-demo-redis + opentelemetry.io/name: opentelemetry-demo-shippingservice --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service metadata: - name: opentelemetry-demo-shippingservice + name: opentelemetry-demo-valkey labels: - opentelemetry.io/name: opentelemetry-demo-shippingservice + opentelemetry.io/name: opentelemetry-demo-valkey app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: shippingservice - app.kubernetes.io/name: opentelemetry-demo-shippingservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/component: valkey + app.kubernetes.io/name: opentelemetry-demo-valkey + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: type: ClusterIP ports: - - port: 8080 - name: tcp-service - targetPort: 8080 + - port: 6379 + name: valkey + targetPort: 6379 selector: - opentelemetry.io/name: opentelemetry-demo-shippingservice + opentelemetry.io/name: opentelemetry-demo-valkey --- # Source: opentelemetry-demo/charts/grafana/templates/deployment.yaml apiVersion: apps/v1 @@ -9195,6 +9196,8 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" + securityContext: + {} image: jaegertracing/all-in-one:1.53.0 imagePullPolicy: IfNotPresent name: jaeger @@ -9248,9 +9251,9 @@ spec: memory: 400Mi volumeMounts: securityContext: - runAsUser: 10001 - runAsGroup: 10001 fsGroup: 10001 + runAsGroup: 10001 + runAsUser: 10001 serviceAccountName: opentelemetry-demo-jaeger volumes: --- @@ -9263,7 +9266,7 @@ metadata: labels: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: "0.102.1" + app.kubernetes.io/version: "0.103.1" spec: replicas: 1 @@ -9278,7 +9281,7 @@ spec: template: metadata: annotations: - checksum/config: 620cea93751f33591a6682374f7874aff7320c5cdb9685028c00489a14013191 + checksum/config: b9be17aa0a852a337b9b366ce825916eeec9342581384a2a5cff0105dc1cd9db opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -9298,7 +9301,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.102.1" + image: "otel/opentelemetry-collector-contrib:0.103.1" imagePullPolicy: IfNotPresent ports: @@ -9365,7 +9368,7 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus name: opentelemetry-demo-prometheus-server namespace: otel-demo @@ -9386,7 +9389,7 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/version: v2.52.0 + app.kubernetes.io/version: v2.53.0 app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true @@ -9394,7 +9397,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.52.0" + image: "quay.io/prometheus/prometheus:v2.53.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d @@ -9461,7 +9464,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: accountingservice app.kubernetes.io/name: opentelemetry-demo-accountingservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9481,7 +9484,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -9498,10 +9501,10 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: - memory: 20Mi + memory: 50Mi volumeMounts: volumes: initContainers: @@ -9524,7 +9527,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: adservice app.kubernetes.io/name: opentelemetry-demo-adservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9544,7 +9547,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -9571,7 +9574,7 @@ spec: - name: OTEL_LOGS_EXPORTER value: otlp - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 300Mi @@ -9589,7 +9592,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: cartservice app.kubernetes.io/name: opentelemetry-demo-cartservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9609,7 +9612,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -9629,8 +9632,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: REDIS_ADDR - value: 'opentelemetry-demo-redis:6379' + - name: VALKEY_ADDR + value: 'opentelemetry-demo-valkey:6379' - name: FLAGD_HOST value: 'opentelemetry-demo-flagd' - name: FLAGD_PORT @@ -9638,7 +9641,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 160Mi @@ -9648,10 +9651,10 @@ spec: - command: - sh - -c - - until nc -z -v -w30 opentelemetry-demo-redis 6379; do echo waiting - for redis; sleep 2; done; + - until nc -z -v -w30 opentelemetry-demo-valkey 6379; do echo waiting + for valkey; sleep 2; done; image: busybox:latest - name: wait-for-redis + name: wait-for-valkey --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -9664,7 +9667,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: opentelemetry-demo-checkoutservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9684,7 +9687,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -9723,7 +9726,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 20Mi @@ -9749,7 +9752,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: currencyservice app.kubernetes.io/name: opentelemetry-demo-currencyservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9769,7 +9772,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -9790,9 +9793,9 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.10.0' + value: '1.11.0' - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 20Mi @@ -9810,7 +9813,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: emailservice app.kubernetes.io/name: opentelemetry-demo-emailservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9830,7 +9833,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -9853,7 +9856,7 @@ spec: - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 100Mi @@ -9871,7 +9874,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: flagd app.kubernetes.io/name: opentelemetry-demo-flagd - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9917,7 +9920,7 @@ spec: - name: FLAGD_OTEL_COLLECTOR_URI value: $(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 50Mi @@ -9940,7 +9943,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: opentelemetry-demo-frauddetectionservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -9960,7 +9963,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -9981,7 +9984,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 300Mi @@ -10007,7 +10010,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: frontend app.kubernetes.io/name: opentelemetry-demo-frontend - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10027,7 +10030,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.10.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.11.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -10074,7 +10077,7 @@ spec: - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT value: http://localhost:8080/otlp-http/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 250Mi @@ -10096,7 +10099,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: opentelemetry-demo-frontendproxy - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10116,7 +10119,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.10.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.11.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -10165,7 +10168,7 @@ spec: - name: OTEL_COLLECTOR_PORT_HTTP value: "4318" - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 50Mi @@ -10187,7 +10190,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: imageprovider app.kubernetes.io/name: opentelemetry-demo-imageprovider - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10207,7 +10210,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.10.0-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.11.0-imageprovider' imagePullPolicy: IfNotPresent ports: @@ -10230,7 +10233,7 @@ spec: - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 50Mi @@ -10248,7 +10251,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: kafka app.kubernetes.io/name: opentelemetry-demo-kafka - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10268,7 +10271,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.10.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.11.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -10293,7 +10296,7 @@ spec: - name: KAFKA_HEAP_OPTS value: -Xmx400M -Xms400M - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 600Mi @@ -10315,7 +10318,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: opentelemetry-demo-loadgenerator - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10335,7 +10338,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.10.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.11.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -10374,7 +10377,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 1Gi @@ -10392,7 +10395,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: paymentservice app.kubernetes.io/name: opentelemetry-demo-paymentservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10412,7 +10415,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -10437,7 +10440,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 120Mi @@ -10459,7 +10462,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: opentelemetry-demo-productcatalogservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10479,7 +10482,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -10504,7 +10507,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 20Mi @@ -10522,7 +10525,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: quoteservice app.kubernetes.io/name: opentelemetry-demo-quoteservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10542,7 +10545,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -10565,7 +10568,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 40Mi @@ -10587,7 +10590,7 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: opentelemetry-demo-recommendationservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 @@ -10607,7 +10610,7 @@ spec: serviceAccountName: opentelemetry-demo containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.11.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -10638,7 +10641,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 500Mi @@ -10649,39 +10652,39 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: opentelemetry-demo-redis + name: opentelemetry-demo-shippingservice labels: - opentelemetry.io/name: opentelemetry-demo-redis + opentelemetry.io/name: opentelemetry-demo-shippingservice app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: redis - app.kubernetes.io/name: opentelemetry-demo-redis - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/component: shippingservice + app.kubernetes.io/name: opentelemetry-demo-shippingservice + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 selector: matchLabels: - opentelemetry.io/name: opentelemetry-demo-redis + opentelemetry.io/name: opentelemetry-demo-shippingservice template: metadata: labels: - opentelemetry.io/name: opentelemetry-demo-redis + opentelemetry.io/name: opentelemetry-demo-shippingservice app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: redis - app.kubernetes.io/name: opentelemetry-demo-redis + app.kubernetes.io/component: shippingservice + app.kubernetes.io/name: opentelemetry-demo-shippingservice spec: serviceAccountName: opentelemetry-demo containers: - - name: redis - image: 'redis:7.2-alpine' + - name: shippingservice + image: 'ghcr.io/open-telemetry/demo:1.11.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - containerPort: 6379 - name: redis + - containerPort: 8080 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -10692,15 +10695,17 @@ spec: value: 'opentelemetry-demo-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative + - name: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://opentelemetry-demo-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 20Mi - securityContext: - runAsGroup: 1000 - runAsNonRoot: true - runAsUser: 999 volumeMounts: volumes: --- @@ -10708,39 +10713,39 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: opentelemetry-demo-shippingservice + name: opentelemetry-demo-valkey labels: - opentelemetry.io/name: opentelemetry-demo-shippingservice + opentelemetry.io/name: opentelemetry-demo-valkey app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: shippingservice - app.kubernetes.io/name: opentelemetry-demo-shippingservice - app.kubernetes.io/version: "1.10.0" + app.kubernetes.io/component: valkey + app.kubernetes.io/name: opentelemetry-demo-valkey + app.kubernetes.io/version: "1.11.0" app.kubernetes.io/part-of: opentelemetry-demo spec: replicas: 1 selector: matchLabels: - opentelemetry.io/name: opentelemetry-demo-shippingservice + opentelemetry.io/name: opentelemetry-demo-valkey template: metadata: labels: - opentelemetry.io/name: opentelemetry-demo-shippingservice + opentelemetry.io/name: opentelemetry-demo-valkey app.kubernetes.io/instance: opentelemetry-demo - app.kubernetes.io/component: shippingservice - app.kubernetes.io/name: opentelemetry-demo-shippingservice + app.kubernetes.io/component: valkey + app.kubernetes.io/name: opentelemetry-demo-valkey spec: serviceAccountName: opentelemetry-demo containers: - - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.10.0-shippingservice' + - name: valkey + image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 - name: service + - containerPort: 6379 + name: valkey env: - name: OTEL_SERVICE_NAME valueFrom: @@ -10751,17 +10756,15 @@ spec: value: 'opentelemetry-demo-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://opentelemetry-demo-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.10.0 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0 resources: limits: memory: 20Mi + securityContext: + runAsGroup: 1000 + runAsNonRoot: true + runAsUser: 999 volumeMounts: volumes: ---