Merge branch 'main' into patch-1

open-telemetry · Oct 17, 2023 · 107b7c7 · 107b7c7
2 parents 411046d + 314744c
commit 107b7c7
Show file tree

Hide file tree

Showing 133 changed files with 501 additions and 526 deletions.
diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: opentelemetry-collector
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.69.1
+  version: 0.72.0
 - name: jaeger
   repository: https://jaegertracing.github.io/helm-charts
-  version: 0.71.14
+  version: 0.71.17
 - name: prometheus
   repository: https://prometheus-community.github.io/helm-charts
-  version: 25.0.0
+  version: 25.1.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.58.8
-digest: sha256:cb54fa9f2baedac6ac1bb90723d5e273e028a7feb73d7cccd2846a3114363268
-generated: "2023-09-29T10:12:06.686332-06:00"
+  version: 6.60.4
+digest: sha256:1fd6c4a7367448c253614c304ed964f6c5c7f341f6db10e5fff9b1e0ba69c162
+generated: "2023-10-13T00:47:30.213353-04:00"
diff --git 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.25.5
+version: 0.25.6
 description: opentelemetry demo helm chart
 home: https://opentelemetry.io/
 sources:
@@ -14,18 +14,18 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
 appVersion: "1.5.0"
 dependencies:
   - name: opentelemetry-collector
-    version: 0.69.1
+    version: 0.72.0
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
     condition: opentelemetry-collector.enabled
   - name: jaeger
-    version: 0.71.14
+    version: 0.71.17
     repository: https://jaegertracing.github.io/helm-charts
     condition: jaeger.enabled
   - name: prometheus
-    version: 25.0.0
+    version: 25.1.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus.enabled
   - name: grafana
-    version: 6.58.8
+    version: 6.60.4
     repository: https://grafana.github.io/helm-charts
     condition: grafana.enabled
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
@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     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.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-accountingservice
     app.kubernetes.io/instance: example
@@ -498,7 +498,7 @@ kind: Deployment
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -560,7 +560,7 @@ kind: Deployment
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -632,7 +632,7 @@ kind: Deployment
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -712,7 +712,7 @@ kind: Deployment
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -770,7 +770,7 @@ kind: Deployment
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -830,7 +830,7 @@ kind: Deployment
 metadata:
   name: example-featureflagservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-featureflagservice
     app.kubernetes.io/instance: example
@@ -910,7 +910,7 @@ kind: Deployment
 metadata:
   name: example-ffspostgres
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-ffspostgres
     app.kubernetes.io/instance: example
@@ -974,7 +974,7 @@ kind: Deployment
 metadata:
   name: example-frauddetectionservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-frauddetectionservice
     app.kubernetes.io/instance: example
@@ -1036,7 +1036,7 @@ kind: Deployment
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -1118,7 +1118,7 @@ kind: Deployment
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -1204,7 +1204,7 @@ kind: Deployment
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -1270,7 +1270,7 @@ kind: Deployment
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -1340,7 +1340,7 @@ kind: Deployment
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -1402,7 +1402,7 @@ kind: Deployment
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -1462,7 +1462,7 @@ kind: Deployment
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -1526,7 +1526,7 @@ kind: Deployment
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -1592,7 +1592,7 @@ kind: Deployment
 metadata:
   name: example-redis
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-redis
     app.kubernetes.io/instance: example
@@ -1650,7 +1650,7 @@ kind: Deployment
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example

diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml
@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-demo-0.25.5
+    helm.sh/chart: opentelemetry-demo-0.25.6
 
     opentelemetry.io/name: example
     app.kubernetes.io/instance: example