feat: Support optional hostPort binding (#167)

Signed-off-by: Kyle Morton <[email protected]> Signed-off-by: Kyle Morton <[email protected]> Co-authored-by: Kyle Morton <[email protected]>
edgexfoundry · Dec 12, 2022 · 719a913 · 719a913
1 parent 13d9bfd
commit 719a913
Show file tree

Hide file tree

Showing 31 changed files with 61 additions and 0 deletions.
diff --git a/...templates/edgex-app-external-mqtt-trigger/edgex-app-external-mqtt-trigger-deployment.yaml b/...templates/edgex-app-external-mqtt-trigger/edgex-app-external-mqtt-trigger-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.externalmqtttrigger}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.externalmqtttrigger}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-app-http-export/edgex-app-http-export-deployment.yaml b/deployment/helm/templates/edgex-app-http-export/edgex-app-http-export-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.httpexport}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.httpexport}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
           - name: EDGEX_PROFILE

diff --git a/...ment/helm/templates/edgex-app-metrics-influxdb/edgex-app-metrics-influxdb-deployment.yaml b/...ment/helm/templates/edgex-app-metrics-influxdb/edgex-app-metrics-influxdb-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.metricsinfluxdb}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.metricsinfluxdb}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-app-mqtt-export/edgex-app-mqtt-export-deployment.yaml b/deployment/helm/templates/edgex-app-mqtt-export/edgex-app-mqtt-export-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.mqttexport}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.mqttexport}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/...elm/templates/edgex-app-rfid-llrp-inventory/edgex-app-rfid-llrp-inventory-deployment.yaml b/...elm/templates/edgex-app-rfid-llrp-inventory/edgex-app-rfid-llrp-inventory-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.rfidllrpinventory}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.rfidllrpinventory}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-app-sample/edgex-app-sample-deployment.yaml b/deployment/helm/templates/edgex-app-sample/edgex-app-sample-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.appsample}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.appsample}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-deployment.yaml b/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.appservice.rules}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.appservice.rules}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-consul/edgex-consul-deployment.yaml b/deployment/helm/templates/edgex-consul/edgex-consul-deployment.yaml
@@ -40,8 +40,10 @@ spec:
         args: ["agent", "-ui", "-bootstrap", "-server", "-client", "0.0.0.0"]
         ports:
         - containerPort: {{.Values.edgex.port.consul}}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.consul}}
           hostIP: {{.Values.edgex.hostPortExternalBind}}
+        {{- end}}
       {{- if .Values.edgex.security.enabled }}
         env:
         - name: EDGEX_USER

diff --git a/deployment/helm/templates/edgex-core-command/edgex-core-command-deployment.yaml b/deployment/helm/templates/edgex-core-command/edgex-core-command-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.core.command}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.core.command}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-core-data/edgex-core-data-deployment.yaml b/deployment/helm/templates/edgex-core-data/edgex-core-data-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.core.data}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.core.data}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-bacnet/edgex-device-bacnet-deployment.yaml b/deployment/helm/templates/edgex-device-bacnet/edgex-device-bacnet-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.bacnet}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.bacnet}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
           - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-gpio/edgex-device-gpio-deployment.yaml b/deployment/helm/templates/edgex-device-gpio/edgex-device-gpio-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.gpio}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.gpio}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-modbus/edgex-device-modbus-deployment.yaml b/deployment/helm/templates/edgex-device-modbus/edgex-device-modbus-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.modbus}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.modbus}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
           - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-mqtt/edgex-device-mqtt-deployment.yaml b/deployment/helm/templates/edgex-device-mqtt/edgex-device-mqtt-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.mqtt}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.mqtt}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/...oyment/helm/templates/edgex-device-onvif-camera/edgex-device-onvif-camera-deployment.yaml b/...oyment/helm/templates/edgex-device-onvif-camera/edgex-device-onvif-camera-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.onvifcamera}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.onvifcamera}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-rest/edgex-device-rest-deployment.yaml b/deployment/helm/templates/edgex-device-rest/edgex-device-rest-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.rest}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.rest}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-rfid-llrp/edgex-device-rfid-llrp-deployment.yaml b/deployment/helm/templates/edgex-device-rfid-llrp/edgex-device-rfid-llrp-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.rfidllrp}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.rfidllrp}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
           - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-snmp/edgex-device-snmp-deployment.yaml b/deployment/helm/templates/edgex-device-snmp/edgex-device-snmp-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.snmp}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.snmp}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
           - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-usb-camera/edgex-device-usb-camera-deployment.yaml b/deployment/helm/templates/edgex-device-usb-camera/edgex-device-usb-camera-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.usbcamera}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.usbcamera}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-deployment.yaml b/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.device.virtual}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.device.virtual}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-deployment.yaml b/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-deployment.yaml
