From 096460a9a389f06dfc901d15f915e48ebb2526c3 Mon Sep 17 00:00:00 2001 From: MartinDotNet Date: Tue, 22 Aug 2023 16:24:47 +0100 Subject: [PATCH 1/2] Added ability to define the number or replicas --- charts/opentelemetry-demo/README.md | 2 ++ charts/opentelemetry-demo/templates/_objects.tpl | 1 + charts/opentelemetry-demo/values.schema.json | 6 ++++++ charts/opentelemetry-demo/values.yaml | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/charts/opentelemetry-demo/README.md b/charts/opentelemetry-demo/README.md index 07a483b68..ce0d49a86 100644 --- a/charts/opentelemetry-demo/README.md +++ b/charts/opentelemetry-demo/README.md @@ -89,6 +89,7 @@ the demo | `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 | `""` | +| `replicas` | The number of replicas for each of the services (doesn't apply to databases) | `1` | ### Component parameters @@ -139,6 +140,7 @@ component. | `initContainers[].name` | Name of the init container | `nil` | | `initContainers[].image` | Image to use for the init container | `nil` | | `initContainers[].command` | Command to run for the init container | `nil` | +| `replicasOverride` | Used to override the number of replicas of this component | `nil` | ### Sub-charts diff --git a/charts/opentelemetry-demo/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index 248e42d20..edb7059b7 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -7,6 +7,7 @@ metadata: labels: {{- include "otel-demo.labels" . | nindent 4 }} spec: + replicas: {{ .replicasOverride | default .defaultValues.replicas }} selector: matchLabels: {{- include "otel-demo.selectorLabels" . | nindent 6 }} diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index f35b72c54..b6ae8d7ee 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -197,6 +197,9 @@ "type": "object" } } + }, + "replicasOverride": { + "type": "integer" } }, "required": [ @@ -266,6 +269,9 @@ }, "securityContext": { "type": "object" + }, + "replicas": { + "type": "integer" } }, "required": [ diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index f89805519..678409c80 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -48,6 +48,8 @@ default: affinity: {} tolerations: [] securityContext: {} + replicas: 1 + serviceAccount: # Specifies whether a service account should be created create: true @@ -146,6 +148,8 @@ components: # - name: # image: # command: [list of commands for the init container to run] + # # Number of replicas to run for this component. Default is set in the defaults.replicas + # replicasOverride: 1 accountingService: enabled: true useDefault: @@ -427,6 +431,7 @@ components: resources: limits: memory: 120Mi + replicasOverride: 1 paymentService: enabled: true @@ -549,6 +554,7 @@ components: runAsUser: 999 # postgres runAsGroup: 999 runAsNonRoot: true + replicasOverride: 1 kafka: enabled: true @@ -573,6 +579,7 @@ components: runAsUser: 1000 # appuser runAsGroup: 1000 runAsNonRoot: true + replicasOverride: 1 redis: enabled: true @@ -591,6 +598,7 @@ components: runAsUser: 999 # redis runAsGroup: 1000 runAsNonRoot: true + replicasOverride: 1 opentelemetry-collector: enabled: true From 1c9143f5634a0104ca8309f3cede4fc5b7683a8b Mon Sep 17 00:00:00 2001 From: MartinDotNet Date: Tue, 22 Aug 2023 16:26:28 +0100 Subject: [PATCH 2/2] bumped chart minor version for demo --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../rendered/component.yaml | 91 +++++++++++------- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 91 +++++++++++------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 4 +- .../rendered/grafana/deployment.yaml | 19 +--- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +- .../jaeger/allinone-collector-svc.yaml | 4 +- .../rendered/jaeger/allinone-deploy.yaml | 8 +- .../rendered/jaeger/allinone-query-svc.yaml | 4 +- .../rendered/jaeger/allinone-sa.yaml | 4 +- .../configmap-agent.yaml | 4 +- .../opentelemetry-collector/daemonset.yaml | 8 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 12 +-- .../prometheus/clusterrolebinding.yaml | 12 +-- .../rendered/prometheus/cm.yaml | 12 +-- .../rendered/prometheus/deploy.yaml | 33 +++---- .../rendered/prometheus/service.yaml | 18 ++-- .../rendered/prometheus/serviceaccount.yaml | 12 +-- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 91 +++++++++++------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 4 +- .../rendered/grafana/deployment.yaml | 19 +--- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +- .../jaeger/allinone-collector-svc.yaml | 4 +- .../rendered/jaeger/allinone-deploy.yaml | 8 +- .../rendered/jaeger/allinone-query-svc.yaml | 4 +- .../rendered/jaeger/allinone-sa.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 12 +-- .../prometheus/clusterrolebinding.yaml | 12 +-- .../rendered/prometheus/cm.yaml | 12 +-- .../rendered/prometheus/deploy.yaml | 33 +++---- .../rendered/prometheus/service.yaml | 18 ++-- .../rendered/prometheus/serviceaccount.yaml | 12 +-- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 91 +++++++++++------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../default/rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../default/rendered/grafana/configmap.yaml | 4 +- .../default/rendered/grafana/deployment.yaml | 19 +--- .../default/rendered/grafana/role.yaml | 4 +- .../default/rendered/grafana/rolebinding.yaml | 4 +- .../default/rendered/grafana/secret.yaml | 4 +- .../default/rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../default/rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +- .../jaeger/allinone-collector-svc.yaml | 4 +- .../rendered/jaeger/allinone-deploy.yaml | 8 +- .../rendered/jaeger/allinone-query-svc.yaml | 4 +- .../default/rendered/jaeger/allinone-sa.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 12 +-- .../prometheus/clusterrolebinding.yaml | 12 +-- .../default/rendered/prometheus/cm.yaml | 12 +-- .../default/rendered/prometheus/deploy.yaml | 33 +++---- .../default/rendered/prometheus/service.yaml | 18 ++-- .../rendered/prometheus/serviceaccount.yaml | 12 +-- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 93 +++++++++++-------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 4 +- .../rendered/grafana/deployment.yaml | 19 +--- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 4 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 6 +- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +- .../jaeger/allinone-collector-svc.yaml | 4 +- .../rendered/jaeger/allinone-deploy.yaml | 8 +- .../rendered/jaeger/allinone-query-svc.yaml | 4 +- .../rendered/jaeger/allinone-sa.yaml | 4 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/ingress.yaml | 4 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 12 +-- .../prometheus/clusterrolebinding.yaml | 12 +-- .../rendered/prometheus/cm.yaml | 12 +-- .../rendered/prometheus/deploy.yaml | 33 +++---- .../rendered/prometheus/service.yaml | 18 ++-- .../rendered/prometheus/serviceaccount.yaml | 12 +-- .../rendered/serviceaccount.yaml | 2 +- 123 files changed, 650 insertions(+), 662 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index ec859120e..5784627a5 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.23.0 +version: 0.23.1 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: 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 57f6575f0..7fc901d9a 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -446,6 +446,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -518,7 +519,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -528,6 +529,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -600,7 +602,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -610,6 +612,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -690,7 +693,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -700,6 +703,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -790,7 +794,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -800,6 +804,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -868,7 +873,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -878,6 +883,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -948,7 +954,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -958,6 +964,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1048,7 +1055,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1058,6 +1065,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1132,7 +1140,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1142,6 +1150,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1214,7 +1223,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1224,6 +1233,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1316,7 +1326,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1326,6 +1336,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1420,7 +1431,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1430,6 +1441,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1506,7 +1518,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1516,6 +1528,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1596,7 +1609,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1606,6 +1619,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1678,7 +1692,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1688,6 +1702,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1758,7 +1773,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1768,6 +1783,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1842,7 +1858,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1852,6 +1868,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1928,7 +1945,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1938,6 +1955,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2006,7 +2024,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2016,6 +2034,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: 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 386fdd068..7f22b22a4 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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 bee0c9cf8..ff7996985 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -446,6 +446,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -518,7 +519,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -528,6 +529,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -600,7 +602,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -610,6 +612,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -690,7 +693,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -700,6 +703,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -790,7 +794,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -800,6 +804,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -868,7 +873,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -878,6 +883,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -948,7 +954,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -958,6 +964,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1048,7 +1055,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1058,6 +1065,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1132,7 +1140,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1142,6 +1150,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1214,7 +1223,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1224,6 +1233,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1316,7 +1326,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1326,6 +1336,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1420,7 +1431,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1430,6 +1441,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1506,7 +1518,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1516,6 +1528,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1596,7 +1609,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1606,6 +1619,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1678,7 +1692,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1688,6 +1702,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1758,7 +1773,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1768,6 +1783,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1842,7 +1858,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1852,6 +1868,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1928,7 +1945,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1938,6 +1955,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2006,7 +2024,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2016,6 +2034,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: 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 57a061ba5..da98736bb 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one 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 a6e36ebb5..0d4759de1 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | 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 6f60463bd..c784ea87f 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: e62fcdf5b3a33ec3cdb0ad02e110fcaa5f3ec9f29067a643b7413b0bd7623171 + checksum/config: 19f2931042e627b07e3bf0e0b69778e9bcb40885393993fb6b7e8acebdc5c357 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.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact 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 5601241bf..0b75edfb5 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: 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 386fdd068..7f22b22a4 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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 f36cbc8f8..4b33f4ed3 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -446,6 +446,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -520,7 +521,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -530,6 +531,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -604,7 +606,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -614,6 +616,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -696,7 +699,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -706,6 +709,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -798,7 +802,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -808,6 +812,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -878,7 +883,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -888,6 +893,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -960,7 +966,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -970,6 +976,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1062,7 +1069,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1072,6 +1079,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1146,7 +1154,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1156,6 +1164,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1230,7 +1239,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1240,6 +1249,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1334,7 +1344,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1344,6 +1354,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1438,7 +1449,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1448,6 +1459,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1524,7 +1536,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1534,6 +1546,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1616,7 +1629,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1626,6 +1639,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1700,7 +1714,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1710,6 +1724,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1782,7 +1797,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1792,6 +1807,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1868,7 +1884,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1878,6 +1894,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1956,7 +1973,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1966,6 +1983,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2034,7 +2052,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2044,6 +2062,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: 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 57a061ba5..da98736bb 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one 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 f201a599a..e11c3b0cf 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | 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 6480aa00d..a3c34ed9a 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 20851ed0c4bdafbefc52a90b489ba1a5a377b40e2add9425e2e4de2dcfce0f2d + checksum/config: f85af59ffecbb732ad2cb7dddd076c5820e389485040b4cdedf8ad9e9cbe49b2 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.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact 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 d431f6ea5..5247e48b6 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster 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 5601241bf..0b75edfb5 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: 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 386fdd068..7f22b22a4 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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 15b691cb0..c5e640e8d 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -446,6 +446,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -518,7 +519,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -528,6 +529,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -600,7 +602,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -610,6 +612,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -690,7 +693,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -700,6 +703,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -790,7 +794,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -800,6 +804,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -868,7 +873,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -878,6 +883,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -948,7 +954,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -958,6 +964,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1048,7 +1055,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1058,6 +1065,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1132,7 +1140,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1142,6 +1150,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1214,7 +1223,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1224,6 +1233,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1316,7 +1326,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1326,6 +1336,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1420,7 +1431,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1430,6 +1441,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1506,7 +1518,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1516,6 +1528,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1596,7 +1609,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1606,6 +1619,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1678,7 +1692,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1688,6 +1702,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1758,7 +1773,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1768,6 +1783,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1842,7 +1858,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1852,6 +1868,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1928,7 +1945,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1938,6 +1955,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2006,7 +2024,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2016,6 +2034,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 57a061ba5..da98736bb 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one 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 1e65a6edd..dcf824542 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | 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 13c7ec436..71c2f5649 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 + checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 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.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact 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 d431f6ea5..5247e48b6 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster 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 5601241bf..0b75edfb5 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 386fdd068..7f22b22a4 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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 2611a3fbf..f5fa8bc02 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -446,6 +446,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -518,7 +519,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -528,6 +529,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -600,7 +602,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -610,6 +612,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -690,7 +693,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -700,6 +703,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -790,7 +794,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -800,6 +804,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -868,7 +873,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -878,6 +883,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -948,7 +954,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -958,6 +964,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1048,7 +1055,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1058,6 +1065,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1132,7 +1140,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1142,6 +1150,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1214,7 +1223,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1224,6 +1233,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1316,7 +1326,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1326,6 +1336,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1420,7 +1431,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1430,6 +1441,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1506,7 +1518,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1516,6 +1528,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1596,7 +1609,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1606,6 +1619,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1678,7 +1692,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1688,6 +1702,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1758,7 +1773,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1768,6 +1783,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1842,7 +1858,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1852,6 +1868,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -1928,7 +1945,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1938,6 +1955,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2006,7 +2024,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2016,6 +2034,7 @@ metadata: app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: + replicas: 1 selector: matchLabels: @@ -2086,7 +2105,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 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 57a061ba5..da98736bb 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one 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 1e65a6edd..dcf824542 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | 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 13c7ec436..71c2f5649 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 + checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 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.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact 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 2bc7209e9..16756a929 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.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 d431f6ea5..5247e48b6 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster 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 5601241bf..0b75edfb5 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.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: 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 386fdd068..7f22b22a4 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.23.0 + helm.sh/chart: opentelemetry-demo-0.23.1 opentelemetry.io/name: example app.kubernetes.io/instance: example