feat: Expose services on a per-service basis (#169)

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

Hide file tree

Showing 33 changed files with 70 additions and 36 deletions.
diff --git a/...lm/templates/edgex-app-external-mqtt-trigger/edgex-app-external-mqtt-trigger-service.yaml b/...lm/templates/edgex-app-external-mqtt-trigger/edgex-app-external-mqtt-trigger-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.externalmqtttrigger}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.externalmqtttrigger}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.externalmqtttrigger}}
diff --git a/deployment/helm/templates/edgex-app-http-export/edgex-app-http-export-service.yaml b/deployment/helm/templates/edgex-app-http-export/edgex-app-http-export-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.appservice.httpexport}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.httpexport}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.httpexport}}
 
diff --git a/deployment/helm/templates/edgex-app-metrics-influxdb/edgex-app-metrics-influxdb-service.yaml b/deployment/helm/templates/edgex-app-metrics-influxdb/edgex-app-metrics-influxdb-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.metricsinfluxdb}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.metricsinfluxdb}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.metricsinfluxdb}}
diff --git a/deployment/helm/templates/edgex-app-mqtt-export/edgex-app-mqtt-export-service.yaml b/deployment/helm/templates/edgex-app-mqtt-export/edgex-app-mqtt-export-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.mqttexport}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.mqttexport}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.mqttexport}}
diff --git a/...t/helm/templates/edgex-app-rfid-llrp-inventory/edgex-app-rfid-llrp-inventory-service.yaml b/...t/helm/templates/edgex-app-rfid-llrp-inventory/edgex-app-rfid-llrp-inventory-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.rfidllrpinventory}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.rfidllrpinventory}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.rfidllrpinventory}}
diff --git a/deployment/helm/templates/edgex-app-sample/edgex-app-sample-service.yaml b/deployment/helm/templates/edgex-app-sample/edgex-app-sample-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.appsample}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.appsample}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.appsample}}
diff --git a/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-service.yaml b/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.appservice.rules}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.appservice.rules}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.appservice.rules}}
diff --git a/deployment/helm/templates/edgex-consul/edgex-consul-service.yaml b/deployment/helm/templates/edgex-consul/edgex-consul-service.yaml
@@ -18,4 +18,4 @@ spec:
   {{- end }}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.consul}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.consul}}
diff --git a/deployment/helm/templates/edgex-core-command/edgex-core-command-service.yaml b/deployment/helm/templates/edgex-core-command/edgex-core-command-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.core.command}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.core.command}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.core.command}}
diff --git a/deployment/helm/templates/edgex-core-data/edgex-core-data-service.yaml b/deployment/helm/templates/edgex-core-data/edgex-core-data-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.core.data}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.core.data}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.core.data}}
diff --git a/deployment/helm/templates/edgex-device-bacnet/edgex-device-bacnet-service.yaml b/deployment/helm/templates/edgex-device-bacnet/edgex-device-bacnet-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.bacnet}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.bacnet}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.bacnet}}
 
diff --git a/deployment/helm/templates/edgex-device-gpio/edgex-device-gpio-service.yaml b/deployment/helm/templates/edgex-device-gpio/edgex-device-gpio-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.gpio}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.gpio}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.gpio}}
 
diff --git a/deployment/helm/templates/edgex-device-modbus/edgex-device-modbus-service.yaml b/deployment/helm/templates/edgex-device-modbus/edgex-device-modbus-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.modbus}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.modbus}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.modbus}}
 
diff --git a/deployment/helm/templates/edgex-device-mqtt/edgex-device-mqtt-service.yaml b/deployment/helm/templates/edgex-device-mqtt/edgex-device-mqtt-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.mqtt}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.mqtt}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.mqtt}}
 
diff --git a/deployment/helm/templates/edgex-device-onvif-camera/edgex-device-onvif-camera-service.yaml b/deployment/helm/templates/edgex-device-onvif-camera/edgex-device-onvif-camera-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.onvifcamera}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.onvifcamera}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.onvifcamera}}
 
diff --git a/deployment/helm/templates/edgex-device-rest/edgex-device-rest-service.yaml b/deployment/helm/templates/edgex-device-rest/edgex-device-rest-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.device.rest}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.rest}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.rest}}
diff --git a/deployment/helm/templates/edgex-device-rfid-llrp/edgex-device-rfid-llrp-service.yaml b/deployment/helm/templates/edgex-device-rfid-llrp/edgex-device-rfid-llrp-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.rfidllrp}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.rfidllrp}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.rfidllrp}}
 
diff --git a/deployment/helm/templates/edgex-device-snmp/edgex-device-snmp-service.yaml b/deployment/helm/templates/edgex-device-snmp/edgex-device-snmp-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.snmp}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.snmp}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.snmp}}
 
diff --git a/deployment/helm/templates/edgex-device-usb-camera/edgex-device-usb-camera-service.yaml b/deployment/helm/templates/edgex-device-usb-camera/edgex-device-usb-camera-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.onvifcamera}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.usbcamera}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.usbcamera}}
 
