From 5a683df27c9c980134426602d1520978d513f2ea Mon Sep 17 00:00:00 2001 From: Anton Ovchinnikov Date: Tue, 3 Jan 2023 20:39:30 +0100 Subject: [PATCH] [opentelemetry-demo] Fix schedulingRules handling for demo components (#575) --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../examples/default/rendered/component.yaml | 72 +++++++++--------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../rendered/component.yaml | 74 +++++++++---------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-demo/templates/_objects.tpl | 15 ++-- 6 files changed, 83 insertions(+), 84 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 7f0dfdea1..72d0bef5a 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.15.2 +version: 0.15.3 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index a174f26eb..350cd5890 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.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: adservice @@ -29,7 +29,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice @@ -53,7 +53,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice @@ -77,7 +77,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice @@ -101,7 +101,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice @@ -125,7 +125,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice @@ -152,7 +152,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres @@ -176,7 +176,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontend @@ -200,7 +200,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy @@ -224,7 +224,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: kafka @@ -251,7 +251,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator @@ -275,7 +275,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice @@ -299,7 +299,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice @@ -323,7 +323,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice @@ -347,7 +347,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice @@ -371,7 +371,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: redis @@ -395,7 +395,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice @@ -419,7 +419,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice @@ -482,7 +482,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: adservice @@ -547,7 +547,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice @@ -616,7 +616,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice @@ -695,7 +695,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice @@ -762,7 +762,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice @@ -833,7 +833,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice @@ -906,7 +906,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres @@ -979,7 +979,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice @@ -1042,7 +1042,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontend @@ -1125,7 +1125,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy @@ -1216,7 +1216,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: kafka @@ -1263,7 +1263,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator @@ -1344,7 +1344,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice @@ -1409,7 +1409,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice @@ -1476,7 +1476,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice @@ -1553,7 +1553,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice @@ -1626,7 +1626,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: redis @@ -1691,7 +1691,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 22a0e3383..fbc032416 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.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/version: "1.2.1" 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 3f5984de2..80db6cbc0 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.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: adservice @@ -29,7 +29,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice @@ -53,7 +53,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice @@ -77,7 +77,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice @@ -101,7 +101,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice @@ -125,7 +125,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice @@ -152,7 +152,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres @@ -176,7 +176,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontend @@ -200,7 +200,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy @@ -224,7 +224,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: kafka @@ -251,7 +251,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator @@ -275,7 +275,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice @@ -299,7 +299,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice @@ -323,7 +323,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice @@ -347,7 +347,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice @@ -371,7 +371,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: redis @@ -395,7 +395,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice @@ -419,7 +419,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice @@ -482,7 +482,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: adservice @@ -547,7 +547,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice @@ -616,7 +616,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice @@ -695,7 +695,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice @@ -762,7 +762,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice @@ -833,7 +833,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice @@ -906,7 +906,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres @@ -979,7 +979,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice @@ -1042,7 +1042,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontend @@ -1125,7 +1125,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy @@ -1216,7 +1216,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: kafka @@ -1263,7 +1263,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator @@ -1344,7 +1344,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice @@ -1409,7 +1409,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice @@ -1476,7 +1476,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice @@ -1553,7 +1553,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice @@ -1626,7 +1626,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: redis @@ -1691,7 +1691,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice @@ -1762,7 +1762,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy 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 22a0e3383..fbc032416 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.15.2 + helm.sh/chart: opentelemetry-demo-0.15.3 app.kubernetes.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/version: "1.2.1" diff --git a/charts/opentelemetry-demo/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index cf5561e04..88711fa26 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -26,19 +26,18 @@ spec: {{- with .serviceAccountName }} serviceAccountName: {{ .serviceAccountName}} {{- end }} - {{- if .schedulingRules }} - {{- if or .defaultValues.schedulingRules.nodeSelector .schedulingRules.nodeSelector}} + {{- $schedulingRules := .schedulingRules | default dict }} + {{- if or .defaultValues.schedulingRules.nodeSelector $schedulingRules.nodeSelector}} nodeSelector: - {{- .schedulingRules.nodeSelector | default .defaultValues.schedulingRules.nodeSelector | toYaml | nindent 8 }} + {{- $schedulingRules.nodeSelector | default .defaultValues.schedulingRules.nodeSelector | toYaml | nindent 8 }} {{- end }} - {{- if or .defaultValues.schedulingRules.affinity .schedulingRules.affinity}} + {{- if or .defaultValues.schedulingRules.affinity $schedulingRules.affinity}} affinity: - {{- .schedulingRules.affinity | default .defaultValues.schedulingRules.affinity | toYaml | nindent 8 }} + {{- $schedulingRules.affinity | default .defaultValues.schedulingRules.affinity | toYaml | nindent 8 }} {{- end }} - {{- if or .defaultValues.schedulingRules.tolerations .schedulingRules.tolerations}} + {{- if or .defaultValues.schedulingRules.tolerations $schedulingRules.tolerations}} tolerations: - {{- .schedulingRules.tolerations | default .defaultValues.schedulingRules.tolerations | toYaml | nindent 8 }} - {{- end }} + {{- $schedulingRules.tolerations | default .defaultValues.schedulingRules.tolerations | toYaml | nindent 8 }} {{- end }} containers: - name: {{ .name }}