From b188a1a7aea1aac582fdccf6192f4f83755ad43b Mon Sep 17 00:00:00 2001 From: "minquan.chen" Date: Mon, 29 May 2023 13:51:29 +0800 Subject: [PATCH 1/5] apply review's suggestion --- charts/opentelemetry-demo/Chart.yaml | 2 +- charts/opentelemetry-demo/templates/_objects.tpl | 3 +++ charts/opentelemetry-demo/values.schema.json | 7 +++++++ charts/opentelemetry-demo/values.yaml | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 5e3ec972b..4c9211d4a 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.22.3 +version: 0.22.4 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: diff --git a/charts/opentelemetry-demo/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index 248e42d20..75177c703 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -15,6 +15,9 @@ spec: labels: {{- include "otel-demo.selectorLabels" . | nindent 8 }} {{- include "otel-demo.workloadLabels" . | nindent 8 }} + {{- if and .useDefault.podLabels .defaultValues.podLabels }} + {{- toYaml .defaultValues.podLabels | nindent 8 }} + {{- end }} {{- if .podAnnotations }} annotations: {{- toYaml .podAnnotations | nindent 8 }} diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index f35b72c54..0a1ff80ba 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -129,6 +129,10 @@ "env": { "type": "boolean", "additionalProperties": false + }, + "podLabels": { + "type": "boolean", + "additionalProperties": false } }, "required": [ @@ -266,6 +270,9 @@ }, "securityContext": { "type": "object" + }, + "podLabels": { + "type": "object" } }, "required": [ diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index f89805519..e95eef250 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -48,6 +48,9 @@ default: affinity: {} tolerations: [] securityContext: {} + # list of pod labels applied to all components + podLabels: {} +# sidecar.istio.io/inject: true serviceAccount: # Specifies whether a service account should be created create: true @@ -65,6 +68,8 @@ components: # useDefault: ## Use default environment variables # env: true + ## Use default custom pod labels + # podLabels: true ## Override Image repository and Tag. Tag will use appVersion as default. ## Component's name will be applied to end of this value. # imageOverride: {} From 5b23d657cf925f67ec2dae297b2b41ad304c2ba1 Mon Sep 17 00:00:00 2001 From: "minquan.chen" Date: Tue, 18 Apr 2023 16:45:23 +0800 Subject: [PATCH 2/5] update --- charts/opentelemetry-demo/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index e95eef250..e38054850 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -50,7 +50,7 @@ default: securityContext: {} # list of pod labels applied to all components podLabels: {} -# sidecar.istio.io/inject: true + # sidecar.istio.io/inject: true serviceAccount: # Specifies whether a service account should be created create: true From 23337dcc8e9f91e2931159f10fd1e53370662c4e Mon Sep 17 00:00:00 2001 From: "minquan.chen" Date: Mon, 29 May 2023 13:47:27 +0800 Subject: [PATCH 3/5] apply review's suggestion --- charts/opentelemetry-demo/README.md | 10 ++++++++++ charts/opentelemetry-demo/values.yaml | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/charts/opentelemetry-demo/README.md b/charts/opentelemetry-demo/README.md index 07a483b68..ec1a1a0a5 100644 --- a/charts/opentelemetry-demo/README.md +++ b/charts/opentelemetry-demo/README.md @@ -86,6 +86,7 @@ the demo | `default.schedulingRules.affinity` | Man of node/pod affinities | `{}` | | `default.schedulingRules.tolerations` | Tolerations for pod assignment | `[]` | | `default.securityContext` | Demo components container security context | `{}` | +| `default.podLabels` | List of pod labels added to all components | `[]` | | `serviceAccount.annotations` | Annotations for the serviceAccount | `{}` | | `serviceAccount.create` | Whether to create a serviceAccount or use an existing one | `true` | | `serviceAccount.name` | The name of the ServiceAccount to use for demo components | `""` | @@ -106,6 +107,7 @@ component. |--------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| | `enabled` | Is this component enabled | `true` | | `useDefault.env` | Use the default environment variables in this component | `true` | +| `useDefault.podLabels` | Use the default custom pod labels | `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` | @@ -140,6 +142,14 @@ component. | `initContainers[].image` | Image to use for the init container | `nil` | | `initContainers[].command` | Command to run for the init container | `nil` | +### Istio-injection + +The OpenTelemetry Demo support istio sidecar injection. Enable this feature by the following command +```console +helm upgrade my-otel-demo charts/opentelemetry-demo \ + --set default.podLabels."sidecar\.istio\.io/inject"=true +``` + ### Sub-charts The OpenTelemetry Demo Helm chart depends on 4 sub-charts: diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index e38054850..465031d46 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -155,6 +155,7 @@ components: enabled: true useDefault: env: true + podLabels: true env: - name: KAFKA_SERVICE_ADDR value: '{{ include "otel-demo.name" . }}-kafka:9092' @@ -172,6 +173,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -191,6 +193,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -214,6 +217,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -247,6 +251,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -262,6 +267,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -279,6 +285,7 @@ components: enabled: true useDefault: env: true + podLabels: true ports: - name: grpc value: 50053 @@ -313,6 +320,7 @@ components: enabled: true useDefault: env: true + podLabels: true env: - name: KAFKA_SERVICE_ADDR value: '{{ include "otel-demo.name" . }}-kafka:9092' @@ -330,6 +338,7 @@ components: enabled: true useDefault: env: true + podLabels: false service: port: 8080 env: @@ -369,6 +378,7 @@ components: enabled: true useDefault: env: true + podLabels: false service: port: 8080 env: @@ -410,6 +420,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8089 env: @@ -437,6 +448,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -456,6 +468,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -473,6 +486,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -494,6 +508,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -517,6 +532,7 @@ components: enabled: true useDefault: env: true + podLabels: true service: port: 8080 env: @@ -534,6 +550,7 @@ components: enabled: true useDefault: env: true + podLabels: false imageOverride: repository: "postgres" tag: "14" @@ -559,6 +576,7 @@ components: enabled: true useDefault: env: true + podLabels: false ports: - name: plaintext value: 9092 @@ -583,6 +601,7 @@ components: enabled: true useDefault: env: true + podLabels: false imageOverride: repository: "redis" tag: "alpine" From 4e5c3dfb942f69ebc7da52618bad9243b16c54ae Mon Sep 17 00:00:00 2001 From: "minquan.chen" Date: Mon, 29 May 2023 13:56:25 +0800 Subject: [PATCH 4/5] make generate-examples --- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../configmap-agent.yaml | 18 ++--- .../opentelemetry-collector/daemonset.yaml | 9 ++- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 18 ++--- .../opentelemetry-collector/deployment.yaml | 9 ++- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 72 +++++++++--------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 18 ++--- .../opentelemetry-collector/deployment.yaml | 9 ++- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 74 +++++++++---------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 18 ++--- .../opentelemetry-collector/deployment.yaml | 9 ++- .../opentelemetry-collector/ingress.yaml | 4 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- 30 files changed, 262 insertions(+), 258 deletions(-) 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 d3185fa9a..06ab78719 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,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example 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 8ffa88bbd..2d936dbf2 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,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 38ce03738..6085a0099 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example 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 d5bac47d8..f1b1fe0d3 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 345f01cff..c1b5511a3 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${env:MY_POD_IP}:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: ${env:MY_POD_IP}:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: ${env:MY_POD_IP}:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${env:MY_POD_IP}:4317 + endpoint: ${MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${env:MY_POD_IP}:8888 + - ${MY_POD_IP}:8888 zipkin: - endpoint: ${env:MY_POD_IP}:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${env:MY_POD_IP}:8888 + address: ${MY_POD_IP}:8888 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 96f550d9c..8b563b9f3 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 @@ -5,10 +5,10 @@ kind: DaemonSet metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 627ef43facddeaa6c6e7f91d8b1e04c1c7f292cbacad373de913a5a337dfc669 + checksum/config: bb1c6c7bf5b2bdc03f1d7ce78382ea423d7ef819125e5f57216920deb951cdcf opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.75.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -91,6 +91,7 @@ spec: port: 13133 resources: limits: + cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 2e262e6fb..a1346b193 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm 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 8ffa88bbd..2d936dbf2 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 0165a7d39..2dcc807f3 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -520,7 +520,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -604,7 +604,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -696,7 +696,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -798,7 +798,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -878,7 +878,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -960,7 +960,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1062,7 +1062,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1146,7 +1146,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1230,7 +1230,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1334,7 +1334,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1524,7 +1524,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1616,7 +1616,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1700,7 +1700,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1782,7 +1782,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1868,7 +1868,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1956,7 +1956,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2034,7 +2034,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example 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 d5bac47d8..f1b1fe0d3 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 65cc605f7..92024556b 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm data: relay: | @@ -59,15 +59,15 @@ data: jaeger: protocols: grpc: - endpoint: ${env:MY_POD_IP}:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: ${env:MY_POD_IP}:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: ${env:MY_POD_IP}:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${env:MY_POD_IP}:4317 + endpoint: ${MY_POD_IP}:4317 http: cors: allowed_origins: @@ -81,9 +81,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${env:MY_POD_IP}:8888 + - ${MY_POD_IP}:8888 zipkin: - endpoint: ${env:MY_POD_IP}:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -125,4 +125,4 @@ data: - zipkin telemetry: metrics: - address: ${env:MY_POD_IP}:8888 + address: ${MY_POD_IP}:8888 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 ca63bd8de..ceb012f88 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 @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a3a9263b6d6111b94da158ff4c9d9fd67c6cb3aed729b134ea907554519dfa6e + checksum/config: 184f62e94bec144282da0b7a5fecd4e8f689bcd27c289a14309219de78fcce1c opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.75.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,6 +87,7 @@ spec: port: 13133 resources: limits: + cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 38af05c71..acdbfe5ce 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 @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 2e262e6fb..a1346b193 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm 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 8ffa88bbd..2d936dbf2 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index cc3491511..7cc1a795a 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index d5bac47d8..f1b1fe0d3 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 cb58ac717..8c0d090a9 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${env:MY_POD_IP}:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: ${env:MY_POD_IP}:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: ${env:MY_POD_IP}:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${env:MY_POD_IP}:4317 + endpoint: ${MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${env:MY_POD_IP}:8888 + - ${MY_POD_IP}:8888 zipkin: - endpoint: ${env:MY_POD_IP}:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${env:MY_POD_IP}:8888 + address: ${MY_POD_IP}:8888 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 a8cc31e28..69f296a6b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 + checksum/config: c30886cbc71bf9b0b57f7dd56548d58fc1a62d97d2e2ddc1155b2d9c3bf31b95 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.75.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,6 +87,7 @@ spec: port: 13133 resources: limits: + cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 38af05c71..acdbfe5ce 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 2e262e6fb..a1346b193 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 8ffa88bbd..2d936dbf2 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 cfe77332c..39f398a69 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2086,7 +2086,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example 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 d5bac47d8..f1b1fe0d3 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example 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 cb58ac717..8c0d090a9 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${env:MY_POD_IP}:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: ${env:MY_POD_IP}:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: ${env:MY_POD_IP}:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${env:MY_POD_IP}:4317 + endpoint: ${MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${env:MY_POD_IP}:8888 + - ${MY_POD_IP}:8888 zipkin: - endpoint: ${env:MY_POD_IP}:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${env:MY_POD_IP}:8888 + address: ${MY_POD_IP}:8888 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 a8cc31e28..69f296a6b 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 @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 + checksum/config: c30886cbc71bf9b0b57f7dd56548d58fc1a62d97d2e2ddc1155b2d9c3bf31b95 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.75.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,6 +87,7 @@ spec: port: 13133 resources: limits: + cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 8ebb61918..71c36b2f6 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 @@ -5,10 +5,10 @@ kind: Ingress metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 38af05c71..acdbfe5ce 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 @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 2e262e6fb..a1346b193 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.52.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.75.0" app.kubernetes.io/managed-by: Helm 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 8ffa88bbd..2d936dbf2 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.3 + helm.sh/chart: opentelemetry-demo-0.22.4 opentelemetry.io/name: example app.kubernetes.io/instance: example From 87dbc778dd4eafd43a7e586317306b2fdff20138 Mon Sep 17 00:00:00 2001 From: "minquan.chen" Date: Mon, 29 May 2023 16:48:18 +0800 Subject: [PATCH 5/5] make generate-examples --- .../configmap-agent.yaml | 18 +++++++++--------- .../opentelemetry-collector/daemonset.yaml | 9 ++++----- .../serviceaccount.yaml | 4 ++-- .../opentelemetry-collector/configmap.yaml | 18 +++++++++--------- .../opentelemetry-collector/deployment.yaml | 9 ++++----- .../opentelemetry-collector/service.yaml | 4 ++-- .../serviceaccount.yaml | 4 ++-- .../opentelemetry-collector/configmap.yaml | 18 +++++++++--------- .../opentelemetry-collector/deployment.yaml | 9 ++++----- .../opentelemetry-collector/service.yaml | 4 ++-- .../serviceaccount.yaml | 4 ++-- .../opentelemetry-collector/configmap.yaml | 18 +++++++++--------- .../opentelemetry-collector/deployment.yaml | 9 ++++----- .../opentelemetry-collector/ingress.yaml | 4 ++-- .../opentelemetry-collector/service.yaml | 4 ++-- .../serviceaccount.yaml | 4 ++-- 16 files changed, 68 insertions(+), 72 deletions(-) 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 c1b5511a3..345f01cff 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${MY_POD_IP}:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_compact: - endpoint: ${MY_POD_IP}:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: ${MY_POD_IP}:14268 + endpoint: ${env:MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${MY_POD_IP}:4317 + endpoint: ${env:MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${MY_POD_IP}:8888 + - ${env:MY_POD_IP}:8888 zipkin: - endpoint: ${MY_POD_IP}:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${MY_POD_IP}:8888 + address: ${env:MY_POD_IP}:8888 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 8b563b9f3..96f550d9c 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 @@ -5,10 +5,10 @@ kind: DaemonSet metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: bb1c6c7bf5b2bdc03f1d7ce78382ea423d7ef819125e5f57216920deb951cdcf + checksum/config: 627ef43facddeaa6c6e7f91d8b1e04c1c7f292cbacad373de913a5a337dfc669 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.75.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -91,7 +91,6 @@ spec: port: 13133 resources: limits: - cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 a1346b193..2e262e6fb 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm 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 92024556b..65cc605f7 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | @@ -59,15 +59,15 @@ data: jaeger: protocols: grpc: - endpoint: ${MY_POD_IP}:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_compact: - endpoint: ${MY_POD_IP}:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: ${MY_POD_IP}:14268 + endpoint: ${env:MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${MY_POD_IP}:4317 + endpoint: ${env:MY_POD_IP}:4317 http: cors: allowed_origins: @@ -81,9 +81,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${MY_POD_IP}:8888 + - ${env:MY_POD_IP}:8888 zipkin: - endpoint: ${MY_POD_IP}:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check @@ -125,4 +125,4 @@ data: - zipkin telemetry: metrics: - address: ${MY_POD_IP}:8888 + address: ${env:MY_POD_IP}:8888 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 ceb012f88..ca63bd8de 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 @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 184f62e94bec144282da0b7a5fecd4e8f689bcd27c289a14309219de78fcce1c + checksum/config: a3a9263b6d6111b94da158ff4c9d9fd67c6cb3aed729b134ea907554519dfa6e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.75.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,7 +87,6 @@ spec: port: 13133 resources: limits: - cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 acdbfe5ce..38af05c71 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 @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 a1346b193..2e262e6fb 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm 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 8c0d090a9..cb58ac717 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${MY_POD_IP}:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_compact: - endpoint: ${MY_POD_IP}:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: ${MY_POD_IP}:14268 + endpoint: ${env:MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${MY_POD_IP}:4317 + endpoint: ${env:MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${MY_POD_IP}:8888 + - ${env:MY_POD_IP}:8888 zipkin: - endpoint: ${MY_POD_IP}:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${MY_POD_IP}:8888 + address: ${env:MY_POD_IP}:8888 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 69f296a6b..a8cc31e28 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: c30886cbc71bf9b0b57f7dd56548d58fc1a62d97d2e2ddc1155b2d9c3bf31b95 + checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.75.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,7 +87,6 @@ spec: port: 13133 resources: limits: - cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 acdbfe5ce..38af05c71 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 a1346b193..2e262e6fb 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm 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 8c0d090a9..cb58ac717 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 @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | @@ -50,15 +50,15 @@ data: jaeger: protocols: grpc: - endpoint: ${MY_POD_IP}:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_compact: - endpoint: ${MY_POD_IP}:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: ${MY_POD_IP}:14268 + endpoint: ${env:MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: ${MY_POD_IP}:4317 + endpoint: ${env:MY_POD_IP}:4317 http: cors: allowed_origins: @@ -72,9 +72,9 @@ data: scrape_interval: 10s static_configs: - targets: - - ${MY_POD_IP}:8888 + - ${env:MY_POD_IP}:8888 zipkin: - endpoint: ${MY_POD_IP}:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check @@ -114,4 +114,4 @@ data: - zipkin telemetry: metrics: - address: ${MY_POD_IP}:8888 + address: ${env:MY_POD_IP}:8888 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 69f296a6b..a8cc31e28 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 @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: c30886cbc71bf9b0b57f7dd56548d58fc1a62d97d2e2ddc1155b2d9c3bf31b95 + checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.75.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -87,7 +87,6 @@ spec: port: 13133 resources: limits: - cpu: 256m memory: 125Mi volumeMounts: - mountPath: /conf 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 71c36b2f6..8ebb61918 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 @@ -5,10 +5,10 @@ kind: Ingress metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 acdbfe5ce..38af05c71 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 @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: 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 a1346b193..2e262e6fb 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 @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.52.1 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.75.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm