Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Helm updates to device-coap and device-bacnet for v3 C SDK #226

Merged
merged 1 commit into from
May 31, 2023
Merged

feat: Helm updates to device-coap and device-bacnet for v3 C SDK #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions deployment/helm/templates/configmaps/edgex-device-c-sdk-environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Copyright (C) 2022 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

# C SDK in EdgeX 3.0 does not yet support common config;
# Use env var override for what is normally in common config

apiVersion: v1
kind: ConfigMap
metadata:
name: edgex-device-c-sdk-environment
data:
CLIENTS_CORE_METADATA_HOST: edgex-core-metadata
DATABASE_HOST: edgex-redis
REGISTRY_HOST: edgex-core-consul
{{- if (eq .Values.edgex.features.messagebusbackend "redis") }}
MESSAGEBUS_HOST: edgex-redis
{{- end }}
{{- if (eq .Values.edgex.features.messagebusbackend "mqtt") }}
MESSAGEBUS_TYPE: mqtt
MESSAGEBUS_PROTOCOL: tcp
MESSAGEBUS_HOST: edgex-mqtt-broker
MESSAGEBUS_PORT: "1883"
{{- end }}
{{- if .Values.edgex.security.enabled }}
MESSAGEBUS_AUTHMODE: usernamepassword
MESSAGEBUS_SECRETNAME: message-bus
{{- else }}
MESSAGEBUS_AUTHMODE: none
{{- end }}
3 changes: 2 additions & 1 deletion deployment/helm/templates/edgex-device-bacnet/edgex-device-bacnet-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ spec:
- "/device-bacnet-ip/device-bacnet-c"
- "-cp=consul://edgex-core-consul:8500"
- "--registry"
- "--confdir=/res"
{{- end}}
ports:
- containerPort: {{.Values.edgex.port.device.bacnet}}
Expand All @@ -63,6 +62,8 @@ spec:
envFrom:
- configMapRef:
name: edgex-common-variables
- configMapRef:
name: edgex-device-c-sdk-environment
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down
3 changes: 2 additions & 1 deletion deployment/helm/templates/edgex-device-coap/edgex-device-coap-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ spec:
- "/device-coap"
- "-cp=consul://edgex-core-consul:8500"
- "--registry"
- "--confdir=/res"
{{- end}}
ports:
- containerPort: {{.Values.edgex.port.device.coap}}
Expand All @@ -63,6 +62,8 @@ spec:
envFrom:
- configMapRef:
name: edgex-common-variables
- configMapRef:
name: edgex-device-c-sdk-environment
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down
6 changes: 3 additions & 3 deletions deployment/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ edgex:
runAsUser: 2002
runAsGroup: 2001
tlsHost: edgex
addConsulRoles: "app-external-mqtt-trigger,app-http-export,app-metrics-influxdb,app-mqtt-export,app-rfid-llrp-inventory,app-sample,device-bacnet,device-coap,device-gpio,device-modbus,device-mqtt,device-onvif-camera,device-rfid-llrp,device-snmp,device-usb-camera"
addServiceTokens: "app-external-mqtt-trigger,app-http-export,app-metrics-influxdb,app-mqtt-export,app-rfid-llrp-inventory,app-sample,device-bacnet,device-coap,device-gpio,device-modbus,device-mqtt,device-onvif-camera,device-rest,device-rfid-llrp,device-snmp,device-usb-camera,device-virtual"
addKnownSecrets: "redisdb[app-external-mqtt-trigger;app-http-export;app-metrics-influxdb;app-mqtt-export;app-rfid-llrp-inventory;app-sample;device-bacnet;device-coap;device-gpio;device-modbus;device-mqtt;device-onvif-camera;device-rest;device-rfid-llrp;device-snmp;device-usb-camera;device-virtual],message-bus[app-external-mqtt-trigger;app-http-export;app-metrics-influxdb;app-mqtt-export;app-rfid-llrp-inventory;app-sample;device-bacnet;device-coap;device-gpio;device-modbus;device-mqtt;device-onvif-camera;device-rest;device-rfid-llrp;device-snmp;device-usb-camera;device-virtual]"
addConsulRoles: "app-external-mqtt-trigger,app-http-export,app-metrics-influxdb,app-mqtt-export,app-rfid-llrp-inventory,app-sample,device-bacnet-ip,device-coap,device-gpio,device-modbus,device-mqtt,device-onvif-camera,device-rfid-llrp,device-snmp,device-usb-camera"
addServiceTokens: "app-external-mqtt-trigger,app-http-export,app-metrics-influxdb,app-mqtt-export,app-rfid-llrp-inventory,app-sample,device-bacnet-ip,device-coap,device-gpio,device-modbus,device-mqtt,device-onvif-camera,device-rest,device-rfid-llrp,device-snmp,device-usb-camera,device-virtual"
addKnownSecrets: "redisdb[app-external-mqtt-trigger;app-http-export;app-metrics-influxdb;app-mqtt-export;app-rfid-llrp-inventory;app-sample;device-bacnet-ip;device-coap;device-gpio;device-modbus;device-mqtt;device-onvif-camera;device-rest;device-rfid-llrp;device-snmp;device-usb-camera;device-virtual],message-bus[app-external-mqtt-trigger;app-http-export;app-metrics-influxdb;app-mqtt-export;app-rfid-llrp-inventory;app-sample;device-bacnet-ip;device-coap;device-gpio;device-modbus;device-mqtt;device-onvif-camera;device-rest;device-rfid-llrp;device-snmp;device-usb-camera;device-virtual]"

# resources defines the cpu and memory limits and requests for the respective application
resources:
Expand Down