@@ -50,8 +50,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.ekuiper}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.ekuiper}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
 #        - name: KUIPER__BASIC__DEBUG

diff --git a/deployment/helm/templates/edgex-metadata/edgex-core-metadata-deployment.yaml b/deployment/helm/templates/edgex-metadata/edgex-core-metadata-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.core.metadata}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.core.metadata}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-modbus-simulator/edgex-modbus-simulator-deployment.yaml b/deployment/helm/templates/edgex-modbus-simulator/edgex-modbus-simulator-deployment.yaml
@@ -28,8 +28,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.modbussimulator}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.modbussimulator}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         securityContext:
           allowPrivilegeEscalation: false

diff --git a/deployment/helm/templates/edgex-mqtt-broker/edgex-mqtt-broker-deployment.yaml b/deployment/helm/templates/edgex-mqtt-broker/edgex-mqtt-broker-deployment.yaml
@@ -32,8 +32,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.mqttbroker}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.mqttbroker}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         securityContext:
           allowPrivilegeEscalation: false

diff --git a/deployment/helm/templates/edgex-nats-server/edgex-nats-server-deployment.yaml b/deployment/helm/templates/edgex-nats-server/edgex-nats-server-deployment.yaml
@@ -28,8 +28,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.natsserver}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.natsserver}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         securityContext:
           allowPrivilegeEscalation: false

diff --git a/...nt/helm/templates/edgex-support-notifications/edgex-support-notifications-deployment.yaml b/...nt/helm/templates/edgex-support-notifications/edgex-support-notifications-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.support.notifications}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.support.notifications}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         env:
         - name: SERVICE_HOST

diff --git a/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-deployment.yaml b/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.support.scheduler}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.support.scheduler}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-deployment.yaml b/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{.Values.edgex.port.system}}
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.system}}
           hostIP: {{.Values.edgex.hostPortInternalBind}}
+        {{- end}}
       {{- end}}
         envFrom:
         - configMapRef:

diff --git a/deployment/helm/templates/edgex-ui/edgex-ui-deployment.yaml b/deployment/helm/templates/edgex-ui/edgex-ui-deployment.yaml
@@ -27,8 +27,10 @@ spec:
         imagePullPolicy: {{.Values.edgex.image.ui.pullPolicy}}
         ports:
         - containerPort: {{.Values.edgex.port.ui}}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: {{.Values.edgex.port.ui}}
           hostIP: {{.Values.edgex.hostPortExternalBind}}
+        {{- end}}
         env:
         - name: EDGEX_SECURITY_SECRET_STORE
       {{- if .Values.edgex.security.enabled }}

diff --git a/deployment/helm/templates/edgex-vault/edgex-vault-deployment.yaml b/deployment/helm/templates/edgex-vault/edgex-vault-deployment.yaml
@@ -56,8 +56,10 @@ spec:
         ports:
         - containerPort: 8200
       {{- if not .Values.edgex.security.enabled }}
+        {{- if .Values.edgex.features.enableHostPort}}
           hostPort: 8200
           hostIP: 0.0.0.0
+        {{- end}}
       {{- end}}
         env:
         - name: VAULT_ADDR

diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -580,3 +580,4 @@ edgex:
     mqttBrokerAddress: ""
     # Writable pipeline functions HTTP export parameter URL
     httpExportURL: ""
+    enableHostPort: false