[demo] support custom default pod label in pod

charts/opentelemetry-demo/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: opentelemetry-demo
-version: 0.22.3
+version: 0.22.4
 description: opentelemetry demo helm chart
 home: https://opentelemetry.io/
 sources:

charts/opentelemetry-demo/README.md

@@ -86,6 +86,7 @@ the demo
 | `default.schedulingRules.affinity`     | Man of node/pod affinities                                                                | `{}`                                                 |
 | `default.schedulingRules.tolerations`  | Tolerations for pod assignment                                                            | `[]`                                                 |
 | `default.securityContext`              | Demo components container security context                                                | `{}`                                                 |
+| `default.podLabels`                    | List of pod labels added to all components                                                | `[]`                                                 |
 | `serviceAccount.annotations`           | Annotations for the serviceAccount                                                        | `{}`                                                 |
 | `serviceAccount.create`                | Whether to create a serviceAccount or use an existing one                                 | `true`                                               |
 | `serviceAccount.name`                  | The name of the ServiceAccount to use for demo components                                 | `""`                                                 |
@@ -106,6 +107,7 @@ component.
 |--------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|
 | `enabled`                            | Is this component enabled                                                                                  | `true`                                                        |
 | `useDefault.env`                     | Use the default environment variables in this component                                                    | `true`                                                        |
+| `useDefault.podLabels`               | Use the default custom pod labels                                                                          | `true`                                                        |
 | `imageOverride.repository`           | Name of image for this component                                                                           | Defaults to the overall default image repository              |
 | `imageOverride.tag`                  | Tag of the image for this component                                                                        | Defaults to the overall default image tag                     |
 | `imageOverride.pullPolicy`           | Image pull policy for this component                                                                       | `IfNotPresent`                                                |
@@ -140,6 +142,14 @@ component.
 | `initContainers[].image`             | Image to use for the init container                                                                        | `nil`                                                         |
 | `initContainers[].command`           | Command to run for the init container                                                                      | `nil`                                                         |
 
+### Istio-injection
+
+The OpenTelemetry Demo support istio sidecar injection. Enable this feature by the following command
+```console
+helm upgrade my-otel-demo charts/opentelemetry-demo \
+    --set default.podLabels."sidecar\.istio\.io/inject"=true
+```
+
 ### Sub-charts
 
 The OpenTelemetry Demo Helm chart depends on 4 sub-charts:

charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml

@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -30,7 +30,7 @@ kind: Service
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -55,7 +55,7 @@ kind: Service
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -80,7 +80,7 @@ kind: Service
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -105,7 +105,7 @@ kind: Service
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -130,7 +130,7 @@ kind: Service
 metadata:
   name: example-featureflagservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-featureflagservice
     app.kubernetes.io/instance: example
@@ -158,7 +158,7 @@ kind: Service
 metadata:
   name: example-ffspostgres
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-ffspostgres
     app.kubernetes.io/instance: example
@@ -183,7 +183,7 @@ kind: Service
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -208,7 +208,7 @@ kind: Service
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -233,7 +233,7 @@ kind: Service
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -261,7 +261,7 @@ kind: Service
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -286,7 +286,7 @@ kind: Service
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -311,7 +311,7 @@ kind: Service
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -336,7 +336,7 @@ kind: Service
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -361,7 +361,7 @@ kind: Service
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -386,7 +386,7 @@ kind: Service
 metadata:
   name: example-redis
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-redis
     app.kubernetes.io/instance: example
@@ -411,7 +411,7 @@ kind: Service
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example
@@ -436,7 +436,7 @@ kind: Deployment
 metadata:
   name: example-accountingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-accountingservice
     app.kubernetes.io/instance: example
@@ -518,7 +518,7 @@ kind: Deployment
 metadata:
   name: example-adservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-adservice
     app.kubernetes.io/instance: example
@@ -600,7 +600,7 @@ kind: Deployment
 metadata:
   name: example-cartservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-cartservice
     app.kubernetes.io/instance: example
@@ -690,7 +690,7 @@ kind: Deployment
 metadata:
   name: example-checkoutservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-checkoutservice
     app.kubernetes.io/instance: example
@@ -790,7 +790,7 @@ kind: Deployment
 metadata:
   name: example-currencyservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-currencyservice
     app.kubernetes.io/instance: example
@@ -868,7 +868,7 @@ kind: Deployment
 metadata:
   name: example-emailservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-emailservice
     app.kubernetes.io/instance: example
@@ -948,7 +948,7 @@ kind: Deployment
 metadata:
   name: example-featureflagservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-featureflagservice
     app.kubernetes.io/instance: example
@@ -1048,7 +1048,7 @@ kind: Deployment
 metadata:
   name: example-ffspostgres
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-ffspostgres
     app.kubernetes.io/instance: example
@@ -1132,7 +1132,7 @@ kind: Deployment
 metadata:
   name: example-frauddetectionservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-frauddetectionservice
     app.kubernetes.io/instance: example
@@ -1214,7 +1214,7 @@ kind: Deployment
 metadata:
   name: example-frontend
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-frontend
     app.kubernetes.io/instance: example
@@ -1316,7 +1316,7 @@ kind: Deployment
 metadata:
   name: example-frontendproxy
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-frontendproxy
     app.kubernetes.io/instance: example
@@ -1420,7 +1420,7 @@ kind: Deployment
 metadata:
   name: example-kafka
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-kafka
     app.kubernetes.io/instance: example
@@ -1506,7 +1506,7 @@ kind: Deployment
 metadata:
   name: example-loadgenerator
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-loadgenerator
     app.kubernetes.io/instance: example
@@ -1596,7 +1596,7 @@ kind: Deployment
 metadata:
   name: example-paymentservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-paymentservice
     app.kubernetes.io/instance: example
@@ -1678,7 +1678,7 @@ kind: Deployment
 metadata:
   name: example-productcatalogservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-productcatalogservice
     app.kubernetes.io/instance: example
@@ -1758,7 +1758,7 @@ kind: Deployment
 metadata:
   name: example-quoteservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-quoteservice
     app.kubernetes.io/instance: example
@@ -1842,7 +1842,7 @@ kind: Deployment
 metadata:
   name: example-recommendationservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-recommendationservice
     app.kubernetes.io/instance: example
@@ -1928,7 +1928,7 @@ kind: Deployment
 metadata:
   name: example-redis
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-redis
     app.kubernetes.io/instance: example
@@ -2006,7 +2006,7 @@ kind: Deployment
 metadata:
   name: example-shippingservice
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example-shippingservice
     app.kubernetes.io/instance: example

charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml

@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-demo-0.22.3
+    helm.sh/chart: opentelemetry-demo-0.22.4
 
     opentelemetry.io/name: example
     app.kubernetes.io/instance: example