From 31585faf10cec05536039bed28612601f70017be Mon Sep 17 00:00:00 2001 From: "Pal K. Klucsik" Date: Tue, 5 Nov 2024 20:32:06 +0100 Subject: [PATCH] [demo] - update to 1.12 release including new flagd UI (#1367) * Add emptydir volume * Add sidecarContainer component, and add flagd-ui * flagd UI Signed-off-by: Pierre Tessier * update chart, demo version and dependencies Signed-off-by: Pierre Tessier * update chart, demo version and dependencies Signed-off-by: Pierre Tessier * add env variables to network bind otel collector in Jaeger Signed-off-by: Pierre Tessier * fix linter issue Signed-off-by: Pierre Tessier * generate examples Signed-off-by: Pierre Tessier * use Helm v3.14.4 Signed-off-by: Pierre Tessier * update Helm prerequisite to 3.14+ Signed-off-by: Pierre Tessier * use helm 3.14.4 for demo only Signed-off-by: Pierre Tessier * added note about Helm version Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier Co-authored-by: Pierre Tessier --- .github/workflows/demo-test.yaml | 1 + .github/workflows/lint.yaml | 2 +- charts/opentelemetry-demo/Chart.lock | 14 +- charts/opentelemetry-demo/Chart.yaml | 14 +- charts/opentelemetry-demo/README.md | 106 +- charts/opentelemetry-demo/UPGRADING.md | 5 + .../rendered/component.yaml | 1196 ++++++++-------- .../rendered/flagd-config.yaml | 4 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 1196 ++++++++-------- .../rendered/flagd-config.yaml | 4 +- .../rendered/grafana-dashboards.yaml | 6 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 6 +- .../rendered/grafana/deployment.yaml | 8 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 6 +- .../grafana/tests/test-serviceaccount.yaml | 6 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 6 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../opentelemetry-collector/clusterrole.yaml | 4 +- .../clusterrolebinding.yaml | 4 +- .../configmap-agent.yaml | 4 +- .../opentelemetry-collector/daemonset.yaml | 8 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 4 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 1252 +++++++++-------- .../rendered/flagd-config.yaml | 4 +- .../rendered/grafana-dashboards.yaml | 6 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 6 +- .../rendered/grafana/deployment.yaml | 8 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 6 +- .../grafana/tests/test-serviceaccount.yaml | 6 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 6 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../opentelemetry-collector/clusterrole.yaml | 4 +- .../clusterrolebinding.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 4 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../examples/default/rendered/component.yaml | 1196 ++++++++-------- .../default/rendered/flagd-config.yaml | 4 +- .../default/rendered/grafana-dashboards.yaml | 6 +- .../default/rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../default/rendered/grafana/configmap.yaml | 6 +- .../default/rendered/grafana/deployment.yaml | 8 +- .../default/rendered/grafana/role.yaml | 4 +- .../default/rendered/grafana/rolebinding.yaml | 4 +- .../default/rendered/grafana/secret.yaml | 4 +- .../default/rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 6 +- .../grafana/tests/test-serviceaccount.yaml | 6 +- .../default/rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 6 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../default/rendered/jaeger/allinone-sa.yaml | 2 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../default/rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../opentelemetry-collector/clusterrole.yaml | 4 +- .../clusterrolebinding.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../default/rendered/prometheus/cm.yaml | 4 +- .../default/rendered/prometheus/deploy.yaml | 10 +- .../default/rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../default/rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 1196 ++++++++-------- .../rendered/flagd-config.yaml | 4 +- .../rendered/grafana-dashboards.yaml | 6 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 6 +- .../rendered/grafana/deployment.yaml | 8 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 6 +- .../grafana/tests/test-serviceaccount.yaml | 6 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 6 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../opentelemetry-collector/clusterrole.yaml | 4 +- .../clusterrolebinding.yaml | 4 +- .../configmap-agent.yaml | 5 +- .../opentelemetry-collector/daemonset.yaml | 8 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 4 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 1200 ++++++++-------- .../rendered/flagd-config.yaml | 4 +- .../rendered/grafana-dashboards.yaml | 6 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 6 +- .../rendered/grafana/deployment.yaml | 8 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 6 +- .../grafana/tests/test-serviceaccount.yaml | 6 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 6 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../rendered/opensearch/configmap.yaml | 4 +- .../opensearch/poddisruptionbudget.yaml | 4 +- .../rendered/opensearch/service.yaml | 11 +- .../rendered/opensearch/statefulset.yaml | 14 +- .../opentelemetry-collector/clusterrole.yaml | 4 +- .../clusterrolebinding.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/ingress.yaml | 4 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 4 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../opentelemetry-collector.json | 2 +- charts/opentelemetry-demo/templates/NOTES.txt | 5 +- .../opentelemetry-demo/templates/_objects.tpl | 102 +- charts/opentelemetry-demo/templates/_pod.tpl | 2 - charts/opentelemetry-demo/values.schema.json | 41 +- charts/opentelemetry-demo/values.yaml | 47 +- 203 files changed, 4498 insertions(+), 4012 deletions(-) diff --git a/.github/workflows/demo-test.yaml b/.github/workflows/demo-test.yaml index 30a5cce6a..bca07f5d1 100644 --- a/.github/workflows/demo-test.yaml +++ b/.github/workflows/demo-test.yaml @@ -19,6 +19,7 @@ jobs: uses: ./.github/actions/setup with: create-kind-cluster: "true" + helm-version: "v3.14.4" - name: Run chart-testing (install) run: "ct install --charts charts/opentelemetry-demo diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d20ca5329..e3cd9496c 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ jobs: uses: ./.github/actions/setup with: create-kind-cluster: "false" - helm-version: "v3.11.3" + helm-version: "v3.14.4" - name: Run chart-testing (lint) run: "ct lint --target-branch main diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock index 8842ee69d..098376d80 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.104.0 + version: 0.107.0 - name: jaeger repository: https://jaegertracing.github.io/helm-charts - version: 3.1.2 + version: 3.3.1 - name: prometheus repository: https://prometheus-community.github.io/helm-charts - version: 25.24.1 + version: 25.27.0 - name: grafana repository: https://grafana.github.io/helm-charts - version: 8.3.7 + version: 8.5.6 - name: opensearch repository: https://opensearch-project.github.io/helm-charts - version: 2.21.0 -digest: sha256:2a16f992b59fe8169ab4faf3b022f3acb691d8ba59238ec1dc16db0bb7cedd2f -generated: "2024-09-04T17:44:43.761156097+02:00" + version: 2.26.0 +digest: sha256:292b8188562cb1ab8a8e96d04a21aadeb13dd84d8e13bfd2947d580dc44f2ce3 +generated: "2024-10-18T00:17:52.149624-04:00" diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 494cfafc3..9f06354d8 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.32.8 +version: 0.33.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -12,25 +12,25 @@ maintainers: - name: puckpuck - name: tylerhelmuth icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png -appVersion: "1.11.1" +appVersion: "1.12.0" dependencies: - name: opentelemetry-collector - version: 0.104.0 + version: 0.107.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled - name: jaeger - version: 3.1.2 + version: 3.3.1 repository: https://jaegertracing.github.io/helm-charts condition: jaeger.enabled - name: prometheus - version: 25.24.1 + version: 25.27.0 repository: https://prometheus-community.github.io/helm-charts condition: prometheus.enabled - name: grafana - version: 8.3.7 + version: 8.5.6 repository: https://grafana.github.io/helm-charts condition: grafana.enabled - name: opensearch - version: 2.21.0 + version: 2.26.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 02b2226a8..f2a5eb528 100644 --- a/charts/opentelemetry-demo/README.md +++ b/charts/opentelemetry-demo/README.md @@ -6,7 +6,7 @@ in kubernetes cluster. ## Prerequisites - Kubernetes 1.24+ -- Helm 3.9+ +- Helm 3.14+ ## Installing the Chart @@ -115,57 +115,60 @@ component. > is the name of the demo component -| Parameter | Description | Default | -|-----------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| -| `enabled` | Is this component enabled | `true` | -| `useDefault.env` | Use the default environment variables in this component | `true` | -| `imageOverride.repository` | Name of image for this component | Defaults to the overall default image repository | -| `imageOverride.tag` | Tag of the image for this component | Defaults to the overall default image tag | -| `imageOverride.pullPolicy` | Image pull policy for this component | `IfNotPresent` | -| `imageOverride.pullSecrets` | Image pull secrets for this component | `[]` | -| `service.type` | Service type used for this component | `ClusterIP` | -| `service.port` | Service port used for this component | `nil` | -| `service.nodePort` | Service node port used for this component | `nil` | -| `service.annotations` | Annotations to add to the component's service | `{}` | -| `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 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 | `{}` | -| `schedulingRules.tolerations` | Tolerations for pod assignment | `[]` | -| `securityContext` | Container security context to define user ID (UID), group ID (GID) and other security policies | `{}` | -| `podSecurityContext` | Pod security context to define user ID (UID), group ID (GID) and other security policies | `{}` | -| `podAnnotations` | Pod annotations for this component | `{}` | -| `ingress.enabled` | Enable the creation of Ingress rules | `false` | -| `ingress.annotations` | Annotations to add to the ingress rule | `{}` | -| `ingress.ingressClassName` | Ingress class to use. If not specified default Ingress class will be used. | `nil` | -| `ingress.hosts` | Array of Hosts to use for the ingress rule. | `[]` | -| `ingress.hosts[].paths` | Array of paths / routes to use for the ingress rule host. | `[]` | -| `ingress.hosts[].paths[].path` | Actual path route to use | `nil` | -| `ingress.hosts[].paths[].pathType` | Path type to use for the given path. Typically this is `Prefix`. | `nil` | -| `ingress.hosts[].paths[].port` | Port to use for the given path | `nil` | -| `ingress.additionalIngresses` | Array of additional ingress rules to add. This is handy if you need to differently annotated ingress rules | `[]` | -| `ingress.additionalIngresses[].name` | Each additional ingress rule needs to have a unique name | `nil` | -| `command` | Command & arguments to pass to the container being spun up for this service | `[]` | -| `mountedConfigMaps[].name` | Name of the Volume that will be used for the ConfigMap mount | `nil` | -| `mountedConfigMaps[].mountPath` | Path where the ConfigMap data will be mounted | `nil` | -| `mountedConfigMaps[].subPath` | SubPath within the mountPath. Used to mount a single file into the path. | `nil` | +| Parameter | Description | Default | +|----------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| +| `enabled` | Is this component enabled | `true` | +| `useDefault.env` | Use the default environment variables in this component | `true` | +| `imageOverride.repository` | Name of image for this component | Defaults to the overall default image repository | +| `imageOverride.tag` | Tag of the image for this component | Defaults to the overall default image tag | +| `imageOverride.pullPolicy` | Image pull policy for this component | `IfNotPresent` | +| `imageOverride.pullSecrets` | Image pull secrets for this component | `[]` | +| `service.type` | Service type used for this component | `ClusterIP` | +| `service.port` | Service port used for this component | `nil` | +| `service.nodePort` | Service node port used for this component | `nil` | +| `service.annotations` | Annotations to add to the component's service | `{}` | +| `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 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 | `{}` | +| `schedulingRules.tolerations` | Tolerations for pod assignment | `[]` | +| `securityContext` | Container security context to define user ID (UID), group ID (GID) and other security policies | `{}` | +| `podSecurityContext` | Pod security context to define user ID (UID), group ID (GID) and other security policies | `{}` | +| `podAnnotations` | Pod annotations for this component | `{}` | +| `ingress.enabled` | Enable the creation of Ingress rules | `false` | +| `ingress.annotations` | Annotations to add to the ingress rule | `{}` | +| `ingress.ingressClassName` | Ingress class to use. If not specified default Ingress class will be used. | `nil` | +| `ingress.hosts` | Array of Hosts to use for the ingress rule. | `[]` | +| `ingress.hosts[].paths` | Array of paths / routes to use for the ingress rule host. | `[]` | +| `ingress.hosts[].paths[].path` | Actual path route to use | `nil` | +| `ingress.hosts[].paths[].pathType` | Path type to use for the given path. Typically this is `Prefix`. | `nil` | +| `ingress.hosts[].paths[].port` | Port to use for the given path | `nil` | +| `ingress.additionalIngresses` | Array of additional ingress rules to add. This is handy if you need to differently annotated ingress rules | `[]` | +| `ingress.additionalIngresses[].name` | Each additional ingress rule needs to have a unique name | `nil` | +| `command` | Command & arguments to pass to the container being spun up for this service | `[]` | +| `mountedConfigMaps[].name` | Name of the Volume that will be used for the ConfigMap mount | `nil` | +| `mountedConfigMaps[].mountPath` | Path where the ConfigMap data will be mounted | `nil` | +| `mountedConfigMaps[].subPath` | SubPath within the mountPath. Used to mount a single file into the path. | `nil` | | `mountedConfigMaps[].existingConfigMap` | Name of the existing ConfigMap to mount | `nil` | -| `mountedConfigMaps[].data` | Contents of a ConfigMap. Keys should be the names of the files to be mounted. | `{}` | -| `initContainers` | Array of init containers to add to the pod | `[]` | -| `initContainers[].name` | Name of the init container | `nil` | -| `initContainers[].image` | Image to use for the init container | `nil` | -| `initContainers[].command` | Command to run for the init container | `nil` | +| `mountedConfigMaps[].data` | Contents of a ConfigMap. Keys should be the names of the files to be mounted. | `{}` | +| `initContainers` | Array of init containers to add to the pod | `[]` | +| `initContainers[].name` | Name of the init container | `nil` | +| `initContainers[].image` | Image to use for the init container | `nil` | +| `initContainers[].command` | Command to run for the init container | `nil` | +| `sidecarContainers` | Array of sidecar containers to add to the pod | `[]` | +| `additionalVolumes` | Array of additional volumes to add to the pod | `[]` | ### Sub-charts -The OpenTelemetry Demo Helm chart depends on 4 sub-charts: +The OpenTelemetry Demo Helm chart depends on 5 sub-charts: * OpenTelemetry Collector * Jaeger * Prometheus * Grafana +* OpenSearch Parameters for each sub-chart can be specified within that sub-chart's respective top level. This chart will override some of the dependent sub-chart @@ -239,3 +242,18 @@ parameters by default. The overriden parameters are specified below. | `datasources` | Configure grafana datasources (passed through tpl) | Prometheus and Jaeger data sources | | `dashboardProviders` | Configure grafana dashboard providers | Defines a `default` provider based on a file path | | `dashboardConfigMaps` | ConfigMaps reference that contains dashboards | Dashboard config map deployed with this Helm chart | + +#### OpenSearch +> **Note** +> The following parameters have a `opensearch.` prefix. + +| Parameter | Description | Default | +|-----------------------|---------------------------------------------------|------------------------------------------| +| `enabled` | Install the OpenSearch sub-chart | `true` | +| `fullnameOverride` | Name that will be used by the sub-chart release | `otel-demo-opensearch` | +| `clusterName` | Name of the OpenSearch cluster | `demo-cluster` | +| `nodeGroup` | OpenSearch Node group configuration | `otel-demo` | +| `singleNode` | Deploy a single node OpenSearch cluster | `true` | +| `opensearchJavaOpts` | Java options for OpenSearch JVM | `-Xms300m -Xmx300m` | +| `persistence.enabled` | Enable persistent storage for OpenSearch data | `false` | +| `extraEnvs` | Additional environment variables for OpenSearch | Disables demo config and security plugin | diff --git a/charts/opentelemetry-demo/UPGRADING.md b/charts/opentelemetry-demo/UPGRADING.md index affa68d37..d68bf46b9 100644 --- a/charts/opentelemetry-demo/UPGRADING.md +++ b/charts/opentelemetry-demo/UPGRADING.md @@ -1,5 +1,10 @@ # Upgrade guidelines +## To 0.33 + +The Helm prerequisite version has been updated to Helm 3.14+. Please upgrade your +Helm client to the latest version. + ## To 0.28 The `configuration` property for components has been removed in favor of the new `mountedConfigMaps` property. 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 cb61c4ec2..e762da233 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,29 +464,28 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -492,6 +494,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -499,13 +502,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -527,34 +530,34 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi @@ -567,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -595,41 +598,40 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -638,6 +640,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -645,13 +648,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -673,51 +676,50 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -726,6 +728,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -733,13 +736,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -761,30 +764,30 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -797,13 +800,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -825,30 +828,30 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 100Mi @@ -861,13 +864,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -892,40 +895,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 + resources: + limits: + memory: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -933,13 +979,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,33 +1007,32 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -996,6 +1041,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1003,13 +1049,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1031,54 +1077,54 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/otlp-http/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://localhost:8080/otlp-http/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 250Mi @@ -1095,13 +1141,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1123,56 +1169,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1189,13 +1239,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1217,30 +1267,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1253,13 +1303,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1281,32 +1331,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 600Mi @@ -1323,13 +1373,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,46 +1401,46 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 1Gi @@ -1403,13 +1453,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1431,32 +1481,32 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi @@ -1473,13 +1523,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1501,32 +1551,32 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: PRODUCT_CATALOG_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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1539,13 +1589,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1567,30 +1617,30 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 40Mi @@ -1607,13 +1657,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1635,38 +1685,38 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 500Mi @@ -1679,13 +1729,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1707,30 +1757,30 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1743,13 +1793,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1774,21 +1824,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi 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 index af35e2a1a..95bffb14d 100644 --- 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 @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: 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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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 8ed314295..68e6c6910 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,29 +464,28 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -492,6 +494,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -499,13 +502,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -527,34 +530,34 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi @@ -567,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -595,41 +598,40 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -638,6 +640,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -645,13 +648,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -673,51 +676,50 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -726,6 +728,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -733,13 +736,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -761,30 +764,30 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -797,13 +800,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -825,30 +828,30 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 100Mi @@ -861,13 +864,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -892,40 +895,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 + resources: + limits: + memory: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -933,13 +979,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,33 +1007,32 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -996,6 +1041,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1003,13 +1049,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1031,54 +1077,54 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/otlp-http/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://localhost:8080/otlp-http/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 250Mi @@ -1095,13 +1141,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1123,56 +1169,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1189,13 +1239,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1217,30 +1267,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1253,13 +1303,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1281,32 +1331,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 600Mi @@ -1323,13 +1373,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,46 +1401,46 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 1Gi @@ -1403,13 +1453,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1431,32 +1481,32 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi @@ -1473,13 +1523,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1501,32 +1551,32 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: PRODUCT_CATALOG_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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1539,13 +1589,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1567,30 +1617,30 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 40Mi @@ -1607,13 +1657,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1635,38 +1685,38 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 500Mi @@ -1679,13 +1729,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1707,30 +1757,30 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1743,13 +1793,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1774,21 +1824,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi 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 index af35e2a1a..95bffb14d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index 6015bc96d..6647d3f4d 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -3278,7 +3278,7 @@ data: "version": 2, "weekStart": "" } - opentelemetry-collector.json: |- + opentelemetry-collector.json: | { "__inputs": [], "__elements": {}, 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 685e63e9a..2cc6932f1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 ae2daf227..4264831cf 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 72ff37bba..e183d7702 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.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 ff3f5cfe1..23cf4f22f 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 + checksum/config: 5ba43de21f3293b4ef0a59df22951cad20c6ab085bba3996b50461471ca848e1 checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:11.1.0" + image: "docker.io/grafana/grafana:11.2.2" 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 8aa148592..0e9dcc0b1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 530c5717b..ea712aea5 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 091834fa5..ac96bdedd 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 f3762e93e..73352d60e 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 2315d0329..2313c1430 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 @@ -5,10 +5,10 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 fc8d75490..10cb61096 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 @@ -6,13 +6,13 @@ metadata: name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 74e2652b1..c366630f1 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,13 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" 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 5d94c6ef7..c1b230f1b 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,13 +5,13 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: default spec: 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 cc416e159..118c61d97 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 b298f99a1..ba338c680 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-3.1.2 + helm.sh/chart: jaeger-3.3.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-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index c82a420ea..8c724a283 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-3.1.2 + helm.sh/chart: jaeger-3.3.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -37,6 +37,10 @@ spec: - env: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory 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 708e4aded..db4e383e3 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 00835f45c..e017f3573 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 540a6d1d9..d6d1261bc 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 acf213187..555f248c8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 e35aaa953..c974c97f1 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm data: 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 742d5ac6b..57fbad3d8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a15d07b6bc2949d5bdf08a440ad2b3fea64b8bf88d9ef30810653b6f7f8c2939 + checksum/config: 515a01952a1e4e9254fc07ec9ba6745e76f01a8e11d4c1b876898e1c3ffd6eaa opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -43,7 +43,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.108.0" + image: "otel/opentelemetry-collector-contrib:0.110.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 f7b2cbbdd..f662f4d7c 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 95db1e0c0..c76a5a935 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d96c75d57..bb9f1e7fb 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 833472245..67d49ab30 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 3b9840f16..9aa96c270 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1" + image: "quay.io/prometheus/prometheus:v2.54.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 f7e2c50a8..0c128e49a 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d2971c0b9..6d4df8bee 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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 4dc325c8a..f8beb7273 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,31 +464,30 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: TEAM_NAME - value: orion - - 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) + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: TEAM_NAME + value: orion + - 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 volumeMounts: - volumes: initContainers: - command: - sh @@ -494,6 +496,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -501,13 +504,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -529,36 +532,36 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: TEAM_NAME - value: helix - - 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) + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: TEAM_NAME + value: helix + - 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: 300Mi @@ -571,13 +574,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -599,43 +602,42 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: ring - - 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) + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: ring + - 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: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -644,6 +646,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -651,13 +654,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -679,53 +682,52 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: orion - - 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) + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: orion + - 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: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -734,6 +736,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -741,13 +744,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -769,32 +772,32 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: TEAM_NAME - value: orion - - 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) + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: TEAM_NAME + value: orion + - 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: 20Mi @@ -807,13 +810,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -835,32 +838,32 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: TEAM_NAME - value: orion - - 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) + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: TEAM_NAME + value: orion + - 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: 100Mi @@ -873,13 +876,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -904,40 +907,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - 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) + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - 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: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - 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: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -945,13 +991,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -973,35 +1019,34 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: TEAM_NAME - value: orion - - 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) + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: TEAM_NAME + value: orion + - 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: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -1010,6 +1055,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1017,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1045,56 +1091,56 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/otlp-http/v1/traces - - name: TEAM_NAME - value: ring - - 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) + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://localhost:8080/otlp-http/v1/traces + - name: TEAM_NAME + value: ring + - 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: 250Mi @@ -1111,13 +1157,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1139,56 +1185,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - 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) + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - 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: 50Mi @@ -1205,13 +1255,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1233,30 +1283,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - 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) + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - 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: 50Mi @@ -1269,13 +1319,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1297,32 +1347,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - 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) + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - 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: 600Mi @@ -1339,13 +1389,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1367,48 +1417,48 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: ring - - 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) + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: ring + - 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: 1Gi @@ -1421,13 +1471,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1449,34 +1499,34 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: orion - - 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) + - 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: 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 + value: orion + - 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 @@ -1493,13 +1543,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1521,34 +1571,34 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: helix - - 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) + - 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: PRODUCT_CATALOG_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 + value: helix + - 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: 20Mi @@ -1561,13 +1611,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1589,32 +1639,32 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: TEAM_NAME - value: orion - - 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) + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: TEAM_NAME + value: orion + - 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: 40Mi @@ -1631,13 +1681,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1659,40 +1709,40 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: helix - - 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) + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: helix + - 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: 500Mi @@ -1705,13 +1755,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1733,32 +1783,32 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: TEAM_NAME - value: orion - - 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) + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: TEAM_NAME + value: orion + - 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: 20Mi @@ -1771,13 +1821,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1802,21 +1852,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: 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) + - 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: 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: 20Mi 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 index af35e2a1a..95bffb14d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index 6015bc96d..6647d3f4d 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -3278,7 +3278,7 @@ data: "version": 2, "weekStart": "" } - opentelemetry-collector.json: |- + opentelemetry-collector.json: | { "__inputs": [], "__elements": {}, 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 685e63e9a..2cc6932f1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 ae2daf227..4264831cf 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 72ff37bba..e183d7702 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.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 ff3f5cfe1..23cf4f22f 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 + checksum/config: 5ba43de21f3293b4ef0a59df22951cad20c6ab085bba3996b50461471ca848e1 checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:11.1.0" + image: "docker.io/grafana/grafana:11.2.2" 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 8aa148592..0e9dcc0b1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 530c5717b..ea712aea5 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 091834fa5..ac96bdedd 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 f3762e93e..73352d60e 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 2315d0329..2313c1430 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 @@ -5,10 +5,10 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 fc8d75490..10cb61096 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 @@ -6,13 +6,13 @@ metadata: name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 74e2652b1..c366630f1 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,13 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" 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 5d94c6ef7..c1b230f1b 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,13 +5,13 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: default spec: 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 cc416e159..118c61d97 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 b298f99a1..ba338c680 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-3.1.2 + helm.sh/chart: jaeger-3.3.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-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index c82a420ea..8c724a283 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-3.1.2 + helm.sh/chart: jaeger-3.3.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -37,6 +37,10 @@ spec: - env: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory 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 708e4aded..db4e383e3 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 00835f45c..e017f3573 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 540a6d1d9..d6d1261bc 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 acf213187..555f248c8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 e902f5b6e..11fc62bed 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm data: 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 a71b52162..2f4c50bde 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 731bde1eff3951ad48cfa0c556afd255f0722a567105db7f2f386268fefb9c39 + checksum/config: d2832be0e1dcfaa1ebb4e1116eb5f0cad468a144b3d0b156d84cb453dbdacc8e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +45,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.108.0" + image: "otel/opentelemetry-collector-contrib:0.110.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 6e9570cef..4e48901e1 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 f7b2cbbdd..f662f4d7c 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 95db1e0c0..c76a5a935 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d96c75d57..bb9f1e7fb 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 833472245..67d49ab30 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 3b9840f16..9aa96c270 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1" + image: "quay.io/prometheus/prometheus:v2.54.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 f7e2c50a8..0c128e49a 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d2971c0b9..6d4df8bee 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index e85c05838..b96e120ed 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,29 +464,28 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -492,6 +494,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -499,13 +502,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -527,34 +530,34 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi @@ -567,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -595,41 +598,40 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -638,6 +640,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -645,13 +648,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -673,51 +676,50 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -726,6 +728,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -733,13 +736,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -761,30 +764,30 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -797,13 +800,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -825,30 +828,30 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 100Mi @@ -861,13 +864,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -892,40 +895,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 + resources: + limits: + memory: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -933,13 +979,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,33 +1007,32 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -996,6 +1041,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1003,13 +1049,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1031,54 +1077,54 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/otlp-http/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://localhost:8080/otlp-http/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 250Mi @@ -1095,13 +1141,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1123,56 +1169,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1189,13 +1239,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1217,30 +1267,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1253,13 +1303,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1281,32 +1331,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 600Mi @@ -1323,13 +1373,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,46 +1401,46 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 1Gi @@ -1403,13 +1453,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1431,32 +1481,32 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi @@ -1473,13 +1523,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1501,32 +1551,32 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: PRODUCT_CATALOG_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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1539,13 +1589,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1567,30 +1617,30 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 40Mi @@ -1607,13 +1657,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1635,38 +1685,38 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 500Mi @@ -1679,13 +1729,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1707,30 +1757,30 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1743,13 +1793,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1774,21 +1824,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi diff --git a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml index af35e2a1a..95bffb14d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 6015bc96d..6647d3f4d 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -3278,7 +3278,7 @@ data: "version": 2, "weekStart": "" } - opentelemetry-collector.json: |- + opentelemetry-collector.json: | { "__inputs": [], "__elements": {}, diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index 685e63e9a..2cc6932f1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 ae2daf227..4264831cf 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 72ff37bba..e183d7702 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.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 ff3f5cfe1..23cf4f22f 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 + checksum/config: 5ba43de21f3293b4ef0a59df22951cad20c6ab085bba3996b50461471ca848e1 checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:11.1.0" + image: "docker.io/grafana/grafana:11.2.2" 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 8aa148592..0e9dcc0b1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 530c5717b..ea712aea5 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 091834fa5..ac96bdedd 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 f3762e93e..73352d60e 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 2315d0329..2313c1430 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml @@ -5,10 +5,10 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 fc8d75490..10cb61096 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 @@ -6,13 +6,13 @@ metadata: name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 74e2652b1..c366630f1 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,13 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" 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 5d94c6ef7..c1b230f1b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml @@ -5,13 +5,13 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: default spec: 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 cc416e159..118c61d97 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 b298f99a1..ba338c680 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-3.1.2 + helm.sh/chart: jaeger-3.3.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-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index c82a420ea..8c724a283 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-3.1.2 + helm.sh/chart: jaeger-3.3.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -37,6 +37,10 @@ spec: - env: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory 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 708e4aded..db4e383e3 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 00835f45c..e017f3573 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 540a6d1d9..d6d1261bc 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 acf213187..555f248c8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 a8cbfb94c..2e482ac96 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm data: 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 51cbb3d3b..8422320d6 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 2e2b27f314da89d6e1451d023ca8165be0e618918a60f9cf9dc187801d870519 + checksum/config: 9331254b17ed221068e25faa7b188b72ccff090e916235e6d5f28c37d7494d32 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +45,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.108.0" + image: "otel/opentelemetry-collector-contrib:0.110.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 6e9570cef..4e48901e1 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 f7b2cbbdd..f662f4d7c 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 95db1e0c0..c76a5a935 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d96c75d57..bb9f1e7fb 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 833472245..67d49ab30 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 3b9840f16..9aa96c270 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1" + image: "quay.io/prometheus/prometheus:v2.54.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 f7e2c50a8..0c128e49a 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d2971c0b9..6d4df8bee 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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 e85c05838..b96e120ed 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,29 +464,28 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -492,6 +494,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -499,13 +502,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -527,34 +530,34 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi @@ -567,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -595,41 +598,40 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -638,6 +640,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -645,13 +648,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -673,51 +676,50 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -726,6 +728,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -733,13 +736,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -761,30 +764,30 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -797,13 +800,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -825,30 +828,30 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 100Mi @@ -861,13 +864,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -892,40 +895,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 + resources: + limits: + memory: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -933,13 +979,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,33 +1007,32 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -996,6 +1041,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1003,13 +1049,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1031,54 +1077,54 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/otlp-http/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://localhost:8080/otlp-http/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 250Mi @@ -1095,13 +1141,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1123,56 +1169,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1189,13 +1239,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1217,30 +1267,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1253,13 +1303,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1281,32 +1331,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 600Mi @@ -1323,13 +1373,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,46 +1401,46 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 1Gi @@ -1403,13 +1453,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1431,32 +1481,32 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi @@ -1473,13 +1523,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1501,32 +1551,32 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: PRODUCT_CATALOG_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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1539,13 +1589,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1567,30 +1617,30 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 40Mi @@ -1607,13 +1657,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1635,38 +1685,38 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 500Mi @@ -1679,13 +1729,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1707,30 +1757,30 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1743,13 +1793,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1774,21 +1824,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi 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 index af35e2a1a..95bffb14d 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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-dashboards.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml index 6015bc96d..6647d3f4d 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -3278,7 +3278,7 @@ data: "version": 2, "weekStart": "" } - opentelemetry-collector.json: |- + opentelemetry-collector.json: | { "__inputs": [], "__elements": {}, 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 685e63e9a..2cc6932f1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 ae2daf227..4264831cf 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 72ff37bba..e183d7702 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.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 ff3f5cfe1..23cf4f22f 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 + checksum/config: 5ba43de21f3293b4ef0a59df22951cad20c6ab085bba3996b50461471ca848e1 checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:11.1.0" + image: "docker.io/grafana/grafana:11.2.2" 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 8aa148592..0e9dcc0b1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 530c5717b..ea712aea5 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 091834fa5..ac96bdedd 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 f3762e93e..73352d60e 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 2315d0329..2313c1430 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 @@ -5,10 +5,10 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 fc8d75490..10cb61096 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 @@ -6,13 +6,13 @@ metadata: name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 74e2652b1..c366630f1 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,13 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" 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 5d94c6ef7..c1b230f1b 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,13 +5,13 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: default spec: 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 cc416e159..118c61d97 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 b298f99a1..ba338c680 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-3.1.2 + helm.sh/chart: jaeger-3.3.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-deploy.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml index c82a420ea..8c724a283 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-3.1.2 + helm.sh/chart: jaeger-3.3.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -37,6 +37,10 @@ spec: - env: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory 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 708e4aded..db4e383e3 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 00835f45c..e017f3573 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 b63f0201c..3110e0210 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 acf213187..555f248c8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 34167f61e..085f306fe 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm data: @@ -183,6 +183,7 @@ data: service: extensions: - health_check + - file_storage pipelines: logs: exporters: 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 c4fe6f8e7..06f351e62 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: fd9a0dfc2603702aa423b0e602cf3bee0e1b65b0db96fa91915e3b69c33ca4b9 + checksum/config: 1a0e45bdcec0a5203ec987679a23def0d664e6fde176cfeba71a8291bb5457e0 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 - image: "otel/opentelemetry-collector-contrib:0.108.0" + image: "otel/opentelemetry-collector-contrib:0.110.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 f7b2cbbdd..f662f4d7c 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 95db1e0c0..c76a5a935 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d96c75d57..bb9f1e7fb 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 833472245..67d49ab30 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 3b9840f16..9aa96c270 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1" + image: "quay.io/prometheus/prometheus:v2.54.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 f7e2c50a8..0c128e49a 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d2971c0b9..6d4df8bee 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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 44ca70018..609efc519 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -145,6 +145,9 @@ spec: - port: 8013 name: tcp-service targetPort: 8013 + - port: 4000 + name: tcp-service-0 + targetPort: 4000 selector: opentelemetry.io/name: example-flagd @@ -155,13 +158,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -180,13 +183,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -205,13 +208,13 @@ kind: Service metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -230,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -258,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -283,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -308,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -333,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -358,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -383,13 +386,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -408,13 +411,13 @@ kind: Service metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -433,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -461,29 +464,28 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-accountingservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -492,6 +494,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -499,13 +502,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -527,34 +530,34 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-adservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-adservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: AD_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):4318 - - name: OTEL_LOGS_EXPORTER - value: otlp - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: AD_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):4318 + - name: OTEL_LOGS_EXPORTER + value: otlp + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi @@ -567,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -595,41 +598,40 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-cartservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CART_SERVICE_PORT - value: "8080" - - name: ASPNETCORE_URLS - value: http://*:$(CART_SERVICE_PORT) - - name: VALKEY_ADDR - value: 'example-valkey:6379' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CART_SERVICE_PORT + value: "8080" + - name: ASPNETCORE_URLS + value: http://*:$(CART_SERVICE_PORT) + - name: VALKEY_ADDR + value: 'example-valkey:6379' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 160Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -638,6 +640,7 @@ spec: for valkey; sleep 2; done; image: busybox:latest name: wait-for-valkey + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -645,13 +648,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -673,51 +676,50 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-checkoutservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CHECKOUT_SERVICE_PORT - value: "8080" - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: EMAIL_SERVICE_ADDR - value: http://example-emailservice:8080 - - name: PAYMENT_SERVICE_ADDR - value: 'example-paymentservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CHECKOUT_SERVICE_PORT + value: "8080" + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: EMAIL_SERVICE_ADDR + value: http://example-emailservice:8080 + - name: PAYMENT_SERVICE_ADDR + value: 'example-paymentservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -726,6 +728,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -733,13 +736,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -761,30 +764,30 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-currencyservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: CURRENCY_SERVICE_PORT - value: "8080" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: VERSION - value: '1.11.1' - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: CURRENCY_SERVICE_PORT + value: "8080" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: VERSION + value: '1.12.0' + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -797,13 +800,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -825,30 +828,30 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-emailservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: EMAIL_SERVICE_PORT - value: "8080" - - name: APP_ENV - value: production - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: EMAIL_SERVICE_PORT + value: "8080" + - name: APP_ENV + value: production + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 100Mi @@ -861,13 +864,13 @@ kind: Deployment metadata: name: example-flagd labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-flagd app.kubernetes.io/instance: example app.kubernetes.io/component: flagd app.kubernetes.io/name: example-flagd - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -892,40 +895,83 @@ spec: image: 'ghcr.io/open-feature/flagd:v0.11.1' imagePullPolicy: IfNotPresent command: - - /flagd-build - - start - - --uri - - file:./etc/flagd/demo.flagd.json + - /flagd-build + - start + - --uri + - file:./etc/flagd/demo.flagd.json ports: - - - containerPort: 8013 - name: service + + - containerPort: 8013 + name: service 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: FLAGD_METRICS_EXPORTER - value: otel - - name: FLAGD_OTEL_COLLECTOR_URI - value: $(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FLAGD_METRICS_EXPORTER + value: otel + - name: FLAGD_OTEL_COLLECTOR_URI + value: $(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi volumeMounts: - - name: config + - name: config-rw mountPath: /etc/flagd + - name: flagd-ui + image: 'ghcr.io/open-telemetry/demo:1.12.0-flagdui' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 4000 + name: service + 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: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 + resources: + limits: + memory: 150Mi + volumeMounts: + - mountPath: /app/data + name: config-rw + initContainers: + - command: + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + image: busybox + name: init-config + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - - name: config - configMap: - name: example-flagd-config + - name: config-rw + emptyDir: {} + - configMap: + name: 'example-flagd-config' + name: config-ro --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -933,13 +979,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -961,33 +1007,32 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frauddetectionservice' imagePullPolicy: IfNotPresent 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: KAFKA_SERVICE_ADDR - value: 'example-kafka:9092' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_SERVICE_ADDR + value: 'example-kafka:9092' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 300Mi volumeMounts: - volumes: initContainers: - command: - sh @@ -996,6 +1041,7 @@ spec: for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1003,13 +1049,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1031,54 +1077,54 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontend' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontend' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: FRONTEND_PORT - value: "8080" - - name: FRONTEND_ADDR - value: :8080 - - name: AD_SERVICE_ADDR - value: 'example-adservice:8080' - - name: CART_SERVICE_ADDR - value: 'example-cartservice:8080' - - name: CHECKOUT_SERVICE_ADDR - value: 'example-checkoutservice:8080' - - name: CURRENCY_SERVICE_ADDR - value: 'example-currencyservice:8080' - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: RECOMMENDATION_SERVICE_ADDR - value: 'example-recommendationservice:8080' - - name: SHIPPING_SERVICE_ADDR - value: 'example-shippingservice:8080' - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: WEB_OTEL_SERVICE_NAME - value: frontend-web - - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: https://otel-demo-collector.example.com/v1/traces - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: FRONTEND_PORT + value: "8080" + - name: FRONTEND_ADDR + value: :8080 + - name: AD_SERVICE_ADDR + value: 'example-adservice:8080' + - name: CART_SERVICE_ADDR + value: 'example-cartservice:8080' + - name: CHECKOUT_SERVICE_ADDR + value: 'example-checkoutservice:8080' + - name: CURRENCY_SERVICE_ADDR + value: 'example-currencyservice:8080' + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: RECOMMENDATION_SERVICE_ADDR + value: 'example-recommendationservice:8080' + - name: SHIPPING_SERVICE_ADDR + value: 'example-shippingservice:8080' + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: WEB_OTEL_SERVICE_NAME + value: frontend-web + - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: https://otel-demo-collector.example.com/v1/traces + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 250Mi @@ -1095,13 +1141,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1123,56 +1169,60 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.11.1-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.12.0-frontendproxy' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: ENVOY_PORT - value: "8080" - - name: FLAGD_HOST - value: 'example-flagd' - - name: FLAGD_PORT - value: "8013" - - name: FRONTEND_HOST - value: 'example-frontend' - - name: FRONTEND_PORT - value: "8080" - - name: GRAFANA_SERVICE_HOST - value: 'example-grafana' - - name: GRAFANA_SERVICE_PORT - value: "80" - - name: IMAGE_PROVIDER_HOST - value: 'example-imageprovider' - - name: IMAGE_PROVIDER_PORT - value: "8081" - - name: JAEGER_SERVICE_HOST - value: 'example-jaeger-query' - - name: JAEGER_SERVICE_PORT - value: "16686" - - name: LOCUST_WEB_HOST - value: 'example-loadgenerator' - - name: LOCUST_WEB_PORT - value: "8089" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_PORT_HTTP - value: "4318" - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: ENVOY_PORT + value: "8080" + - name: FLAGD_HOST + value: 'example-flagd' + - name: FLAGD_PORT + value: "8013" + - name: FLAGD_UI_HOST + value: 'example-flagd' + - name: FLAGD_UI_PORT + value: "4000" + - name: FRONTEND_HOST + value: 'example-frontend' + - name: FRONTEND_PORT + value: "8080" + - name: GRAFANA_SERVICE_HOST + value: 'example-grafana' + - name: GRAFANA_SERVICE_PORT + value: "80" + - name: IMAGE_PROVIDER_HOST + value: 'example-imageprovider' + - name: IMAGE_PROVIDER_PORT + value: "8081" + - name: JAEGER_SERVICE_HOST + value: 'example-jaeger-query' + - name: JAEGER_SERVICE_PORT + value: "16686" + - name: LOCUST_WEB_HOST + value: 'example-loadgenerator' + - name: LOCUST_WEB_PORT + value: "8089" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1189,13 +1239,13 @@ kind: Deployment metadata: name: example-imageprovider labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-imageprovider app.kubernetes.io/instance: example app.kubernetes.io/component: imageprovider app.kubernetes.io/name: example-imageprovider - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1217,30 +1267,30 @@ spec: serviceAccountName: example containers: - name: imageprovider - image: 'ghcr.io/open-telemetry/demo:1.11.1-imageprovider' + image: 'ghcr.io/open-telemetry/demo:1.12.0-imageprovider' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8081 - name: service + + - containerPort: 8081 + name: service 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: IMAGE_PROVIDER_PORT - value: "8081" - - name: OTEL_COLLECTOR_PORT_GRPC - value: "4317" - - name: OTEL_COLLECTOR_HOST - value: $(OTEL_COLLECTOR_NAME) - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: IMAGE_PROVIDER_PORT + value: "8081" + - name: OTEL_COLLECTOR_PORT_GRPC + value: "4317" + - name: OTEL_COLLECTOR_HOST + value: $(OTEL_COLLECTOR_NAME) + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 50Mi @@ -1253,13 +1303,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1281,32 +1331,32 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.11.1-kafka' + image: 'ghcr.io/open-telemetry/demo:1.12.0-kafka' imagePullPolicy: IfNotPresent ports: - - - containerPort: 9092 - name: plaintext - - containerPort: 9093 - name: controller + + - containerPort: 9092 + name: plaintext + - containerPort: 9093 + name: controller 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: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://example-kafka:9092 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: KAFKA_HEAP_OPTS - value: -Xmx400M -Xms400M - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://example-kafka:9092 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: KAFKA_HEAP_OPTS + value: -Xmx400M -Xms400M + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 600Mi @@ -1323,13 +1373,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1351,46 +1401,46 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.11.1-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.12.0-loadgenerator' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8089 - name: service + + - containerPort: 8089 + name: service 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: LOCUST_WEB_PORT - value: "8089" - - name: LOCUST_USERS - value: "10" - - name: LOCUST_SPAWN_RATE - value: "1" - - name: LOCUST_HOST - value: http://example-frontendproxy:8080 - - name: LOCUST_HEADLESS - value: "false" - - name: LOCUST_AUTOSTART - value: "true" - - name: LOCUST_BROWSER_TRAFFIC_ENABLED - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: LOCUST_WEB_PORT + value: "8089" + - name: LOCUST_USERS + value: "10" + - name: LOCUST_SPAWN_RATE + value: "1" + - name: LOCUST_HOST + value: http://example-frontendproxy:8080 + - name: LOCUST_HEADLESS + value: "false" + - name: LOCUST_AUTOSTART + value: "true" + - name: LOCUST_BROWSER_TRAFFIC_ENABLED + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 1Gi @@ -1403,13 +1453,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1431,32 +1481,32 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-paymentservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 120Mi @@ -1473,13 +1523,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1501,32 +1551,32 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: PRODUCT_CATALOG_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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: PRODUCT_CATALOG_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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1539,13 +1589,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1567,30 +1617,30 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-quoteservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: QUOTE_SERVICE_PORT - value: "8080" - - name: OTEL_PHP_AUTOLOAD_ENABLED - value: "true" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: QUOTE_SERVICE_PORT + value: "8080" + - name: OTEL_PHP_AUTOLOAD_ENABLED + value: "true" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 40Mi @@ -1607,13 +1657,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1635,38 +1685,38 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-recommendationservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: RECOMMENDATION_SERVICE_PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: 'example-productcatalogservice:8080' - - name: OTEL_PYTHON_LOG_CORRELATION - value: "true" - - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION - value: python - - 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 - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: RECOMMENDATION_SERVICE_PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: 'example-productcatalogservice:8080' + - name: OTEL_PYTHON_LOG_CORRELATION + value: "true" + - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION + value: python + - 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 + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 500Mi @@ -1679,13 +1729,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1707,30 +1757,30 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.11.1-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.12.0-shippingservice' imagePullPolicy: IfNotPresent ports: - - - containerPort: 8080 - name: service + + - containerPort: 8080 + name: service 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: SHIPPING_SERVICE_PORT - value: "8080" - - name: QUOTE_SERVICE_ADDR - value: http://example-quoteservice:8080 - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4317 - - name: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: SHIPPING_SERVICE_PORT + value: "8080" + - name: QUOTE_SERVICE_ADDR + value: http://example-quoteservice:8080 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1743,13 +1793,13 @@ kind: Deployment metadata: name: example-valkey labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example-valkey app.kubernetes.io/instance: example app.kubernetes.io/component: valkey app.kubernetes.io/name: example-valkey - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1774,21 +1824,21 @@ spec: image: 'valkey/valkey:7.2-alpine' imagePullPolicy: IfNotPresent ports: - - - containerPort: 6379 - name: valkey + + - containerPort: 6379 + name: valkey 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: OTEL_RESOURCE_ATTRIBUTES - value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.1 + - 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: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.12.0 resources: limits: memory: 20Mi @@ -1805,13 +1855,13 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.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.11.1" + app.kubernetes.io/version: "1.12.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 index af35e2a1a..95bffb14d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml @@ -6,12 +6,12 @@ metadata: name: example-flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.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-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index 6015bc96d..6647d3f4d 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -3278,7 +3278,7 @@ data: "version": 2, "weekStart": "" } - opentelemetry-collector.json: |- + opentelemetry-collector.json: | { "__inputs": [], "__elements": {}, 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 685e63e9a..2cc6932f1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 ae2daf227..4264831cf 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 72ff37bba..e183d7702 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm data: @@ -68,7 +68,7 @@ data: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.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 ff3f5cfe1..23cf4f22f 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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: f51ceb983b7646f8bb20be092e8f97489d2497f3d37ec3a4baf903a571c819b3 + checksum/config: 5ba43de21f3293b4ef0a59df22951cad20c6ab085bba3996b50461471ca848e1 checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:11.1.0" + image: "docker.io/grafana/grafana:11.2.2" 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 8aa148592..0e9dcc0b1 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 530c5717b..ea712aea5 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 091834fa5..ac96bdedd 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 f3762e93e..73352d60e 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-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 2315d0329..2313c1430 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 @@ -5,10 +5,10 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 fc8d75490..10cb61096 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 @@ -6,13 +6,13 @@ metadata: name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" 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 74e2652b1..c366630f1 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,13 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" 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 5d94c6ef7..c1b230f1b 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,13 +5,13 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-8.3.7 + helm.sh/chart: grafana-8.5.6 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "11.1.0" + app.kubernetes.io/version: "11.2.2" app.kubernetes.io/managed-by: Helm annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: default spec: 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 cc416e159..118c61d97 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 b298f99a1..ba338c680 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-3.1.2 + helm.sh/chart: jaeger-3.3.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-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index c82a420ea..8c724a283 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-3.1.2 + helm.sh/chart: jaeger-3.3.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.53.0" @@ -37,6 +37,10 @@ spec: - env: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory 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 708e4aded..db4e383e3 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 00835f45c..e017f3573 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-3.1.2 + helm.sh/chart: jaeger-3.3.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 1ba7cee93..a0930ce88 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 e4d45e735..c2561bbcd 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 bc2e76b2b..56654711c 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: @@ -25,6 +25,9 @@ spec: - name: transport protocol: TCP port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -32,10 +35,10 @@ apiVersion: v1 metadata: name: otel-demo-opensearch-headless labels: - helm.sh/chart: opensearch-2.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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 631dc60c9..5a3b3578a 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" 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.21.0 + helm.sh/chart: opensearch-2.26.0 app.kubernetes.io/name: opensearch app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.17.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: otel-demo-opensearch annotations: - configchecksum: 37295fb5fb8d7507d2983c0e81b48f3bf75872125d0c65ba1f69cb714fc4a1d + configchecksum: 8ca1d37df611c2a461735390cfa8db14f1f41388aab30654670c13a971527b5 spec: securityContext: fsGroup: 1000 @@ -66,7 +66,7 @@ spec: enableServiceLinks: true initContainers: - name: configfile - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" command: - sh @@ -91,7 +91,7 @@ spec: runAsNonRoot: true runAsUser: 1000 - image: "opensearchproject/opensearch:2.15.0" + image: "opensearchproject/opensearch:2.17.1" imagePullPolicy: "IfNotPresent" readinessProbe: failureThreshold: 3 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 540a6d1d9..d6d1261bc 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 acf213187..555f248c8 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 a8cbfb94c..2e482ac96 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm data: 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 51cbb3d3b..8422320d6 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 2e2b27f314da89d6e1451d023ca8165be0e618918a60f9cf9dc187801d870519 + checksum/config: 9331254b17ed221068e25faa7b188b72ccff090e916235e6d5f28c37d7494d32 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +45,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.108.0" + image: "otel/opentelemetry-collector-contrib:0.110.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 91cb37387..855ec7282 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 6e9570cef..4e48901e1 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 f7b2cbbdd..f662f4d7c 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.104.0 + helm.sh/chart: opentelemetry-collector-0.107.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.108.0" + app.kubernetes.io/version: "0.110.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 95db1e0c0..c76a5a935 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d96c75d57..bb9f1e7fb 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 833472245..67d49ab30 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 3b9840f16..9aa96c270 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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.53.1" + image: "quay.io/prometheus/prometheus:v2.54.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 f7e2c50a8..0c128e49a 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 d2971c0b9..6d4df8bee 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.53.1 - helm.sh/chart: prometheus-25.24.1 + app.kubernetes.io/version: v2.54.1 + helm.sh/chart: prometheus-25.27.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 99f09f48b..9341001e8 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.32.8 + helm.sh/chart: opentelemetry-demo-0.33.0 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.11.1" + app.kubernetes.io/version: "1.12.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector.json b/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector.json index 654a69a58..b437e1928 100644 --- a/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector.json +++ b/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector.json @@ -3362,4 +3362,4 @@ "uid": "BKf2sowmj", "version": 72, "weekStart": "" -} \ No newline at end of file +} diff --git a/charts/opentelemetry-demo/templates/NOTES.txt b/charts/opentelemetry-demo/templates/NOTES.txt index e41a80750..4920f3d56 100644 --- a/charts/opentelemetry-demo/templates/NOTES.txt +++ b/charts/opentelemetry-demo/templates/NOTES.txt @@ -13,8 +13,9 @@ by running these commands: kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "otel-demo.name" . }}-frontendproxy 8080:8080 - The following services are available at these paths once the proxy is exposed: + The following services are available at these paths after the frontendproxy service is exposed with port forwarding: Webstore http://localhost:8080/ + Jaeger UI http://localhost:8080/jaeger/ui/ Grafana http://localhost:8080/grafana/ Load Generator UI http://localhost:8080/loadgen/ - Jaeger UI http://localhost:8080/jaeger/ui/ + Feature Flags UI http://localhost:8080/feature/ diff --git a/charts/opentelemetry-demo/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index a957ebad6..639bb9564 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -53,14 +53,14 @@ spec: imagePullPolicy: {{ ((.imageOverride).pullPolicy) | default .defaultValues.image.pullPolicy }} {{- if .command }} command: - {{- .command | toYaml | nindent 10 -}} + {{- .command | toYaml | nindent 12 -}} {{- end }} {{- if or .ports .service}} ports: - {{- include "otel-demo.pod.ports" . | nindent 10 }} + {{- include "otel-demo.pod.ports" . | nindent 12 }} {{- end }} env: - {{- include "otel-demo.pod.env" . | nindent 10 }} + {{- include "otel-demo.pod.env" . | nindent 12 }} resources: {{- .resources | toYaml | nindent 12 }} {{- if or .defaultValues.securityContext .securityContext }} @@ -79,6 +79,52 @@ spec: subPath: {{ .subPath }} {{- end }} {{- end }} + {{- range .mountedEmptyDirs }} + - name: {{ .name | lower }} + mountPath: {{ .mountPath }} + {{- if .subPath }} + subPath: {{ .subPath }} + {{- end }} + {{- end }} + {{- range .sidecarContainers }} + {{- $sidecar := set . "name" (.name | lower)}} + {{- $sidecar := set . "Chart" $.Chart }} + {{- $sidecar := set . "Release" $.Release }} + {{- $sidecar := set . "defaultValues" $.defaultValues }} + - name: {{ .name }} + image: '{{ ((.imageOverride).repository) | default .defaultValues.image.repository }}:{{ ((.imageOverride).tag) | default (printf "%s-%s" (default .Chart.AppVersion .defaultValues.image.tag) (replace "-" "" .name)) }}' + imagePullPolicy: {{ ((.imageOverride).pullPolicy) | default .defaultValues.image.pullPolicy }} + {{- if .command }} + command: + {{- .command | toYaml | nindent 12 -}} + {{- end }} + {{- if or .ports .service }} + ports: + {{- include "otel-demo.pod.ports" . | nindent 12 }} + {{- end }} + env: + {{- include "otel-demo.pod.env" . | nindent 12 }} + {{- if .resources }} + resources: + {{- .resources | toYaml | nindent 12 }} + {{- end }} + {{- if or .defaultValues.securityContext .securityContext }} + securityContext: + {{- .securityContext | default .defaultValues.securityContext | toYaml | nindent 12 }} + {{- end}} + {{- if .livenessProbe }} + livenessProbe: + {{- .livenessProbe | toYaml | nindent 12 }} + {{- end }} + {{- if .volumeMounts }} + volumeMounts: + {{- .volumeMounts | toYaml | nindent 12 }} + {{- end }} + {{- end }} + {{- if .initContainers }} + initContainers: + {{- tpl (toYaml .initContainers) . | nindent 8 }} + {{- end}} volumes: {{- range .mountedConfigMaps }} - name: {{ .name | lower}} @@ -89,10 +135,13 @@ spec: name: {{ include "otel-demo.name" $ }}-{{ $.name }}-{{ .name | lower }} {{- end }} {{- end }} - {{- if .initContainers }} - initContainers: - {{- tpl (toYaml .initContainers) . | nindent 8 }} - {{- end}} + {{- range .mountedEmptyDirs }} + - name: {{ .name | lower}} + emptyDir: {} + {{- end }} + {{- if .additionalVolumes }} + {{- tpl (toYaml .additionalVolumes) . | nindent 8 }} + {{- end }} {{- end }} {{/* @@ -116,20 +165,39 @@ spec: type: {{ $service.type | default "ClusterIP" }} ports: {{- if .ports }} - {{- range $port := .ports }} - - port: {{ $port.value }} - name: {{ $port.name}} - targetPort: {{ $port.value }} + {{- range .ports }} + - port: {{ .value }} + name: {{ .name}} + targetPort: {{ .value }} {{- end }} {{- end }} - {{- if $service.port }} - - port: {{ $service.port}} + {{- if and .service .service.port }} + - port: {{ .service.port}} name: tcp-service - targetPort: {{ $service.port }} - {{- if $service.nodePort }} - nodePort: {{ $service.nodePort }} - {{- end }} + targetPort: {{ .service.port }} + {{- if .service.nodePort }} + nodePort: {{ .service.nodePort }} + {{- end }} + {{- end }} + + {{- range $i, $sidecar := .sidecarContainers }} + {{- if .ports }} + {{- range .ports }} + - port: {{ .value }} + name: {{ .name}} + targetPort: {{ .value }} + {{- end }} + {{- end }} + + {{- if and .service .service.port }} + - port: {{ .service.port}} + name: tcp-service-{{ $i }} + targetPort: {{ .service.port }} + {{- if .service.nodePort }} + nodePort: {{ .service.nodePort }} + {{- end }} + {{- end }} {{- end }} selector: {{- include "otel-demo.selectorLabels" . | nindent 4 }} diff --git a/charts/opentelemetry-demo/templates/_pod.tpl b/charts/opentelemetry-demo/templates/_pod.tpl index 9f74f2b07..d6c298737 100644 --- a/charts/opentelemetry-demo/templates/_pod.tpl +++ b/charts/opentelemetry-demo/templates/_pod.tpl @@ -54,12 +54,10 @@ Get Pod ports name: {{ $port.name}} {{- end }} {{- end }} - {{- if .service }} {{- if .service.port }} - containerPort: {{.service.port}} name: service {{- end }} {{- end }} - {{- end }} diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index 4fe1ffb24..210f99fb7 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -178,6 +178,12 @@ "$ref": "#/definitions/MountedConfigMap" } }, + "mountedEmptyDirs": { + "type": "array", + "items": { + "$ref": "#/definitions/MountedEmptyDirs" + } + }, "livenessProbe": { "$ref": "#/definitions/LivenessProbe" }, @@ -200,18 +206,13 @@ "$ref": "#/definitions/Ingress" }, "initContainers": { - "type": "array", - "properties": { - "name": { - "type": "string" - }, - "image": { - "type": "string" - }, - "command": { - "type": "object" - } - } + "type": "array" + }, + "sidecarContainers":{ + "type": "array" + }, + "additionalVolumes": { + "type": "array" } }, "required": [ @@ -722,6 +723,22 @@ "required": ["data"] } ] + }, + "MountedEmptyDirs": { + "type": "object", + "additionalProperties": false, + "properties": { + "name": { + "type": "string" + }, + "mountPath": { + "type": "string" + } + }, + "required": [ + "name", + "mountPath" + ] } } } diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index d2b9b0f57..ff6a7e1fc 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=./values.schema.json default: # List of environment variables applied to all components env: @@ -371,6 +372,10 @@ components: value: '{{ include "otel-demo.name" . }}-flagd' - name: FLAGD_PORT value: "8013" + - name: FLAGD_UI_HOST + value: '{{ include "otel-demo.name" . }}-flagd' + - name: FLAGD_UI_PORT + value: "4000" - name: FRONTEND_HOST value: '{{ include "otel-demo.name" . }}-frontend' - name: FRONTEND_PORT @@ -583,10 +588,40 @@ components: - "start" - "--uri" - "file:./etc/flagd/demo.flagd.json" - mountedConfigMaps: - - name: config + mountedEmptyDirs: + - name: config-rw mountPath: /etc/flagd - existingConfigMap: '{{ include "otel-demo.name" . }}-flagd-config' + # flgad-ui as a sidecar container in the same pod so the flag json file can be shared + sidecarContainers: + - name: flagd-ui + useDefault: + env: true + service: + port: 4000 + env: + - name: FLAGD_METRICS_EXPORTER + value: otel + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 + resources: + limits: + memory: 150Mi + volumeMounts: + - name: config-rw + mountPath: /app/data + initContainers: + - name: init-config + image: busybox + command: ['sh', '-c', 'cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json'] + volumeMounts: + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw + additionalVolumes: + - name: config-ro + configMap: + name: '{{ include "otel-demo.name" . }}-flagd-config' kafka: enabled: true @@ -743,6 +778,10 @@ jaeger: extraEnv: - name: METRICS_STORAGE_TYPE value: prometheus + - name: COLLECTOR_OTLP_GRPC_HOST_PORT + value: 0.0.0.0:4317 + - name: COLLECTOR_OTLP_HTTP_HOST_PORT + value: 0.0.0.0:4318 resources: limits: memory: 400Mi @@ -855,7 +894,7 @@ grafana: logMessageField: body pplEnabled: true timeField: observedTimestamp - version: 2.13.0 + version: 2.17.0 dashboardProviders: dashboardproviders.yaml: apiVersion: 1