diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock index a49763562..350cad7ca 100644 --- a/charts/opentelemetry-demo/Chart.lock +++ b/charts/opentelemetry-demo/Chart.lock @@ -1,18 +1,18 @@ dependencies: - name: opentelemetry-collector repository: https://open-telemetry.github.io/opentelemetry-helm-charts - version: 0.80.1 + version: 0.86.0 - name: jaeger repository: https://jaegertracing.github.io/helm-charts - version: 1.0.0 + version: 2.0.1 - name: prometheus repository: https://prometheus-community.github.io/helm-charts - version: 25.12.0 + version: 25.19.0 - name: grafana repository: https://grafana.github.io/helm-charts - version: 7.3.0 + version: 7.3.7 - name: opensearch repository: https://opensearch-project.github.io/helm-charts - version: 2.17.2 -digest: sha256:3f338e28c048d248b87ea2357d23342e71e0cfc76d0a4e9c81d2ff65d4623856 -generated: "2024-02-18T00:49:24.628921-05:00" + version: 2.19.0 +digest: sha256:c5fb72359a5dfd09ae9968ee80fb9703e7c8ea922491d43ef19441788bfa04e1 +generated: "2024-04-03T14:29:54.416645+02:00" diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index d381c23ce..3b805c33d 100644 --- a/charts/opentelemetry-demo/Chart.yaml +++ b/charts/opentelemetry-demo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: opentelemetry-demo -version: 0.29.2 +version: 0.30.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -11,25 +11,25 @@ maintainers: - name: puckpuck - name: tylerhelmuth icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png -appVersion: "1.8.0" +appVersion: "1.9.0" dependencies: - name: opentelemetry-collector - version: 0.80.1 + version: 0.86.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled - name: jaeger - version: 1.0.0 + version: 2.0.1 repository: https://jaegertracing.github.io/helm-charts condition: jaeger.enabled - name: prometheus - version: 25.12.0 + version: 25.19.0 repository: https://prometheus-community.github.io/helm-charts condition: prometheus.enabled - name: grafana - version: 7.3.0 + version: 7.3.7 repository: https://grafana.github.io/helm-charts condition: grafana.enabled - name: opensearch - version: 2.17.2 + version: 2.19.0 repository: https://opensearch-project.github.io/helm-charts condition: opensearch.enabled diff --git a/charts/opentelemetry-demo/README.md b/charts/opentelemetry-demo/README.md index 38e0087d2..157cf01b1 100644 --- a/charts/opentelemetry-demo/README.md +++ b/charts/opentelemetry-demo/README.md @@ -118,7 +118,7 @@ component. | `ports` | Array of ports to open for deployment and service of this component | `[]` | | `env` | Array of environment variables added to this component | Each component will have its own set of environment variables | | `envOverrides` | Used to override individual environment variables without re-specifying the entire array | `[]` | -| `replicas` | Number of replicas for this component | `1` for ffsPostgres, kafka, and redis ; `nil` otherwise | +| `replicas` | Number of replicas for this component | `1` for kafka, and redis ; `nil` otherwise | | `resources` | CPU/Memory resource requests/limits | Each component will have a default memory limit set | | `schedulingRules.nodeSelector` | Node labels for pod assignment | `{}` | | `schedulingRules.affinity` | Man of node/pod affinities | `{}` | diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml index 237acd703..59ddd8abc 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -501,13 +473,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +500,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -546,8 +518,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -566,13 +540,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +567,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -613,8 +587,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -641,13 +617,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +644,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -686,6 +662,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -724,13 +704,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +731,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -772,7 +752,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: @@ -787,13 +767,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -814,7 +794,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,15 +828,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -864,108 +844,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: my-otel-collector.opentelemetry-ns - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-ffspostgres - template: - metadata: - labels: - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - spec: - serviceAccountName: example - containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -976,19 +878,18 @@ spec: value: my-otel-collector.opentelemetry-ns - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +897,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +924,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1061,13 +962,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +989,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1148,13 +1049,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1175,7 +1076,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1197,10 +1098,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1237,13 +1134,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1264,7 +1161,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1306,13 +1203,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1333,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1381,13 +1278,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1408,7 +1305,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1426,6 +1323,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1446,13 +1347,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1473,7 +1374,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1491,8 +1392,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1509,13 +1412,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1536,7 +1439,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1576,13 +1479,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1603,7 +1506,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1623,8 +1526,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1645,13 +1550,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1706,13 +1611,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,7 +1638,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1753,8 +1658,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - 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 resources: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index 5ce5a371e..e6bbba09b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -501,13 +473,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +500,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -546,8 +518,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -566,13 +540,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +567,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -613,8 +587,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -641,13 +617,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +644,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -686,6 +662,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -724,13 +704,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +731,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -772,7 +752,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: @@ -787,13 +767,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -814,7 +794,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,15 +828,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -864,108 +844,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: $(OTEL_K8S_NODE_NAME) - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-ffspostgres - template: - metadata: - labels: - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - spec: - serviceAccountName: example - containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -976,19 +878,18 @@ spec: value: $(OTEL_K8S_NODE_NAME) - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +897,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +924,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1061,13 +962,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +989,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1148,13 +1049,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1175,7 +1076,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1197,10 +1098,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1237,13 +1134,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1264,7 +1161,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1306,13 +1203,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1333,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1381,13 +1278,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1408,7 +1305,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1426,6 +1323,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1446,13 +1347,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1473,7 +1374,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1491,8 +1392,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1509,13 +1412,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1536,7 +1439,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1576,13 +1479,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1603,7 +1506,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1623,8 +1526,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1645,13 +1550,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1706,13 +1611,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,7 +1638,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1753,8 +1658,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - 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 resources: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index cb80e4d4b..87b55519d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -6,12 +6,12 @@ metadata: name: example-grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml index bb918300e..d9aaf3efa 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml index 195e53b8e..a80a4347c 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml index c741a05de..dd59b092e 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 name: OpenSearch type: grafana-opensearch-datasource url: http://otel-demo-opensearch:9200/ diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index deb9d76ae..acaf8d957 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 085545e0f9f0ec8ab9cf9b08fa8e4ce19f9925e12c0ea44a7c22479bbbbdf715 + checksum/config: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.3.1" + image: "docker.io/grafana/grafana:10.4.0" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml index 955dd7551..dd13e9af6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml index 4139bc91d..bd0c61509 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml index 83b0a4719..d964d785a 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml index 73ed08fc6..f3afd2804 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml index c58eb3c45..b23832494 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml @@ -2,12 +2,13 @@ # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml index d73b16454..8f57f6dfa 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml @@ -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.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml index 5a5a97a9e..faa58024d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml index c4d3ab540..1147b0ed0 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml index e49751a45..e04cf5178 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml index 59aa73a18..6f1de0712 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -17,21 +17,26 @@ spec: - name: http-zipkin port: 9411 targetPort: 0 + appProtocol: http - name: grpc-http port: 14250 targetPort: 0 + appProtocol: grpc - name: c-tchan-trft port: 14267 targetPort: 0 - name: http-c-binary-trft port: 14268 targetPort: 0 + appProtocol: http - name: otlp-grpc port: 4317 targetPort: 0 + appProtocol: grpc - name: otlp-http port: 4318 targetPort: 0 + appProtocol: http selector: app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index d9135b40d..07364e513 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -31,7 +31,8 @@ spec: annotations: prometheus.io/port: "14269" prometheus.io/scrape: "true" - spec: + spec: + containers: - env: - name: METRICS_STORAGE_TYPE diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml index 3c1af9f7f..00f61d1fc 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml index c8d329c6c..a17beeaf3 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml index c9b9c5244..241baa6a3 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml index 19f5b186f..602db3f79 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index 03eb88707..a43f4f70e 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,6 @@ data: spanmetrics: {} exporters: debug: {} - logging: {} opensearch: http: endpoint: http://otel-demo-opensearch:9200 diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index b74226642..cd7e26c5a 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 52fc8a99d54702d170aa956bbfe61f7f39b7c1b476d25b4d54a70e3e000110a4 + checksum/config: e6e1702ac61715649cfa377db550585bcc477e0051c1c60be60dc1694746c46f opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.93.0" + image: "otel/opentelemetry-collector-contrib:0.97.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml index 92e364205..933847afc 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml index d5956ab36..b8b724963 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml index 55dbdd2b9..55d889403 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml index 90c744403..8c7f6f5e1 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml index 0f85b56f3..9ebf1d3d1 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.49.1" + image: "quay.io/prometheus/prometheus:v2.51.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml index 18606f627..a3484a1c5 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml index a4a1fc069..53b2992c0 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index dad2d4915..3b5df43fd 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -503,13 +475,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -530,7 +502,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -548,8 +520,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -570,13 +544,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -597,7 +571,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -617,8 +591,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -647,13 +623,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -674,7 +650,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -692,6 +668,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -732,13 +712,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -759,7 +739,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -780,7 +760,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: TEAM_NAME value: orion - name: OTEL_RESOURCE_ATTRIBUTES @@ -797,13 +777,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -824,7 +804,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -860,100 +840,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-featureflagservice - app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-featureflagservice - template: - metadata: - labels: - - opentelemetry.io/name: example-featureflagservice - app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - spec: - serviceAccountName: example - containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: 'example-otelcol' - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: TEAM_NAME - value: crab - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),app.eng.team=$(TEAM_NAME) - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,25 +856,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -990,19 +890,18 @@ spec: value: 'example-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),app.eng.team=$(TEAM_NAME) resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1010,13 +909,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1037,7 +936,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1077,13 +976,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1104,7 +1003,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1166,13 +1065,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1193,7 +1092,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1215,10 +1114,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1255,13 +1150,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1282,7 +1177,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1324,13 +1219,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,7 +1246,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1401,13 +1296,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1428,7 +1323,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1446,6 +1341,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: TEAM_NAME @@ -1468,13 +1367,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1495,7 +1394,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1513,8 +1412,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: TEAM_NAME @@ -1533,13 +1434,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1560,7 +1461,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1602,13 +1503,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1629,7 +1530,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1649,8 +1550,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1673,13 +1576,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1734,13 +1637,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1761,7 +1664,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1781,8 +1684,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: TEAM_NAME value: orion - name: OTEL_RESOURCE_ATTRIBUTES diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index cb80e4d4b..87b55519d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -6,12 +6,12 @@ metadata: name: example-grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml index bb918300e..d9aaf3efa 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml index 195e53b8e..a80a4347c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml index c741a05de..dd59b092e 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 name: OpenSearch type: grafana-opensearch-datasource url: http://otel-demo-opensearch:9200/ diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index deb9d76ae..acaf8d957 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 085545e0f9f0ec8ab9cf9b08fa8e4ce19f9925e12c0ea44a7c22479bbbbdf715 + checksum/config: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.3.1" + image: "docker.io/grafana/grafana:10.4.0" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml index 955dd7551..dd13e9af6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml index 4139bc91d..bd0c61509 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml index 83b0a4719..d964d785a 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml index 73ed08fc6..f3afd2804 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml index c58eb3c45..b23832494 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml @@ -2,12 +2,13 @@ # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml index d73b16454..8f57f6dfa 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml @@ -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.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml index 5a5a97a9e..faa58024d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml index c4d3ab540..1147b0ed0 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml index e49751a45..e04cf5178 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml index 59aa73a18..6f1de0712 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -17,21 +17,26 @@ spec: - name: http-zipkin port: 9411 targetPort: 0 + appProtocol: http - name: grpc-http port: 14250 targetPort: 0 + appProtocol: grpc - name: c-tchan-trft port: 14267 targetPort: 0 - name: http-c-binary-trft port: 14268 targetPort: 0 + appProtocol: http - name: otlp-grpc port: 4317 targetPort: 0 + appProtocol: grpc - name: otlp-http port: 4318 targetPort: 0 + appProtocol: http selector: app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index d9135b40d..07364e513 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -31,7 +31,8 @@ spec: annotations: prometheus.io/port: "14269" prometheus.io/scrape: "true" - spec: + spec: + containers: - env: - name: METRICS_STORAGE_TYPE diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml index 3c1af9f7f..00f61d1fc 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml index c8d329c6c..a17beeaf3 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml index c9b9c5244..241baa6a3 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml index 19f5b186f..602db3f79 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index 7f4d3cf77..0bf062500 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,6 @@ data: spanmetrics: {} exporters: debug: {} - logging: {} opensearch: http: endpoint: http://otel-demo-opensearch:9200 diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index ff0594520..0df49c410 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 6903a6b737e81b9e878bd12bf4ff2bb41026dec86f787c1991e8e0949ed1a232 + checksum/config: 4e64638b22da350114d2d388021e9bf78fcf1979d95811268ac7262f2413651c opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.93.0" + image: "otel/opentelemetry-collector-contrib:0.97.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml index 0873ae9d9..2d0b4910b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml index 92e364205..933847afc 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml index d5956ab36..b8b724963 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml index 55dbdd2b9..55d889403 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml index 90c744403..8c7f6f5e1 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml index 0f85b56f3..9ebf1d3d1 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.49.1" + image: "quay.io/prometheus/prometheus:v2.51.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml index 18606f627..a3484a1c5 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml index a4a1fc069..53b2992c0 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/values.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/values.yaml index adb329332..40ffc2af2 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/values.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/values.yaml @@ -34,11 +34,6 @@ components: - name: TEAM_NAME value: orion - featureflagService: - envOverrides: - - name: TEAM_NAME - value: crab - frauddetectionService: envOverrides: - name: TEAM_NAME diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 2415ee78e..b69c0c25a 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -501,13 +473,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +500,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -546,8 +518,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -566,13 +540,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +567,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -613,8 +587,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -641,13 +617,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +644,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -686,6 +662,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -724,13 +704,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +731,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -772,7 +752,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: @@ -787,13 +767,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -814,7 +794,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,15 +828,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -864,108 +844,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: 'example-otelcol' - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-ffspostgres - template: - metadata: - labels: - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - spec: - serviceAccountName: example - containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -976,19 +878,18 @@ spec: value: 'example-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +897,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +924,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1061,13 +962,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +989,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1148,13 +1049,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1175,7 +1076,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1197,10 +1098,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1237,13 +1134,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1264,7 +1161,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1306,13 +1203,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1333,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1381,13 +1278,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1408,7 +1305,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1426,6 +1323,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1446,13 +1347,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1473,7 +1374,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1491,8 +1392,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1509,13 +1412,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1536,7 +1439,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1576,13 +1479,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1603,7 +1506,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1623,8 +1526,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1645,13 +1550,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1706,13 +1611,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,7 +1638,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1753,8 +1658,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - 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 resources: diff --git a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index cb80e4d4b..87b55519d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -6,12 +6,12 @@ metadata: name: example-grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index bb918300e..d9aaf3efa 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml index 195e53b8e..a80a4347c 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml index c741a05de..dd59b092e 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 name: OpenSearch type: grafana-opensearch-datasource url: http://otel-demo-opensearch:9200/ diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index deb9d76ae..acaf8d957 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 085545e0f9f0ec8ab9cf9b08fa8e4ce19f9925e12c0ea44a7c22479bbbbdf715 + checksum/config: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.3.1" + image: "docker.io/grafana/grafana:10.4.0" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml index 955dd7551..dd13e9af6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml index 4139bc91d..bd0c61509 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml index 83b0a4719..d964d785a 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml index 73ed08fc6..f3afd2804 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml index c58eb3c45..b23832494 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml @@ -2,12 +2,13 @@ # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml index d73b16454..8f57f6dfa 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml @@ -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.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml index 5a5a97a9e..faa58024d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml index c4d3ab540..1147b0ed0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml index e49751a45..e04cf5178 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml index 59aa73a18..6f1de0712 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -17,21 +17,26 @@ spec: - name: http-zipkin port: 9411 targetPort: 0 + appProtocol: http - name: grpc-http port: 14250 targetPort: 0 + appProtocol: grpc - name: c-tchan-trft port: 14267 targetPort: 0 - name: http-c-binary-trft port: 14268 targetPort: 0 + appProtocol: http - name: otlp-grpc port: 4317 targetPort: 0 + appProtocol: grpc - name: otlp-http port: 4318 targetPort: 0 + appProtocol: http selector: app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index d9135b40d..07364e513 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -31,7 +31,8 @@ spec: annotations: prometheus.io/port: "14269" prometheus.io/scrape: "true" - spec: + spec: + containers: - env: - name: METRICS_STORAGE_TYPE diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml index 3c1af9f7f..00f61d1fc 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml index c8d329c6c..a17beeaf3 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/default/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/default/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml index c9b9c5244..241baa6a3 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml index 19f5b186f..602db3f79 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index 81739e278..d18e164a1 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,6 @@ data: spanmetrics: {} exporters: debug: {} - logging: {} opensearch: http: endpoint: http://otel-demo-opensearch:9200 diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index fab57b4d2..12a88fa52 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 02892493e6e4a9ef245700d031d6c184ddeab5f9dbfbd473e3fb2738563ff806 + checksum/config: ad7fc353d70c1bf7ae2b8dadcd853a57b8e8c6459f7bb44707cfd0adedf956d2 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.93.0" + image: "otel/opentelemetry-collector-contrib:0.97.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml index 0873ae9d9..2d0b4910b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml index 92e364205..933847afc 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml index d5956ab36..b8b724963 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml index 55dbdd2b9..55d889403 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index 90c744403..8c7f6f5e1 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml index 0f85b56f3..9ebf1d3d1 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.49.1" + image: "quay.io/prometheus/prometheus:v2.51.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml index 18606f627..a3484a1c5 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml index a4a1fc069..53b2992c0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml index 2415ee78e..b69c0c25a 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -501,13 +473,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +500,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -546,8 +518,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -566,13 +540,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +567,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -613,8 +587,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -641,13 +617,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +644,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -686,6 +662,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -724,13 +704,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +731,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -772,7 +752,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: @@ -787,13 +767,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -814,7 +794,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,15 +828,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -864,108 +844,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: 'example-otelcol' - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-ffspostgres - template: - metadata: - labels: - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - spec: - serviceAccountName: example - containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -976,19 +878,18 @@ spec: value: 'example-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +897,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +924,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1061,13 +962,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +989,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1148,13 +1049,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1175,7 +1076,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1197,10 +1098,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1237,13 +1134,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1264,7 +1161,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1306,13 +1203,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1333,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1381,13 +1278,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1408,7 +1305,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1426,6 +1323,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1446,13 +1347,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1473,7 +1374,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1491,8 +1392,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1509,13 +1412,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1536,7 +1439,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1576,13 +1479,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1603,7 +1506,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1623,8 +1526,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1645,13 +1550,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1706,13 +1611,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,7 +1638,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1753,8 +1658,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - 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 resources: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml index cb80e4d4b..87b55519d 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml @@ -6,12 +6,12 @@ metadata: name: example-grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml index bb918300e..d9aaf3efa 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml index 195e53b8e..a80a4347c 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml index c741a05de..dd59b092e 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 name: OpenSearch type: grafana-opensearch-datasource url: http://otel-demo-opensearch:9200/ diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml index deb9d76ae..acaf8d957 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 085545e0f9f0ec8ab9cf9b08fa8e4ce19f9925e12c0ea44a7c22479bbbbdf715 + checksum/config: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.3.1" + image: "docker.io/grafana/grafana:10.4.0" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml index 955dd7551..dd13e9af6 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml index 4139bc91d..bd0c61509 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml index 83b0a4719..d964d785a 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml index 73ed08fc6..f3afd2804 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml index c58eb3c45..b23832494 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml @@ -2,12 +2,13 @@ # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml index d73b16454..8f57f6dfa 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml @@ -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.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml index 5a5a97a9e..faa58024d 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml index c4d3ab540..1147b0ed0 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml index e49751a45..e04cf5178 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml index 59aa73a18..6f1de0712 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -17,21 +17,26 @@ spec: - name: http-zipkin port: 9411 targetPort: 0 + appProtocol: http - name: grpc-http port: 14250 targetPort: 0 + appProtocol: grpc - name: c-tchan-trft port: 14267 targetPort: 0 - name: http-c-binary-trft port: 14268 targetPort: 0 + appProtocol: http - name: otlp-grpc port: 4317 targetPort: 0 + appProtocol: grpc - name: otlp-http port: 4318 targetPort: 0 + appProtocol: http selector: app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml index d9135b40d..07364e513 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -31,7 +31,8 @@ spec: annotations: prometheus.io/port: "14269" prometheus.io/scrape: "true" - spec: + spec: + containers: - env: - name: METRICS_STORAGE_TYPE diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml index 3c1af9f7f..00f61d1fc 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml index c8d329c6c..a17beeaf3 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml index 064515080..2ef6ef3d7 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml index 19f5b186f..602db3f79 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml index 3a98d8a3c..dcfdb54b5 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,6 @@ data: spanmetrics: {} exporters: debug: {} - logging: {} opensearch: http: endpoint: http://otel-demo-opensearch:9200 diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml index 2b766f2d7..54e22f63c 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 31105ca6f597e1846e5fecafaba9047513949d43f283f1daf6df2dcf20173ddf + checksum/config: c10ad665728484ffa2ff150c00a09734ef295b4a1e4bd94f70ffb50bf8ee9d22 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +45,7 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 - image: "otel/opentelemetry-collector-contrib:0.93.0" + image: "otel/opentelemetry-collector-contrib:0.97.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml index 92e364205..933847afc 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml index d5956ab36..b8b724963 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml index 55dbdd2b9..55d889403 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml index 90c744403..8c7f6f5e1 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml index 0f85b56f3..9ebf1d3d1 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.49.1" + image: "quay.io/prometheus/prometheus:v2.51.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml index 18606f627..a3484a1c5 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml index a4a1fc069..53b2992c0 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 4a56e775d..af0860943 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -128,54 +128,26 @@ spec: apiVersion: v1 kind: Service metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: - - port: 50053 - name: grpc - targetPort: 50053 - - port: 8081 - name: http - targetPort: 8081 - selector: - - opentelemetry.io/name: example-featureflagservice ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - ports: - - port: 5432 - name: postgres - targetPort: 5432 + - port: 8013 + name: tcp-service + targetPort: 8013 selector: - opentelemetry.io/name: example-ffspostgres + opentelemetry.io/name: example-flagd --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 @@ -183,13 +155,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +180,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +205,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +233,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +258,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +283,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +308,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +333,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +358,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +383,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +408,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +435,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -501,13 +473,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +500,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -546,8 +518,10 @@ spec: value: cumulative - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -566,13 +540,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +567,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -613,8 +587,10 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -641,13 +617,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +644,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -686,6 +662,10 @@ spec: value: cumulative - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: 'example-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -724,13 +704,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +731,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -772,7 +752,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '1.8.0' + value: '1.9.0' - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: @@ -787,13 +767,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -814,7 +794,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,15 +828,15 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: example-featureflagservice + name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -864,108 +844,30 @@ spec: selector: matchLabels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd template: metadata: labels: - opentelemetry.io/name: example-featureflagservice + opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example - app.kubernetes.io/component: featureflagservice - app.kubernetes.io/name: example-featureflagservice + app.kubernetes.io/component: flagd + app.kubernetes.io/name: example-flagd spec: serviceAccountName: example containers: - - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-featureflagservice' + - name: flagd + image: 'ghcr.io/open-feature/flagd:v0.9.0' imagePullPolicy: IfNotPresent + command: + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 50053 - name: grpc - - containerPort: 8081 - name: http - env: - - name: OTEL_SERVICE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.labels['app.kubernetes.io/component'] - - name: OTEL_COLLECTOR_NAME - value: 'example-otelcol' - - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - value: cumulative - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: ecto://ffs:ffs@example-ffspostgres:5432/ffs - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - volumeMounts: - volumes: - initContainers: - - command: - - sh - - -c - - until nc -z -v -w30 example-ffspostgres 5432; do echo - waiting for ffspostgres; sleep 2; done - image: busybox:latest - name: wait-for-ffspostgres ---- -# Source: opentelemetry-demo/templates/component.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-ffspostgres - labels: - helm.sh/chart: opentelemetry-demo-0.29.2 - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.8.0" - app.kubernetes.io/part-of: opentelemetry-demo - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - - opentelemetry.io/name: example-ffspostgres - template: - metadata: - labels: - - opentelemetry.io/name: example-ffspostgres - app.kubernetes.io/instance: example - app.kubernetes.io/component: ffspostgres - app.kubernetes.io/name: example-ffspostgres - spec: - serviceAccountName: example - containers: - - name: ffspostgres - image: 'ghcr.io/open-telemetry/demo:1.8.0-ffspostgres' - imagePullPolicy: IfNotPresent - ports: - - - containerPort: 5432 - name: postgres + - containerPort: 8013 + name: service env: - name: OTEL_SERVICE_NAME valueFrom: @@ -976,19 +878,18 @@ spec: value: 'example-otelcol' - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE value: cumulative - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo resources: limits: - memory: 120Mi + memory: 20Mi volumeMounts: + - name: config + mountPath: /etc/flagd volumes: + - name: config + configMap: + name: example-flagd-config --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +897,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +924,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1061,13 +962,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +989,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1148,13 +1049,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1175,7 +1076,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.8.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.9.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1197,10 +1098,6 @@ spec: value: "8080" - name: FRONTEND_HOST value: 'example-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: 'example-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -1237,13 +1134,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1264,7 +1161,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.8.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.9.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1306,13 +1203,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1333,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.8.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.9.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1381,13 +1278,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1408,7 +1305,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1426,6 +1323,10 @@ spec: value: cumulative - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1446,13 +1347,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1473,7 +1374,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1491,8 +1392,10 @@ spec: value: cumulative - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES @@ -1509,13 +1412,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1536,7 +1439,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1576,13 +1479,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1603,7 +1506,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1623,8 +1526,10 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: 'example-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: 'example-featureflagservice:50053' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -1645,13 +1550,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1706,13 +1611,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,7 +1638,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.8.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.9.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1753,8 +1658,8 @@ spec: value: "8080" - name: QUOTE_SERVICE_ADDR value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - 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 resources: @@ -1769,13 +1674,13 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml new file mode 100644 index 000000000..c69d6daa8 --- /dev/null +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml @@ -0,0 +1,102 @@ +--- +# Source: opentelemetry-demo/templates/flagd-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-flagd-config + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.30.0 + + opentelemetry.io/name: example + app.kubernetes.io/instance: example + app.kubernetes.io/name: example + app.kubernetes.io/version: "1.9.0" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + demo.flagd.json: | + { + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } + } diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index cb80e4d4b..87b55519d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -6,12 +6,12 @@ metadata: name: example-grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml index bb918300e..d9aaf3efa 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml index 195e53b8e..a80a4347c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml index c741a05de..dd59b092e 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 name: OpenSearch type: grafana-opensearch-datasource url: http://otel-demo-opensearch:9200/ diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index deb9d76ae..acaf8d957 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 085545e0f9f0ec8ab9cf9b08fa8e4ce19f9925e12c0ea44a7c22479bbbbdf715 + checksum/config: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.3.1" + image: "docker.io/grafana/grafana:10.4.0" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml index 955dd7551..dd13e9af6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml index 4139bc91d..bd0c61509 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml index 83b0a4719..d964d785a 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml index 73ed08fc6..f3afd2804 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml index c58eb3c45..b23832494 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml @@ -2,12 +2,13 @@ # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml index d73b16454..8f57f6dfa 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml @@ -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.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml index 5a5a97a9e..faa58024d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml index c4d3ab540..1147b0ed0 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.3.0 + helm.sh/chart: grafana-7.3.7 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.3.1" + app.kubernetes.io/version: "10.4.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml index e49751a45..e04cf5178 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml index 59aa73a18..6f1de0712 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -17,21 +17,26 @@ spec: - name: http-zipkin port: 9411 targetPort: 0 + appProtocol: http - name: grpc-http port: 14250 targetPort: 0 + appProtocol: grpc - name: c-tchan-trft port: 14267 targetPort: 0 - name: http-c-binary-trft port: 14268 targetPort: 0 + appProtocol: http - name: otlp-grpc port: 4317 targetPort: 0 + appProtocol: grpc - name: otlp-http port: 4318 targetPort: 0 + appProtocol: http selector: app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index d9135b40d..07364e513 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -31,7 +31,8 @@ spec: annotations: prometheus.io/port: "14269" prometheus.io/scrape: "true" - spec: + spec: + containers: - env: - name: METRICS_STORAGE_TYPE diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml index 3c1af9f7f..00f61d1fc 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml index c8d329c6c..a17beeaf3 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-1.0.0 + helm.sh/chart: jaeger-2.0.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/configmap.yaml index 2a5219f27..abe8cc0e8 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: otel-demo-opensearch-config labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/poddisruptionbudget.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/poddisruptionbudget.yaml index 1282f3d3f..41c6578d2 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/poddisruptionbudget.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/poddisruptionbudget.yaml @@ -5,10 +5,10 @@ kind: PodDisruptionBudget metadata: name: "otel-demo-opensearch-pdb" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/service.yaml index dff923fa8..f524cfccc 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/service.yaml @@ -5,10 +5,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -32,10 +32,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/statefulset.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/statefulset.yaml index d871f0799..18bdab040 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/statefulset.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opensearch/statefulset.yaml @@ -5,10 +5,10 @@ kind: StatefulSet metadata: name: otel-demo-opensearch labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -27,14 +27,14 @@ spec: metadata: name: "otel-demo-opensearch" labels: - helm.sh/chart: opensearch-2.17.2 + helm.sh/chart: opensearch-2.19.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 168039ffc030115a8030f635c84ded4af2a940945fe7335048dcd1ca425966f + configchecksum: 1d814a7c5338d5b1509ba8ccc5ef678fb3389662121ff7910d3e5892b3c4493 spec: securityContext: fsGroup: 1000 @@ -61,7 +61,27 @@ spec: - name: config configMap: name: otel-demo-opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true + initContainers: + - name: configfile + image: "opensearchproject/opensearch:2.13.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + resources: + {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - name: "opensearch" securityContext: @@ -71,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.11.1" + image: "opensearchproject/opensearch:2.13.0" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 @@ -123,6 +143,6 @@ spec: - name: DISABLE_SECURITY_PLUGIN value: "true" volumeMounts: - - name: config + - name: config-emptydir mountPath: /usr/share/opensearch/config/opensearch.yml subPath: opensearch.yml diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml index c9b9c5244..241baa6a3 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml index 19f5b186f..602db3f79 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index 81739e278..d18e164a1 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,6 @@ data: spanmetrics: {} exporters: debug: {} - logging: {} opensearch: http: endpoint: http://otel-demo-opensearch:9200 diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index fab57b4d2..12a88fa52 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 02892493e6e4a9ef245700d031d6c184ddeab5f9dbfbd473e3fb2738563ff806 + checksum/config: ad7fc353d70c1bf7ae2b8dadcd853a57b8e8c6459f7bb44707cfd0adedf956d2 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.93.0" + image: "otel/opentelemetry-collector-contrib:0.97.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml index e39733a5d..7f041b413 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml index 0873ae9d9..2d0b4910b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml index 92e364205..933847afc 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.80.1 + helm.sh/chart: opentelemetry-collector-0.86.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.93.0" + app.kubernetes.io/version: "0.97.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml index d5956ab36..b8b724963 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml index 55dbdd2b9..55d889403 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml index 90c744403..8c7f6f5e1 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml index 0f85b56f3..9ebf1d3d1 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.49.1" + image: "quay.io/prometheus/prometheus:v2.51.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml index 18606f627..a3484a1c5 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml index a4a1fc069..53b2992c0 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml @@ -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.49.1 - helm.sh/chart: prometheus-25.12.0 + app.kubernetes.io/version: v2.51.1 + helm.sh/chart: prometheus-25.19.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index 239ad017a..1f2463fb4 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.29.2 + helm.sh/chart: opentelemetry-demo-0.30.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/flagd/demo.flagd.json b/charts/opentelemetry-demo/flagd/demo.flagd.json new file mode 100644 index 000000000..f1d04e4a5 --- /dev/null +++ b/charts/opentelemetry-demo/flagd/demo.flagd.json @@ -0,0 +1,83 @@ +{ + "$schema": "https://flagd.dev/schema/v0/flags.json", + "flags": { + "productCatalogFailure": { + "description": "Fail product catalog service on a specific product", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "recommendationServiceCacheFailure": { + "description": "Fail recommendation service cache", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceManualGc": { + "description": "Triggers full manual garbage collections in the ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "adServiceFailure": { + "description": "Fail ad service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off", + "targeting": { + "fractional": [ + { + "var": "session" + }, + [ + "on", + 10 + ], + [ + "off", + 90 + ] + ] + } + }, + "cartServiceFailure": { + "description": "Fail cart service", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceFailure": { + "description": "Fail payment service charge requests", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + }, + "paymentServiceUnreachable": { + "description": "Payment service is unavailable", + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" + } + } +} diff --git a/charts/opentelemetry-demo/templates/NOTES.txt b/charts/opentelemetry-demo/templates/NOTES.txt index c334fbe1b..e41a80750 100644 --- a/charts/opentelemetry-demo/templates/NOTES.txt +++ b/charts/opentelemetry-demo/templates/NOTES.txt @@ -16,6 +16,5 @@ The following services are available at these paths once the proxy is exposed: Webstore http://localhost:8080/ Grafana http://localhost:8080/grafana/ - Feature Flags UI http://localhost:8080/feature/ Load Generator UI http://localhost:8080/loadgen/ Jaeger UI http://localhost:8080/jaeger/ui/ diff --git a/charts/opentelemetry-demo/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index 73848dd28..a777f7f7b 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -83,7 +83,7 @@ spec: - name: {{ .name | lower}} configMap: {{- if .existingConfigMap }} - name: {{ .existingConfigMap }} + name: {{ tpl .existingConfigMap $ }} {{- else }} name: {{ include "otel-demo.name" $ }}-{{ $.name }}-{{ .name | lower }} {{- end }} diff --git a/charts/opentelemetry-demo/templates/flagd-config.yaml b/charts/opentelemetry-demo/templates/flagd-config.yaml new file mode 100644 index 000000000..f67a89692 --- /dev/null +++ b/charts/opentelemetry-demo/templates/flagd-config.yaml @@ -0,0 +1,11 @@ +{{- if .Values.components.flagd.enabled -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "otel-demo.name" . }}-flagd-config + namespace: {{ .Release.Namespace }} + labels: + {{- include "otel-demo.labels" . | nindent 4 }} +data: + {{ (.Files.Glob "flagd/*.json").AsConfig | nindent 2 }} +{{- end }} diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index a5365713a..c567d5a3d 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -76,7 +76,7 @@ "emailService": { "$ref": "#/definitions/Component" }, - "featureflagService": { + "flagd": { "$ref": "#/definitions/Component" }, "frauddetectionService": { @@ -106,9 +106,6 @@ "shippingService": { "$ref": "#/definitions/Component" }, - "ffsPostgres": { - "$ref": "#/definitions/Component" - }, "kafka": { "$ref": "#/definitions/Component" }, @@ -710,7 +707,7 @@ ], "oneOf": [ { - "required": ["configMap"] + "required": ["existingConfigMap"] }, { "required": ["data"] diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 93a29a1d8..121f8b74f 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -130,7 +130,7 @@ components: # - name: my-config # mountPath: /etc/config # subPath: - # exsitingConfigMap: my-configmap + # existingConfigMap: my-configmap # data: # my-config.yaml: | # key: value @@ -178,8 +178,10 @@ components: env: - name: AD_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 - name: OTEL_LOGS_EXPORTER @@ -199,8 +201,10 @@ components: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: REDIS_ADDR value: '{{ include "otel-demo.name" . }}-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -222,6 +226,10 @@ components: env: - name: CHECKOUT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: CART_SERVICE_ADDR value: '{{ include "otel-demo.name" . }}-cartservice:8080' - name: CURRENCY_SERVICE_ADDR @@ -280,40 +288,6 @@ components: limits: memory: 100Mi - featureflagService: - enabled: true - useDefault: - env: true - ports: - - name: grpc - value: 50053 - - name: http - value: 8081 - env: - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_GRPC_SERVICE_PORT - value: "50053" - - name: DATABASE_URL - value: 'ecto://ffs:ffs@{{ include "otel-demo.name" . }}-ffspostgres:5432/ffs' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: grpc - resources: - limits: - memory: 175Mi - livenessProbe: - httpGet: - path: /featureflags/ - port: 8081 - initialDelaySeconds: 30 - periodSeconds: 10 - initContainers: - - name: wait-for-ffspostgres - image: busybox:latest - command: ['sh', '-c', 'until nc -z -v -w30 {{ include "otel-demo.name" . }}-ffspostgres 5432; do echo waiting for ffspostgres; sleep 2; done'] - frauddetectionService: enabled: true useDefault: @@ -385,10 +359,6 @@ components: value: "8080" - name: FRONTEND_HOST value: '{{ include "otel-demo.name" . }}-frontend' - - name: FEATURE_FLAG_SERVICE_PORT - value: "8081" - - name: FEATURE_FLAG_SERVICE_HOST - value: '{{ include "otel-demo.name" . }}-featureflagservice' - name: LOCUST_WEB_PORT value: "8089" - name: LOCUST_WEB_HOST @@ -453,6 +423,10 @@ components: env: - name: PAYMENT_SERVICE_PORT value: "8080" + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 resources: @@ -472,8 +446,10 @@ components: env: - name: PRODUCT_CATALOG_SERVICE_PORT value: "8080" - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 resources: @@ -512,8 +488,10 @@ components: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: '{{ include "otel-demo.name" . }}-productcatalogservice:8080' - - name: FEATURE_FLAG_GRPC_SERVICE_ADDR - value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' + - name: FLAGD_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_PORT + value: "8013" - name: OTEL_PYTHON_LOG_CORRELATION value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION @@ -535,30 +513,34 @@ components: value: "8080" - name: QUOTE_SERVICE_ADDR value: 'http://{{ include "otel-demo.name" . }}-quoteservice:8080' - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 resources: limits: memory: 20Mi - ffsPostgres: + flagd: enabled: true + imageOverride: + repository: "ghcr.io/open-feature/flagd" + tag: "v0.9.0" useDefault: env: true replicas: 1 - ports: - - name: postgres - value: 5432 - env: - - name: POSTGRES_DB - value: ffs - - name: POSTGRES_USER - value: ffs - - name: POSTGRES_PASSWORD - value: ffs + service: + port: 8013 resources: limits: - memory: 120Mi + memory: 20Mi + command: + - "/flagd-build" + - "start" + - "--uri" + - "file:./etc/flagd/demo.flagd.json" + mountedConfigMaps: + - name: config + mountPath: /etc/flagd + existingConfigMap: '{{ include "otel-demo.name" . }}-flagd-config' kafka: enabled: true @@ -806,7 +788,7 @@ grafana: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.11.1 + version: 2.13.0 dashboardProviders: dashboardproviders.yaml: apiVersion: 1