diff --git a/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-service.yaml b/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.device.virtual}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.device.virtual}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.device.virtual}}
 
diff --git a/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-service.yaml b/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.ekuiper}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.ekuiper}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.ekuiper}}
diff --git a/deployment/helm/templates/edgex-metadata/edgex-core-metadata-service.yaml b/deployment/helm/templates/edgex-metadata/edgex-core-metadata-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.core.metadata}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.core.metadata}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.core.metadata}}
 
diff --git a/deployment/helm/templates/edgex-modbus-simulator/edgex-modbus-simulator-service.yaml b/deployment/helm/templates/edgex-modbus-simulator/edgex-modbus-simulator-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.modbussimulator}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.modbussimulator}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.modbussimulator}}
 
diff --git a/deployment/helm/templates/edgex-mqtt-broker/edgex-mqtt-broker-service.yaml b/deployment/helm/templates/edgex-mqtt-broker/edgex-mqtt-broker-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.mqttbroker}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.mqttbroker}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.mqttbroker}}
 
diff --git a/deployment/helm/templates/edgex-nats-server/edgex-nats-server-service.yaml b/deployment/helm/templates/edgex-nats-server/edgex-nats-server-service.yaml
@@ -14,5 +14,5 @@ spec:
     port: {{.Values.edgex.port.natsserver}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.natsserver}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.natsserver}}
 
diff --git a/deployment/helm/templates/edgex-redis/edgex-redis-service.yaml b/deployment/helm/templates/edgex-redis/edgex-redis-service.yaml
@@ -14,6 +14,4 @@ spec:
       port: {{.Values.edgex.port.redis}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.redis}}
-  type: {{.Values.expose.type}}
-status:
-  loadBalancer: {}
+  type: {{.Values.expose.type.redis}}
diff --git a/...yment/helm/templates/edgex-security-bootstrapper/edgex-security-bootstrapper-service.yaml b/...yment/helm/templates/edgex-security-bootstrapper/edgex-security-bootstrapper-service.yaml
@@ -15,7 +15,7 @@ spec:
     port: {{ .Values.edgex.bootstrap.port.start }}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.bootstrapper}}
-  type: ClusterIP
+  type: {{.Values.expose.type.bootstrapper}}
   # Do not allocate cluster IP - point DNS directly at the Pod IP - ignore targetPort's
   clusterIP: None
 {{- end}}
diff --git a/...yment/helm/templates/edgex-support-notifications/edgex-support-notifications-service.yaml b/...yment/helm/templates/edgex-support-notifications/edgex-support-notifications-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.support.notifications}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.support.notifications}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.support.notifications}}
diff --git a/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-service.yaml b/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.support.scheduler}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.support.scheduler}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.support.scheduler}}
diff --git a/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-service.yaml b/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.system}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.system}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.system}}
diff --git a/deployment/helm/templates/edgex-ui/edgex-ui-service.yaml b/deployment/helm/templates/edgex-ui/edgex-ui-service.yaml
@@ -14,4 +14,4 @@ spec:
     port: {{.Values.edgex.port.ui}}
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.ui}}
-  type: {{.Values.expose.type}}
+  type: {{.Values.expose.type.ui}}
diff --git a/deployment/helm/templates/edgex-vault/edgex-vault-service.yaml b/deployment/helm/templates/edgex-vault/edgex-vault-service.yaml
@@ -15,5 +15,5 @@ spec:
     port: 8200
   selector:
     org.edgexfoundry.service: {{.Values.edgex.app.vault}}
-  type: ClusterIP
+  type: {{.Values.expose.type.vault}}
 {{- end}}
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -7,8 +7,44 @@
 # Declare variables to be passed into your templates.
 
 expose:
-  # Option value: ClusterIP/NodePort/LoadBalancer
-  type: ClusterIP
+  type:
+    # Option value: ClusterIP/NodePort/LoadBalancer
+    core:
+      command: ClusterIP
+      data:  ClusterIP
+      metadata: ClusterIP
+    support:
+      notifications: ClusterIP
+      scheduler: ClusterIP
+    appservice:
+      rules: ClusterIP
+      mqttexport: ClusterIP
+      httpexport: ClusterIP
+      appsample: ClusterIP
+      metricsinfluxdb: ClusterIP
+      rfidllrpinventory: ClusterIP
+      externalmqtttrigger: ClusterIP
+    device:
+      virtual: ClusterIP
+      rest: ClusterIP
+      usbcamera: ClusterIP
+      onvifcamera: ClusterIP
+      mqtt: ClusterIP
+      modbus: ClusterIP
+      bacnet: ClusterIP
+      snmp: ClusterIP
+      rfidllrp: ClusterIP
+      gpio: ClusterIP
+    ui: NodePort
+    system: ClusterIP
+    consul: NodePort
+    redis: ClusterIP
+    ekuiper: ClusterIP
+    modbussimulator: ClusterIP
+    mqttbroker: ClusterIP
+    natsserver: ClusterIP
+    bootstrapper: ClusterIP
+    vault: ClusterIP
 
 # edgex defines a set of configuration properties for application-level concerns
 edgex: