diff --git a/packages/cloud2edge/Chart.yaml b/packages/cloud2edge/Chart.yaml index 62854f08..2578875d 100644 --- a/packages/cloud2edge/Chart.yaml +++ b/packages/cloud2edge/Chart.yaml @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: EPL-2.0 # -apiVersion: v1 -version: 0.7.0 -appVersion: 0.7.0 +apiVersion: v2 +version: 0.7.1 +appVersion: 0.7.1 name: cloud2edge description: | Eclipse IoT Cloud2Edge (C2E) is an integrated suite of services developers can use to build IoT applications @@ -33,8 +33,8 @@ maintainers: email: thomas.jaeckle@bosch.io dependencies: - name: hono - version: ~2.5.5 + version: ~2.5.6 repository: "https://eclipse.org/packages/charts/" - name: ditto - version: ~3.3.7 + version: ~3.4.0 repository: "oci://registry-1.docker.io/eclipse" diff --git a/packages/cloud2edge/README.md b/packages/cloud2edge/README.md index 5a4be224..519e2f5c 100644 --- a/packages/cloud2edge/README.md +++ b/packages/cloud2edge/README.md @@ -28,6 +28,10 @@ These profiles can be applied using the `-f` parameter when installing the packa ## Release Notes +### 0.7.1 + +- Update to Ditto 3.4.0 and Hono 2.5.6 chart versions. + ### 0.7.0 - [#505] Use Hono chart version 2.5.5. diff --git a/packages/cloud2edge/post-install/post-install.sh b/packages/cloud2edge/post-install/post-install.sh index c47898c9..743a6abd 100755 --- a/packages/cloud2edge/post-install/post-install.sh +++ b/packages/cloud2edge/post-install/post-install.sh @@ -13,7 +13,9 @@ #******************************************************************************* DITTO_DEVOPS_USER_PW="devops:$(cat /var/run/c2e/ditto-gw-users/devops-password)" -DEVICE_REGISTRY_BASE_URL="http://{{ include "c2e.hono.fullname" . }}-service-device-registry:8080/v1" +DEVICE_REGISTRY_URL_SCHEME="{{- if ( eq .Values.hono.deviceRegistryExample.hono.registry.http.insecurePortEnabled true ) }}http{{ else }}https{{ end }}" +DEVICE_REGISTRY_PORT=$([ "${DEVICE_REGISTRY_URL_SCHEME}" = "http" ] && echo "8080" || echo "8443") +DEVICE_REGISTRY_BASE_URL="${DEVICE_REGISTRY_URL_SCHEME}://{{ include "c2e.hono.fullname" . }}-service-device-registry:${DEVICE_REGISTRY_PORT}/v1" DITTO_CONNECTIONS_BASE_URL="http://{{ include "c2e.ditto.fullname" . }}-nginx:8080/api/2/connections" DITTO_THINGS_BASE_URL="http://{{ include "c2e.ditto.fullname" . }}-nginx:8080/api/2/things" @@ -47,7 +49,7 @@ add_hono_tenant(){ http_request_body="$2" echo "Adding tenant [$tenant_id]" - response_body_and_status=$(curl --silent --write-out "\n%{http_code}" \ + response_body_and_status=$(curl --silent --write-out "\n%{http_code}" -k \ -X POST --header 'Content-Type: application/json' \ --data-raw "$http_request_body" "$DEVICE_REGISTRY_BASE_URL/tenants/$tenant_id") check_status $? "$response_body_and_status" @@ -59,7 +61,7 @@ register_hono_device(){ http_request_body="$3" echo "Registering device [tenant: $tenant_id, device: $device_id]" - response_body_and_status=$(curl --silent --write-out "\n%{http_code}" \ + response_body_and_status=$(curl --silent --write-out "\n%{http_code}" -k \ -X POST --header 'Content-Type: application/json' \ --data-raw "$http_request_body" "$DEVICE_REGISTRY_BASE_URL/devices/$tenant_id/$device_id") check_status $? "$response_body_and_status" @@ -71,7 +73,7 @@ add_hono_device_credentials(){ http_request_body_file="$3" echo "Adding credentials [tenant: $tenant_id, device: $device_id]" - response_body_and_status=$(curl --silent --write-out "\n%{http_code}" \ + response_body_and_status=$(curl --silent --write-out "\n%{http_code}" -k \ -X PUT --header 'Content-Type: application/json' \ --data-binary "@$http_request_body_file" "$DEVICE_REGISTRY_BASE_URL/credentials/$tenant_id/$device_id") check_status $? "$response_body_and_status" diff --git a/packages/cloud2edge/profileTracing-values.yaml b/packages/cloud2edge/profileTracing-values.yaml index 131be824..370934ec 100644 --- a/packages/cloud2edge/profileTracing-values.yaml +++ b/packages/cloud2edge/profileTracing-values.yaml @@ -23,6 +23,7 @@ ditto: global: tracing: enabled: true + otelTraceReporterEnabled: true otelExporterOtlpEndpoint: 'http://{{ .Release.Name }}-hono-jaeger-collector:4317' ## the tracing sampler to use, one of: always, never, random, adaptive sampler: always