diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 074fe52956..e7d5db9bde 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.37.7 +version: 0.37.8 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 2068b454fb..cc9ac5c63c 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: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 resources: @@ -504,7 +533,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -572,7 +601,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -650,7 +679,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -737,7 +766,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -801,7 +830,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -865,7 +894,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -986,7 +1015,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1055,7 +1084,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1147,7 +1176,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1245,7 +1274,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1309,7 +1338,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1379,7 +1408,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1461,7 +1490,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1528,10 +1557,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: my-otel-collector.opentelemetry-ns + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1604,7 +1702,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1672,7 +1770,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1744,7 +1842,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1808,7 +1906,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart 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 index 5f394a524a..c94f39baae 100644 --- 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: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 89c4bd6172..75ec84dd01 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.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 8dc9d4bd05..0e432c8562 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: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 resources: @@ -504,7 +533,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -572,7 +601,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -650,7 +679,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -737,7 +766,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -801,7 +830,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -865,7 +894,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -986,7 +1015,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1055,7 +1084,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1147,7 +1176,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1245,7 +1274,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1309,7 +1338,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1379,7 +1408,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1461,7 +1490,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1528,10 +1557,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: $(OTEL_K8S_NODE_NAME) + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1604,7 +1702,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1672,7 +1770,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1744,7 +1842,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1808,7 +1906,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml index 5f394a524a..c94f39baae 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 9487f63773..bb418d04fa 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 @@ -6,7 +6,7 @@ metadata: name: grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 89c4bd6172..75ec84dd01 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.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 caf0b90edc..2ceda81645 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: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: TEAM_NAME value: orion - name: OTEL_RESOURCE_ATTRIBUTES @@ -506,7 +535,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -576,7 +605,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -656,7 +685,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -745,7 +774,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -811,7 +840,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -877,7 +906,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -998,7 +1027,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1069,7 +1098,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1163,7 +1192,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1261,7 +1290,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1325,7 +1354,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1395,7 +1424,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1479,7 +1508,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1548,10 +1577,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: otel-collector + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),app.eng.team=$(TEAM_NAME) + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1626,7 +1724,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1696,7 +1794,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1770,7 +1868,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1836,7 +1934,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml index 5f394a524a..c94f39baae 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 9487f63773..bb418d04fa 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 @@ -6,7 +6,7 @@ metadata: name: grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 89c4bd6172..75ec84dd01 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.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index e27acd8102..d1a179f523 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: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 resources: @@ -504,7 +533,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -572,7 +601,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -650,7 +679,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -737,7 +766,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -801,7 +830,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -865,7 +894,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -986,7 +1015,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1055,7 +1084,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1147,7 +1176,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1245,7 +1274,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1309,7 +1338,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1379,7 +1408,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1461,7 +1490,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1528,10 +1557,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: otel-collector + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1604,7 +1702,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1672,7 +1770,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1744,7 +1842,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1808,7 +1906,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml index 5f394a524a..c94f39baae 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 9487f63773..bb418d04fa 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/default/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/default/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/default/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/default/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/default/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 89c4bd6172..75ec84dd01 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.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml index e27acd8102..d1a179f523 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 resources: @@ -504,7 +533,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -572,7 +601,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -650,7 +679,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -737,7 +766,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -801,7 +830,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -865,7 +894,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -986,7 +1015,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1055,7 +1084,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1147,7 +1176,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1245,7 +1274,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1309,7 +1338,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1379,7 +1408,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1461,7 +1490,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1528,10 +1557,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: otel-collector + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1604,7 +1702,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1672,7 +1770,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1744,7 +1842,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1808,7 +1906,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml index 5f394a524a..c94f39baae 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml index 9487f63773..bb418d04fa 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml @@ -6,7 +6,7 @@ metadata: name: grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml index 89c4bd6172..75ec84dd01 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 8fa5eab5cb..79ac0f53c4 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: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -30,7 +30,7 @@ kind: Service metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -55,7 +55,7 @@ kind: Service metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -80,7 +80,7 @@ kind: Service metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -105,7 +105,7 @@ kind: Service metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -130,7 +130,7 @@ kind: Service metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -161,7 +161,7 @@ kind: Service metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -186,7 +186,7 @@ kind: Service metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -211,7 +211,7 @@ kind: Service metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -236,7 +236,7 @@ kind: Service metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -264,7 +264,7 @@ kind: Service metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -289,7 +289,7 @@ kind: Service metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -311,10 +311,35 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: v1 kind: Service +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5432 + name: postgresql + targetPort: 5432 + selector: + + opentelemetry.io/name: postgresql +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: v1 +kind: Service metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -339,7 +364,7 @@ kind: Service metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -364,7 +389,7 @@ kind: Service metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -389,7 +414,7 @@ kind: Service metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -414,7 +439,7 @@ kind: Service metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -439,7 +464,7 @@ kind: Deployment metadata: name: accounting labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: accounting @@ -483,6 +508,10 @@ spec: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 resources: @@ -504,7 +533,7 @@ kind: Deployment metadata: name: ad labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: ad @@ -572,7 +601,7 @@ kind: Deployment metadata: name: cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: cart @@ -650,7 +679,7 @@ kind: Deployment metadata: name: checkout labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: checkout @@ -737,7 +766,7 @@ kind: Deployment metadata: name: currency labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: currency @@ -801,7 +830,7 @@ kind: Deployment metadata: name: email labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: email @@ -865,7 +894,7 @@ kind: Deployment metadata: name: flagd labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: flagd @@ -986,7 +1015,7 @@ kind: Deployment metadata: name: fraud-detection labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: fraud-detection @@ -1055,7 +1084,7 @@ kind: Deployment metadata: name: frontend labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend @@ -1147,7 +1176,7 @@ kind: Deployment metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy @@ -1245,7 +1274,7 @@ kind: Deployment metadata: name: image-provider labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: image-provider @@ -1309,7 +1338,7 @@ kind: Deployment metadata: name: kafka labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: kafka @@ -1379,7 +1408,7 @@ kind: Deployment metadata: name: load-generator labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: load-generator @@ -1461,7 +1490,7 @@ kind: Deployment metadata: name: payment labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: payment @@ -1528,10 +1557,79 @@ spec: # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 kind: Deployment +metadata: + name: postgresql + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + + opentelemetry.io/name: postgresql + template: + metadata: + labels: + + opentelemetry.io/name: postgresql + + app.kubernetes.io/component: postgresql + app.kubernetes.io/name: postgresql + spec: + serviceAccountName: example + containers: + - name: postgresql + image: 'postgres:17.5' + imagePullPolicy: IfNotPresent + ports: + + - containerPort: 5432 + name: postgresql + env: + - name: OTEL_SERVICE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app.kubernetes.io/component'] + - name: OTEL_COLLECTOR_NAME + value: otel-collector + - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE + value: cumulative + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + - name: OTEL_RESOURCE_ATTRIBUTES + value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.0.2 + resources: + limits: + memory: 500Mi + volumeMounts: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + volumes: + - name: init + configMap: + name: postgresql-init +--- +# Source: opentelemetry-demo/templates/component.yaml +apiVersion: apps/v1 +kind: Deployment metadata: name: product-catalog labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: product-catalog @@ -1604,7 +1702,7 @@ kind: Deployment metadata: name: quote labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: quote @@ -1672,7 +1770,7 @@ kind: Deployment metadata: name: recommendation labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: recommendation @@ -1744,7 +1842,7 @@ kind: Deployment metadata: name: shipping labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: shipping @@ -1808,7 +1906,7 @@ kind: Deployment metadata: name: valkey-cart labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: valkey-cart @@ -1870,7 +1968,7 @@ kind: Ingress metadata: name: frontend-proxy labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 opentelemetry.io/name: frontend-proxy diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml index 5f394a524a..c94f39baae 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/flagd-config.yaml @@ -6,7 +6,7 @@ metadata: name: flagd-config namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 9487f63773..bb418d04fa 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 @@ -6,7 +6,7 @@ metadata: name: grafana-dashboards namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/postgresql-init-config.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/postgresql-init-config.yaml new file mode 100644 index 0000000000..07d24b655b --- /dev/null +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/postgresql-init-config.yaml @@ -0,0 +1,54 @@ +--- +# Source: opentelemetry-demo/templates/postgresql-init-config.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: default + labels: + helm.sh/chart: opentelemetry-demo-0.37.8 + + + app.kubernetes.io/version: "2.0.2" + app.kubernetes.io/part-of: opentelemetry-demo + app.kubernetes.io/managed-by: Helm +data: + + 01-init.sql: | + -- Copyright The OpenTelemetry Authors + -- SPDX-License-Identifier: Apache-2.0 + + CREATE USER otelu WITH PASSWORD 'otelp'; + + + -- Create a table + CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY + ); + + CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE + ); + + GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/product-catalog-products.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/product-catalog-products.yaml index 014022cd27..6fcaf6626a 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/product-catalog-products.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/product-catalog-products.yaml @@ -6,7 +6,7 @@ metadata: name: product-catalog-products namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" 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 89c4bd6172..75ec84dd01 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.37.7 + helm.sh/chart: opentelemetry-demo-0.37.8 app.kubernetes.io/version: "2.0.2" diff --git a/charts/opentelemetry-demo/postgresql-init/01-init.sql b/charts/opentelemetry-demo/postgresql-init/01-init.sql new file mode 100644 index 0000000000..d43f87ed4a --- /dev/null +++ b/charts/opentelemetry-demo/postgresql-init/01-init.sql @@ -0,0 +1,37 @@ +-- Copyright The OpenTelemetry Authors +-- SPDX-License-Identifier: Apache-2.0 + +CREATE USER otelu WITH PASSWORD 'otelp'; + + +-- Create a table +CREATE TABLE "order" ( + order_id TEXT PRIMARY KEY +); + +CREATE TABLE shipping ( + shipping_tracking_id TEXT PRIMARY KEY, + shipping_cost_currency_code TEXT NOT NULL, + shipping_cost_units BIGINT NOT NULL, + shipping_cost_nanos INT NOT NULL, + street_address TEXT, + city TEXT, + state TEXT, + country TEXT, + zip_code TEXT, + order_id TEXT NOT NULL, + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE +); + +CREATE TABLE orderitem ( + item_cost_currency_code TEXT NOT NULL, + item_cost_units BIGINT NOT NULL, + item_cost_nanos INT NOT NULL, + product_id TEXT NOT NULL, + quantity INT NOT NULL, + order_id TEXT NOT NULL, + PRIMARY KEY (order_id, product_id), + FOREIGN KEY (order_id) REFERENCES "order"(order_id) ON DELETE CASCADE +); + +GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO otelu; diff --git a/charts/opentelemetry-demo/templates/postgresql-init-config.yaml b/charts/opentelemetry-demo/templates/postgresql-init-config.yaml new file mode 100644 index 0000000000..bec62c1a2e --- /dev/null +++ b/charts/opentelemetry-demo/templates/postgresql-init-config.yaml @@ -0,0 +1,11 @@ +{{- if .Values.components.postgresql.enabled -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: postgresql-init + namespace: {{ .Release.Namespace }} + labels: + {{- include "otel-demo.labels" . | nindent 4 }} +data: + {{ (.Files.Glob "postgresql-init/*.sql").AsConfig | nindent 2 }} +{{- end -}} diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index 48243f9f6d..c0395b46bb 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -116,6 +116,9 @@ }, "valkey-cart": { "$ref": "#/definitions/Component" + }, + "postgresql": { + "$ref": "#/definitions/Component" } }, "title": "Components" diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index d892f40a89..58bb211039 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -175,6 +175,10 @@ components: value: kafka:9092 - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4318 + - name: DB_CONNECTION_STRING + value: Host=postgresql;Username=otelu;Password=otelp;Database=otel + - name: OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED + value: "false" resources: limits: memory: 120Mi @@ -691,6 +695,33 @@ components: runAsGroup: 1000 runAsNonRoot: true + postgresql: + enabled: true + useDefault: + env: true + imageOverride: + repository: postgres + tag: "17.5" + replicas: 1 + ports: + - name: postgresql + value: 5432 + env: + - name: POSTGRES_USER + value: root + - name: POSTGRES_PASSWORD + value: otel + - name: POSTGRES_DB + value: otel + resources: + limits: + memory: 500Mi + mountedConfigMaps: + - name: init + mountPath: /docker-entrypoint-initdb.d/ + existingConfigMap: postgresql-init + + opentelemetry-collector: enabled: true image: