Merge branch 'main' into patch-2

open-telemetry · Jul 17, 2024 · d56fbc0 · d56fbc0
2 parents fca4abb + 5e5e435
commit d56fbc0
Show file tree

Hide file tree

Showing 81 changed files with 2,254 additions and 398 deletions.
diff --git a/Makefile b/Makefile
@@ -49,6 +49,7 @@ check-examples:
 			if diff -r "$${EXAMPLES_DIR}/$${example}/rendered" "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates" > /dev/null; then \
 				echo "Passed $${example}"; \
 			else \
+				diff -r "$${EXAMPLES_DIR}/$${example}/rendered" "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates"; \
 				echo "Failed $${example}. run 'make generate-examples' to re-render the example with the latest $${example}/values.yaml"; \
 				rm -rf ${TMP_DIRECTORY}; \
 				exit 1; \

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.32.0
+version: 0.32.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
@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.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.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.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.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.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.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.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.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -130,7 +130,7 @@ kind: Service
 metadata:
   name: example-flagd
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-flagd
     app.kubernetes.io/instance: example
@@ -155,7 +155,7 @@ kind: Service
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -180,7 +180,7 @@ kind: Service
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -205,7 +205,7 @@ kind: Service
 metadata:
   name: example-imageprovider
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-imageprovider
     app.kubernetes.io/instance: example
@@ -230,7 +230,7 @@ kind: Service
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -258,7 +258,7 @@ kind: Service
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -283,7 +283,7 @@ kind: Service
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -308,7 +308,7 @@ kind: Service
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -333,7 +333,7 @@ kind: Service
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -358,7 +358,7 @@ kind: Service
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -383,7 +383,7 @@ kind: Service
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example
@@ -408,7 +408,7 @@ kind: Service
 metadata:
   name: example-valkey
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-valkey
     app.kubernetes.io/instance: example
@@ -433,7 +433,7 @@ kind: Deployment
 metadata:
   name: example-accountingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-accountingservice
     app.kubernetes.io/instance: example
@@ -480,7 +480,7 @@ spec:
             value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=1.11.0
           resources:
             limits:
-              memory: 50Mi
+              memory: 120Mi
           volumeMounts:
       volumes:
       initContainers:
@@ -498,7 +498,7 @@ kind: Deployment
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -565,7 +565,7 @@ kind: Deployment
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -642,7 +642,7 @@ kind: Deployment
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -729,7 +729,7 @@ kind: Deployment
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -792,7 +792,7 @@ kind: Deployment
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -855,7 +855,7 @@ kind: Deployment
 metadata:
   name: example-flagd
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-flagd
     app.kubernetes.io/instance: example
@@ -926,7 +926,7 @@ kind: Deployment
 metadata:
   name: example-frauddetectionservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-frauddetectionservice
     app.kubernetes.io/instance: example
@@ -995,7 +995,7 @@ kind: Deployment
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -1086,7 +1086,7 @@ kind: Deployment
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -1179,7 +1179,7 @@ kind: Deployment
 metadata:
   name: example-imageprovider
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-imageprovider
     app.kubernetes.io/instance: example
@@ -1242,7 +1242,7 @@ kind: Deployment
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -1311,7 +1311,7 @@ kind: Deployment
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -1390,7 +1390,7 @@ kind: Deployment
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -1459,7 +1459,7 @@ kind: Deployment
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -1524,7 +1524,7 @@ kind: Deployment
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -1591,7 +1591,7 @@ kind: Deployment
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -1662,7 +1662,7 @@ kind: Deployment
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example
@@ -1725,7 +1725,7 @@ kind: Deployment
 metadata:
   name: example-valkey
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example-valkey
     app.kubernetes.io/instance: example

diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/flagd-config.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-flagd-config
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-demo-0.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example
     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.32.0
+    helm.sh/chart: opentelemetry-demo-0.32.1
 
     opentelemetry.io/name: example
     app.kubernetes.io/instance: example