diff --git a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json index 7b4592b9da6..fed055bc304 100644 --- a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json +++ b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json @@ -11,6 +11,97 @@ } ], "components": [ + { + "name": "edgex-core-command", + "service": { + "ports": [ + { + "name": "tcp-59882", + "protocol": "TCP", + "port": 59882, + "targetPort": 59882 + } + ], + "selector": { + "app": "edgex-core-command" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-command" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-command" + } + }, + "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "FileOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-core-command", + "image": "openyurt/core-command:3.1.1", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-command" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-command" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + }, { "name": "edgex-kuiper", "service": { @@ -45,7 +136,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { @@ -68,7 +159,7 @@ "containers": [ { "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.11.4-alpine", + "image": "openyurt/ekuiper:1.11.5-alpine", "ports": [ { "name": "tcp-59720", @@ -85,32 +176,20 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", "value": "6379" }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, { "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { "name": "KUIPER__BASIC__RESTPORT", @@ -124,6 +203,18 @@ "name": "EDGEX__DEFAULT__PORT", "value": "6379" }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, { "name": "EDGEX__DEFAULT__SERVER", "value": "edgex-redis" @@ -167,31 +258,31 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59881", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "spec": { @@ -200,18 +291,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:3.1.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:3.1.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -229,7 +320,7 @@ }, { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-metadata" } ], "resources": {}, @@ -242,7 +333,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -254,31 +345,31 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59986", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "spec": { @@ -287,18 +378,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:3.1.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:3.1.1", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -310,21 +401,13 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, { "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, @@ -337,7 +420,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -349,31 +432,31 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59880", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "spec": { @@ -382,18 +465,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:3.1.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:3.1.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -406,16 +489,12 @@ ], "env": [ { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" }, { "name": "SERVICE_HOST", - "value": "edgex-core-command" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "value": "edgex-core-data" } ], "resources": {}, @@ -428,7 +507,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-data" } }, "strategy": { @@ -440,18 +519,31 @@ } }, { - "name": "edgex-core-common-config-bootstrapper", + "name": "edgex-app-rules-engine", + "service": { + "ports": [ + { + "name": "tcp-59701", + "protocol": "TCP", + "port": 59701, + "targetPort": 59701 + } + ], + "selector": { + "app": "edgex-app-rules-engine" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -460,14 +552,21 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "openyurt/core-common-config-bootstrapper:3.1.0", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:3.1.1", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -477,119 +576,20 @@ ], "env": [ { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" }, { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" - }, - { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-common-config-bootstrapper" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-core-data", - "service": { - "ports": [ - { - "name": "tcp-59880", - "protocol": "TCP", - "port": 59880, - "targetPort": 59880 - } - ], - "selector": { - "app": "edgex-core-data" - } - }, - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-core-data" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-core-data" - } - }, - "spec": { - "volumes": [ - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/etc/localtime", - "type": "DirectoryOrCreate" - } - } - ], - "containers": [ - { - "name": "edgex-core-data", - "image": "openyurt/core-data:3.1.0", - "ports": [ - { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-data" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "EDGEX_PROFILE", + "value": "rules-engine" + } + ], + "resources": {}, + "volumeMounts": [ { "name": "anonymous-volume1", "mountPath": "/etc/localtime" @@ -598,7 +598,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -651,7 +651,7 @@ "containers": [ { "name": "edgex-core-consul", - "image": "openyurt/consul:1.16.2", + "image": "openyurt/consul:1.16.6", "ports": [ { "name": "tcp-8500", @@ -692,31 +692,31 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59900", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "spec": { @@ -725,18 +725,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:3.1.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:3.1.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -754,11 +754,7 @@ }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -771,7 +767,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -783,31 +779,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-4000", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "spec": { @@ -816,18 +812,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:3.1.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:3.1.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -845,7 +841,7 @@ }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-ui-go" } ], "resources": {}, @@ -858,7 +854,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -870,31 +866,31 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59861", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "spec": { @@ -903,18 +899,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:3.1.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:3.1.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -930,9 +926,17 @@ "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-scheduler" } ], "resources": {}, @@ -945,7 +949,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -994,7 +998,7 @@ "containers": [ { "name": "edgex-redis", - "image": "openyurt/redis:7.0.14-alpine", + "image": "openyurt/redis:7.0.15-alpine", "ports": [ { "name": "tcp-6379", @@ -1031,31 +1035,31 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59860", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-support-notifications" } }, "spec": { @@ -1064,18 +1068,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:3.1.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:3.1.1", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -1088,12 +1092,12 @@ ], "env": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" }, { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, @@ -1106,7 +1110,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -1118,31 +1122,18 @@ } }, { - "name": "edgex-device-virtual", - "service": { - "ports": [ - { - "name": "tcp-59900", - "protocol": "TCP", - "port": 59900, - "targetPort": 59900 - } - ], - "selector": { - "app": "edgex-device-virtual" - } - }, + "name": "edgex-core-common-config-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-common-config-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-common-config-bootstrapper" } }, "spec": { @@ -1151,21 +1142,14 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:3.1.0", - "ports": [ - { - "name": "tcp-59900", - "containerPort": 59900, - "protocol": "TCP" - } - ], + "name": "edgex-core-common-config-bootstrapper", + "image": "openyurt/core-common-config-bootstrapper:3.1.1", "envFrom": [ { "configMapRef": { @@ -1175,16 +1159,32 @@ ], "env": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" }, { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" + }, + { + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" + } + ], + "resources": {}, + "volumeMounts": [ { "name": "anonymous-volume1", "mountPath": "/etc/localtime" @@ -1193,7 +1193,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": { @@ -1229,53 +1229,42 @@ ], "components": [ { - "name": "edgex-core-data", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.2.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.2.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -1289,14 +1278,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -1308,42 +1297,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59881", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.2.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.2.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -1355,16 +1344,20 @@ } ], "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -1376,42 +1369,42 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59900", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.2.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.2.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -1422,11 +1415,17 @@ } } ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" + } + ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -1491,6 +1490,14 @@ } ], "env": [ + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, { "name": "EDGEX__DEFAULT__TOPIC", "value": "rules-events" @@ -1500,40 +1507,32 @@ "value": "redis" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { "name": "KUIPER__BASIC__CONSOLELOG", "value": "true" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", "value": "edgex-redis" }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, { "name": "EDGEX__DEFAULT__TYPE", "value": "redis" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" } ], "resources": {}, @@ -1558,42 +1557,42 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59882", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.2.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.2.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -1605,24 +1604,16 @@ } ], "env": [ - { - "name": "METRICSMECHANISM", - "value": "executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-command" } }, "strategy": { @@ -1634,42 +1625,42 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59861", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.2.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.2.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -1682,19 +1673,23 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -1706,42 +1701,42 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-58890", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.2.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.2.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -1755,14 +1750,22 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -1774,42 +1777,48 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-6379", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.2.0", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.6-alpine", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -1820,29 +1829,17 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, + "resources": {}, + "volumeMounts": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-redis" } }, "strategy": { @@ -1854,52 +1851,42 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59701", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.10", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.2.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -1910,21 +1897,29 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -1936,42 +1931,53 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-5563", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.2.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.2.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -1985,14 +1991,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-data" } }, "strategy": { @@ -2004,42 +2010,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-4000", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.2.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.2.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -2050,17 +2056,11 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-command" - } - ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -2072,42 +2072,52 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-8500", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.2.0", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.10", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -2118,25 +2128,21 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, + "resources": {}, + "volumeMounts": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "consul-data", + "mountPath": "/consul/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -2148,48 +2154,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59860", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.6-alpine", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.2.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -2200,17 +2200,17 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" - } + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -2246,42 +2246,42 @@ ], "components": [ { - "name": "edgex-support-notifications", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59882", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.1.1", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.1.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -2295,14 +2295,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-command" } }, "strategy": { @@ -2367,6 +2367,10 @@ } ], "env": [ + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, { "name": "EDGEX__DEFAULT__TYPE", "value": "redis" @@ -2376,39 +2380,35 @@ "value": "true" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { "name": "EDGEX__DEFAULT__TOPIC", "value": "rules-events" }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, { "name": "EDGEX__DEFAULT__PORT", "value": "6379" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" } ], @@ -2434,42 +2434,42 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59986", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.1.1", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.1.1", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -2481,24 +2481,16 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -2510,42 +2502,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-4000", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.1.1", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.1.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -2556,17 +2548,11 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" - } - ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -2578,42 +2564,42 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59701", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-app-rules-engine" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.1.1", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.1.2", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -2625,16 +2611,28 @@ } ], "env": [ + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-app-rules-engine" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -2646,42 +2644,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59860", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.1.1", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.1.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -2695,14 +2693,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -2714,42 +2712,42 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59861", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.1.1", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.1.1", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -2762,23 +2760,23 @@ ], "env": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -2790,52 +2788,42 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59881", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.3", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.1.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -2846,21 +2834,21 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -2872,42 +2860,48 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-6379", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.1.1", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.6-alpine", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -2918,21 +2912,17 @@ } } ], - "env": [ - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - }, + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-redis" } }, "strategy": { @@ -2944,48 +2934,52 @@ } }, { - "name": "edgex-redis", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-8500", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "db-data", + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.6-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.3", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -2999,14 +2993,18 @@ "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -3018,42 +3016,42 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59900", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.1.2", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.1.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -3065,28 +3063,16 @@ } ], "env": [ - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -3098,42 +3084,42 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-58890", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.1.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.1.1", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -3144,11 +3130,25 @@ } } ], + "env": [ + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" + } + ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -3263,42 +3263,53 @@ ], "components": [ { - "name": "edgex-device-virtual", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-5563", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.3.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.3.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -3312,14 +3323,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-data" } }, "strategy": { @@ -3399,42 +3410,42 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59882", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.3.1", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.3.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -3448,18 +3459,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "value": "edgex-core-command" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "MESSAGEQUEUE_EXTERNAL_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "name": "MESSAGEQUEUE_INTERNAL_HOST", "value": "edgex-redis" } ], @@ -3467,7 +3474,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-command" } }, "strategy": { @@ -3479,48 +3486,42 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-59701", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } + "port": 59701, + "targetPort": 59701 + } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-app-rules-engine" } }, "spec": { - "volumes": [ - { - "name": "kuiper-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.7.1-alpine", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -3533,61 +3534,27 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", "value": "edgex-redis" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", "value": "edgex-redis" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -3599,42 +3566,52 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-8500", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.3.0", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.13.2", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -3645,21 +3622,21 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "consul-data", + "mountPath": "/consul/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -3671,42 +3648,48 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-6379", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.3.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.5-alpine", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -3717,25 +3700,17 @@ } } ], - "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-redis" } }, "strategy": { @@ -3747,52 +3722,48 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59720", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", + "name": "kuiper-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.13.2", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.7.1-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -3803,21 +3774,63 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -3829,53 +3842,42 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-58890", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.3.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.3.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -3887,16 +3889,24 @@ } ], "env": [ + { + "name": "METRICSMECHANISM", + "value": "executor" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -3908,42 +3918,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59861", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.3.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.3.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -3955,16 +3965,24 @@ } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -3976,42 +3994,42 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59986", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.3.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.3.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -4025,14 +4043,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -4044,48 +4062,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59900", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:7.0.5-alpine", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.3.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -4096,17 +4108,17 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -4118,42 +4130,42 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59881", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.3.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.3.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -4166,23 +4178,19 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -4194,42 +4202,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59860", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.3.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.3.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -4242,23 +4250,96 @@ ], "env": [ { - "name": "MESSAGEQUEUE_INTERNAL_HOST", + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-notifications" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + } + ] + }, + { + "versionName": "minnesota", + "configMaps": [ + { + "metadata": { + "name": "common-variables", + "creationTimestamp": null + } + } + ], + "components": [ + { + "name": "edgex-core-common-config-bootstrapper", + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-common-config-bootstrapper" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-common-config-bootstrapper" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-core-common-config-bootstrapper", + "image": "openyurt/core-common-config-bootstrapper:3.0.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" + }, + { + "name": "ALL_SERVICES_MESSAGEBUS_HOST", "value": "edgex-redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" }, { - "name": "MESSAGEQUEUE_EXTERNAL_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": { @@ -4268,67 +4349,44 @@ } } } - } - ] - }, - { - "versionName": "minnesota", - "configMaps": [ - { - "metadata": { - "name": "common-variables", - "creationTimestamp": null - } - } - ], - "components": [ + }, { - "name": "edgex-core-consul", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59900", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.15.2", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:3.0.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -4339,21 +4397,21 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -4365,52 +4423,42 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-59986", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "spec": { - "volumes": [ - { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-log", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.9.2-alpine", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:3.0.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -4423,65 +4471,19 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-log", - "mountPath": "/kuiper/log" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -4493,42 +4495,48 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-6379", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:3.0.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.11-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -4539,29 +4547,17 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, + "resources": {}, + "volumeMounts": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-redis" } }, "strategy": { @@ -4573,42 +4569,42 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59881", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:3.0.1", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:3.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -4620,24 +4616,20 @@ } ], "env": [ - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, { "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -4649,42 +4641,42 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59701", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-app-rules-engine" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:3.0.0", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:3.0.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -4697,19 +4689,23 @@ ], "env": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -4721,48 +4717,52 @@ } }, { - "name": "edgex-redis", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-8500", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "db-data", + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:7.0.11-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.15.2", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -4776,14 +4776,18 @@ "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -4795,42 +4799,42 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59882", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:3.0.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:3.0.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -4844,18 +4848,22 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-command" }, { "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" + }, + { + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-command" } }, "strategy": { @@ -4914,13 +4922,13 @@ } ], "env": [ - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" - }, { "name": "SERVICE_HOST", "value": "edgex-support-notifications" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, @@ -4939,42 +4947,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-4000", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:3.0.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:3.0.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -4988,22 +4996,18 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-ui-go" }, { "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" - }, - { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -5015,25 +5019,55 @@ } }, { - "name": "edgex-core-common-config-bootstrapper", + "name": "edgex-kuiper", + "service": { + "ports": [ + { + "name": "tcp-59720", + "protocol": "TCP", + "port": 59720, + "targetPort": 59720 + } + ], + "selector": { + "app": "edgex-kuiper" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-kuiper" } }, "spec": { + "volumes": [ + { + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "openyurt/core-common-config-bootstrapper:3.0.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.9.2-alpine", + "ports": [ + { + "name": "tcp-59720", + "containerPort": 59720, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -5043,107 +5077,65 @@ ], "env": [ { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" }, { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" }, { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" }, { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-common-config-bootstrapper" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-device-rest", - "service": { - "ports": [ - { - "name": "tcp-59986", - "protocol": "TCP", - "port": 59986, - "targetPort": 59986 - } - ], - "selector": { - "app": "edgex-device-rest" - } - }, - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-device-rest" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-device-rest" - } - }, - "spec": { - "containers": [ - { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:3.0.0", - "ports": [ + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, { - "name": "tcp-59986", - "containerPort": 59986, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, { - "configMapRef": { - "name": "common-variables" - } + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "kuiper-data", + "mountPath": "/kuiper/data" }, { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "name": "kuiper-log", + "mountPath": "/kuiper/log" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -5202,13 +5194,13 @@ } ], "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-data" - }, { "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -5227,42 +5219,42 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59861", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:3.0.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:3.0.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -5278,16 +5270,24 @@ "name": "EDGEX_SECURITY_SECRET_STORE", "value": "false" }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -5323,42 +5323,42 @@ ], "components": [ { - "name": "edgex-core-metadata", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59861", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.0.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.0.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -5371,19 +5371,23 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -5395,42 +5399,42 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59882", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.0.1", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -5442,28 +5446,16 @@ } ], "env": [ - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-command" } }, "strategy": { @@ -5475,42 +5467,53 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-5563", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.0.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.0.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -5524,22 +5527,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-data" } }, "strategy": { @@ -5551,53 +5546,42 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.0.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.0.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -5611,14 +5595,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -5630,42 +5614,48 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59720", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-kuiper" } }, "spec": { + "volumes": [ + { + "name": "kuiper-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.0.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.3.0-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -5678,23 +5668,45 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -5706,42 +5718,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59860", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.0.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.0.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -5755,14 +5767,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -5774,42 +5786,42 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-58890", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.0.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -5821,16 +5833,24 @@ } ], "env": [ + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -5842,42 +5862,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59701", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.0.0", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.0.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -5891,14 +5911,26 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -5910,48 +5942,52 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-8500", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "kuiper-data", + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.3.0-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.9.5", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -5962,47 +5998,21 @@ } } ], - "env": [ - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - } - ], "resources": {}, "volumeMounts": [ { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -6014,48 +6024,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59900", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.4-alpine", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -6066,17 +6070,17 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -6088,42 +6092,42 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59881", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.0.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.0.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -6135,16 +6139,20 @@ } ], "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -6156,52 +6164,48 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-6379", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "spec": { "volumes": [ { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", + "name": "db-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.9.5", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.4-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -6215,18 +6219,14 @@ "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "db-data", + "mountPath": "/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-redis" } }, "strategy": { @@ -6266,42 +6266,42 @@ ], "components": [ { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-48090", + "name": "tcp-49986", "protocol": "TCP", - "port": 48090, - "targetPort": 48090 + "port": 49986, + "targetPort": 49986 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/docker-sys-mgmt-agent-go:1.3.1", + "name": "edgex-device-rest", + "image": "openyurt/docker-device-rest-go:1.2.1", "ports": [ { - "name": "tcp-48090", - "containerPort": 48090, + "name": "tcp-49986", + "containerPort": 49986, "protocol": "TCP" } ], @@ -6315,22 +6315,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -6342,42 +6334,48 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-49990", + "name": "tcp-6379", "protocol": "TCP", - "port": 49990, - "targetPort": 49990 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/docker-device-virtual-go:1.3.1", + "name": "edgex-redis", + "image": "openyurt/redis:6.0.9-alpine", "ports": [ { - "name": "tcp-49990", - "containerPort": 49990, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -6388,17 +6386,17 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-redis" } }, "strategy": { @@ -6410,42 +6408,42 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-48081", + "name": "tcp-48060", "protocol": "TCP", - "port": 48081, - "targetPort": 48081 + "port": 48060, + "targetPort": 48060 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/docker-core-metadata-go:1.3.1", + "name": "edgex-support-notifications", + "image": "openyurt/docker-support-notifications-go:1.3.1", "ports": [ { - "name": "tcp-48081", - "containerPort": 48081, + "name": "tcp-48060", + "containerPort": 48060, "protocol": "TCP" } ], @@ -6457,20 +6455,16 @@ } ], "env": [ - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -6482,42 +6476,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-49986", + "name": "tcp-48082", "protocol": "TCP", - "port": 49986, - "targetPort": 49986 + "port": 48082, + "targetPort": 48082 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/docker-device-rest-go:1.2.1", + "name": "edgex-core-command", + "image": "openyurt/docker-core-command-go:1.3.1", "ports": [ { - "name": "tcp-49986", - "containerPort": 49986, + "name": "tcp-48082", + "containerPort": 48082, "protocol": "TCP" } ], @@ -6531,14 +6525,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-command" } }, "strategy": { @@ -6550,42 +6544,42 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-48060", + "name": "tcp-49990", "protocol": "TCP", - "port": 48060, - "targetPort": 48060 + "port": 49990, + "targetPort": 49990 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/docker-support-notifications-go:1.3.1", + "name": "edgex-device-virtual", + "image": "openyurt/docker-device-virtual-go:1.3.1", "ports": [ { - "name": "tcp-48060", - "containerPort": 48060, + "name": "tcp-49990", + "containerPort": 49990, "protocol": "TCP" } ], @@ -6599,14 +6593,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -6618,42 +6612,53 @@ } }, { - "name": "edgex-app-service-configurable-rules", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-48100", + "name": "tcp-20498", "protocol": "TCP", - "port": 48100, - "targetPort": 48100 + "port": 20498, + "targetPort": 20498 + }, + { + "name": "tcp-48075", + "protocol": "TCP", + "port": 48075, + "targetPort": 48075 } ], "selector": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-kuiper" } }, "spec": { "containers": [ { - "name": "edgex-app-service-configurable-rules", - "image": "openyurt/docker-app-service-configurable:1.3.1", + "name": "edgex-kuiper", + "image": "openyurt/kuiper:1.1.1-alpine", "ports": [ { - "name": "tcp-48100", - "containerPort": 48100, + "name": "tcp-20498", + "containerPort": 20498, + "protocol": "TCP" + }, + { + "name": "tcp-48075", + "containerPort": 48075, "protocol": "TCP" } ], @@ -6666,31 +6671,39 @@ ], "env": [ { - "name": "SERVICE_PORT", - "value": "48100" + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" }, { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-app-service-configurable-rules" + }, + { + "name": "EDGEX__DEFAULT__SERVICESERVER", + "value": "http://edgex-core-data:48080" }, { - "name": "BINDING_PUBLISHTOPIC", + "name": "EDGEX__DEFAULT__TOPIC", "value": "events" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-service-configurable-rules" + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -6702,42 +6715,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-48082", + "name": "tcp-48085", "protocol": "TCP", - "port": 48082, - "targetPort": 48082 + "port": 48085, + "targetPort": 48085 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/docker-core-command-go:1.3.1", + "name": "edgex-support-scheduler", + "image": "openyurt/docker-support-scheduler-go:1.3.1", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-48085", + "containerPort": 48085, "protocol": "TCP" } ], @@ -6751,14 +6764,22 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -6770,53 +6791,42 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-48080", + "name": "tcp-48090", "protocol": "TCP", - "port": 48080, - "targetPort": 48080 + "port": 48090, + "targetPort": 48090 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/docker-core-data-go:1.3.1", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/docker-sys-mgmt-agent-go:1.3.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-48080", - "containerPort": 48080, + "name": "tcp-48090", + "containerPort": 48090, "protocol": "TCP" } ], @@ -6830,14 +6840,22 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -6849,48 +6867,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-48100", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-app-service-configurable-rules" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.0.9-alpine", + "name": "edgex-app-service-configurable-rules", + "image": "openyurt/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], @@ -6901,17 +6913,33 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "BINDING_PUBLISHTOPIC", + "value": "events" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-core-data" + }, + { + "name": "SERVICE_PORT", + "value": "48100" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-app-service-configurable-rules" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": { @@ -7023,42 +7051,53 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-48085", + "name": "tcp-5563", "protocol": "TCP", - "port": 48085, - "targetPort": 48085 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-48080", + "protocol": "TCP", + "port": 48080, + "targetPort": 48080 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/docker-support-scheduler-go:1.3.1", + "name": "edgex-core-data", + "image": "openyurt/docker-core-data-go:1.3.1", "ports": [ { - "name": "tcp-48085", - "containerPort": 48085, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-48080", + "containerPort": 48080, "protocol": "TCP" } ], @@ -7070,24 +7109,16 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-data" } }, "strategy": { @@ -7099,53 +7130,42 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-20498", - "protocol": "TCP", - "port": 20498, - "targetPort": 20498 - }, - { - "name": "tcp-48075", + "name": "tcp-48081", "protocol": "TCP", - "port": 48075, - "targetPort": 48075 + "port": 48081, + "targetPort": 48081 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/kuiper:1.1.1-alpine", + "name": "edgex-core-metadata", + "image": "openyurt/docker-core-metadata-go:1.3.1", "ports": [ { - "name": "tcp-20498", - "containerPort": 20498, - "protocol": "TCP" - }, - { - "name": "tcp-48075", - "containerPort": 48075, + "name": "tcp-48081", + "containerPort": 48081, "protocol": "TCP" } ], @@ -7158,39 +7178,19 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" - }, - { - "name": "EDGEX__DEFAULT__SERVICESERVER", - "value": "http://edgex-core-data:48080" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "events" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "48075" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "5566" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-metadata" } }, "strategy": { diff --git a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json index a69dea394f4..38f8c0bfbb6 100644 --- a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json +++ b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json @@ -30,82 +30,38 @@ ], "components": [ { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-59720", - "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-security-bootstrapper" } }, "spec": { "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-etc", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-log", - "emptyDir": {} - }, - { - "name": "kuiper-plugins", + "name": "edgex-init", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.11.4-alpine", - "ports": [ - { - "name": "tcp-59720", - "containerPort": 59720, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:3.1.1", "envFrom": [ { "configMapRef": { @@ -115,89 +71,29 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, { "name": "anonymous-volume1", "mountPath": "/etc/localtime" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-etc", - "mountPath": "/kuiper/etc" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" - }, - { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" - }, - { - "name": "kuiper-log", - "mountPath": "/kuiper/log" - }, - { - "name": "kuiper-plugins", - "mountPath": "/kuiper/plugins" + "name": "edgex-init", + "mountPath": "/edgex-init" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-security-bootstrapper" } }, "strategy": { @@ -209,62 +105,72 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-nginx", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-8443", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-nginx" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-nginx" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-nginx" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, + { + "name": "tmpfs-volume4", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/etc/localtime", - "type": "DirectoryOrCreate" - } + "name": "nginx-templates", + "emptyDir": {} }, { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" - } + "name": "nginx-tls", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:3.1.0", + "name": "edgex-nginx", + "image": "nginx:1.25.5-alpine-slim", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -275,31 +181,41 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" - } - ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/etc/nginx/conf.d" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/var/cache/nginx" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/var/log/nginx" + }, + { + "name": "tmpfs-volume4", + "mountPath": "/var/run" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/device-rest" + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-nginx" } }, "strategy": { @@ -311,31 +227,31 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59880", + "name": "tcp-59881", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "spec": { @@ -348,25 +264,25 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-metadata", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:3.1.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:3.1.1", "ports": [ { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -380,7 +296,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-core-metadata" } ], "resources": {}, @@ -395,13 +311,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -413,72 +329,62 @@ } }, { - "name": "edgex-nginx", + "name": "edgex-proxy-auth", "service": { "ports": [ { - "name": "tcp-8443", + "name": "tcp-59842", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59842, + "targetPort": 59842 } ], "selector": { - "app": "edgex-nginx" + "app": "edgex-proxy-auth" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-nginx" + "app": "edgex-proxy-auth" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-nginx" + "app": "edgex-proxy-auth" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, - { - "name": "tmpfs-volume4", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "FileOrCreate" + } }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "nginx-templates", - "emptyDir": {} - }, - { - "name": "nginx-tls", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-auth", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-nginx", - "image": "nginx:1.25.3-alpine-slim", + "name": "edgex-proxy-auth", + "image": "edgexfoundry/security-proxy-auth:3.1.1", "ports": [ { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59842", + "containerPort": 59842, "protocol": "TCP" } ], @@ -489,41 +395,31 @@ } } ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-proxy-auth" + } + ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/etc/nginx/conf.d" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/var/cache/nginx" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/var/log/nginx" - }, - { - "name": "tmpfs-volume4", - "mountPath": "/var/run" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" - }, - { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/security-proxy-auth" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-nginx" + "hostname": "edgex-proxy-auth" } }, "strategy": { @@ -535,35 +431,30 @@ } }, { - "name": "edgex-support-scheduler", - "service": { - "ports": [ - { - "name": "tcp-59861", - "protocol": "TCP", - "port": 59861, - "targetPort": 59861 - } - ], - "selector": { - "app": "edgex-support-scheduler" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -572,28 +463,33 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" } + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:3.1.0", - "ports": [ - { - "name": "tcp-59861", - "containerPort": 59861, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:3.1.1", "envFrom": [ { "configMapRef": { @@ -603,20 +499,35 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "EDGEX_ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" + }, + { + "name": "EDGEX_ADD_SECRETSTORE_TOKENS" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, { "name": "edgex-init", "mountPath": "/edgex-init" @@ -627,13 +538,25 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets" + }, + { + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" + }, + { + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -645,31 +568,31 @@ } }, { - "name": "edgex-proxy-auth", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59842", + "name": "tcp-4000", "protocol": "TCP", - "port": 59842, - "targetPort": 59842 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-proxy-auth" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy-auth" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy-auth" + "app": "edgex-ui-go" } }, "spec": { @@ -678,29 +601,18 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" - } - }, - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-auth", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-proxy-auth", - "image": "edgexfoundry/security-proxy-auth:3.1.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:3.1.0", "ports": [ { - "name": "tcp-59842", - "containerPort": 59842, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -714,7 +626,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-proxy-auth" + "value": "edgex-ui-go" } ], "resources": {}, @@ -722,20 +634,12 @@ { "name": "anonymous-volume1", "mountPath": "/etc/localtime" - }, - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/security-proxy-auth" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy-auth" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -747,38 +651,65 @@ } }, { - "name": "edgex-security-bootstrapper", + "name": "edgex-device-rest", + "service": { + "ports": [ + { + "name": "tcp-59986", + "protocol": "TCP", + "port": 59986, + "targetPort": 59986 + } + ], + "selector": { + "app": "edgex-device-rest" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-device-rest" } }, "spec": { "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { - "name": "edgex-init", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:3.1.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:3.1.1", + "ports": [ + { + "name": "tcp-59986", + "containerPort": 59986, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -788,29 +719,29 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, { "name": "anonymous-volume1", "mountPath": "/etc/localtime" }, { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -822,31 +753,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59880", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-core-data" } }, "spec": { @@ -859,25 +790,25 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:3.1.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:3.1.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -891,7 +822,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-core-data" } ], "resources": {}, @@ -906,13 +837,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-core-data" } }, "strategy": { @@ -924,60 +855,62 @@ } }, { - "name": "edgex-vault", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59701", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-app-rules-engine" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "FileOrCreate" + } }, { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "hashicorp/vault:1.14.5", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:3.1.1", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -990,41 +923,33 @@ ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - }, - { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "VAULT_UI", - "value": "true" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -1036,30 +961,35 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-core-command", + "service": { + "ports": [ + { + "name": "tcp-59882", + "protocol": "TCP", + "port": 59882, + "targetPort": 59882 + } + ], + "selector": { + "app": "edgex-core-command" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-command" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -1068,33 +998,28 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" } - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "vault-config", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:3.1.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:3.1.1", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -1104,35 +1029,16 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "EDGEX_ADD_SECRETSTORE_TOKENS" - }, - { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "EDGEX_ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, { "name": "edgex-init", "mountPath": "/edgex-init" @@ -1143,25 +1049,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" - }, - { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" - }, - { - "name": "vault-config", - "mountPath": "/vault/config" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-core-command" } }, "strategy": { @@ -1173,51 +1067,79 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59720", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } + }, + { + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-etc", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} + }, + { + "name": "kuiper-plugins", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:3.1.0", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.11.5-alpine", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -1230,57 +1152,125 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-ui-go" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-support-notifications", + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + }, + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-etc", + "mountPath": "/kuiper/etc" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" + }, + { + "name": "kuiper-log", + "mountPath": "/kuiper/log" + }, + { + "name": "kuiper-plugins", + "mountPath": "/kuiper/plugins" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kuiper" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + }, + { + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59861", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "spec": { @@ -1293,25 +1283,25 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:3.1.0", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:3.1.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -1323,9 +1313,17 @@ } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-support-scheduler" } ], "resources": {}, @@ -1340,13 +1338,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -1407,14 +1405,14 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], "containers": [ { "name": "edgex-core-consul", - "image": "hashicorp/consul:1.16.2", + "image": "hashicorp/consul:1.16.6", "ports": [ { "name": "tcp-8500", @@ -1435,8 +1433,8 @@ "value": "/consul/config/consul_acl_done" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "EDGEX_GROUP", + "value": "2001" }, { "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" @@ -1445,13 +1443,13 @@ "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" }, - { - "name": "EDGEX_GROUP", - "value": "2001" - }, { "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -1492,65 +1490,61 @@ } }, { - "name": "edgex-app-rules-engine", - "service": { - "ports": [ - { - "name": "tcp-59701", - "protocol": "TCP", - "port": 59701, - "targetPort": 59701 - } - ], - "selector": { - "app": "edgex-app-rules-engine" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-security-proxy-setup" } }, "spec": { "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} + }, + { + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} + }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } + }, + { + "name": "consul-acl-token", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:3.1.0", - "ports": [ - { - "name": "tcp-59701", - "containerPort": 59701, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:3.1.1", "envFrom": [ { "configMapRef": { @@ -1560,33 +1554,81 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "EDGEX_ADD_PROXY_ROUTE", + "value": "device-rest.http://edgex-device-rest:59986" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" } ], "resources": {}, "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" + "name": "vault-config", + "mountPath": "/vault/config" + }, + { + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" + }, + { + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -1598,31 +1640,31 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59860", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-support-notifications" } }, "spec": { @@ -1635,25 +1677,25 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-notifications", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:3.1.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:3.1.1", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -1667,7 +1709,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-support-notifications" } ], "resources": {}, @@ -1682,13 +1724,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -1700,62 +1742,67 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-6379", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-redis" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "db-data", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/etc/localtime", - "type": "DirectoryOrCreate" - } + "name": "redis-config", + "emptyDir": {} }, { - "name": "anonymous-volume2", + "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:3.1.0", + "name": "edgex-redis", + "image": "redis:7.0.15-alpine", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -1768,33 +1815,41 @@ ], "env": [ { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/core-command" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-redis" } }, "strategy": { @@ -1806,61 +1861,45 @@ } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-core-common-config-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-common-config-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-common-config-bootstrapper" } }, "spec": { "volumes": [ - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/etc/localtime", - "type": "DirectoryOrCreate" - } - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-config", - "emptyDir": {} - }, - { - "name": "nginx-templates", - "emptyDir": {} - }, - { - "name": "nginx-tls", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "FileOrCreate" + } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", + "type": "FileOrCreate" } - }, - { - "name": "consul-acl-token", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:3.1.0", + "name": "edgex-core-common-config-bootstrapper", + "image": "edgexfoundry/core-common-config-bootstrapper:3.1.1", "envFrom": [ { "configMapRef": { @@ -1870,81 +1909,45 @@ ], "env": [ { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", + "name": "ALL_SERVICES_REGISTRY_HOST", "value": "edgex-core-consul" }, { - "name": "EDGEX_ADD_PROXY_ROUTE", - "value": "device-rest.http://edgex-device-rest:59986" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" }, { - "name": "ROUTES_CORE_METADATA_HOST", + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", "value": "edgex-core-metadata" }, { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" }, { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" } ], "resources": {}, "volumeMounts": [ - { - "name": "anonymous-volume1", - "mountPath": "/etc/localtime" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-config", - "mountPath": "/vault/config" - }, - { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" - }, - { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": { @@ -1956,31 +1959,31 @@ } }, { - "name": "edgex-redis", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-8200", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-vault" } }, "spec": { @@ -1989,34 +1992,27 @@ "name": "tmpfs-volume1", "emptyDir": {} }, - { - "name": "db-data", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "redis-config", + "name": "vault-file", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" - } + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.14-alpine", + "name": "edgex-vault", + "image": "hashicorp/vault:1.14.10", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -2029,41 +2025,41 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_UI", + "value": "true" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "db-data", - "mountPath": "/data" + "mountPath": "/vault/config" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" + "name": "vault-file", + "mountPath": "/vault/file" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-vault" } }, "strategy": { @@ -2075,18 +2071,31 @@ } }, { - "name": "edgex-core-common-config-bootstrapper", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, + "name": "edgex-device-virtual", + "service": { + "ports": [ + { + "name": "tcp-59900", + "protocol": "TCP", + "port": 59900, + "targetPort": 59900 + } + ], + "selector": { + "app": "edgex-device-virtual" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-device-virtual" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-device-virtual" } }, "spec": { @@ -2099,21 +2108,28 @@ "name": "anonymous-volume1", "hostPath": { "path": "/etc/localtime", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-virtual", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "edgexfoundry/core-common-config-bootstrapper:3.1.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:3.1.1", + "ports": [ + { + "name": "tcp-59900", + "containerPort": 59900, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -2123,24 +2139,8 @@ ], "env": [ { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" - }, - { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" - }, - { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, @@ -2155,13 +2155,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-common-config-bootstrapper" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -2220,22 +2220,43 @@ ], "components": [ { - "name": "edgex-security-proxy-setup", + "name": "edgex-core-consul", + "service": { + "ports": [ + { + "name": "tcp-8500", + "protocol": "TCP", + "port": 8500, + "targetPort": 8500 + } + ], + "selector": { + "app": "edgex-core-consul" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -2247,15 +2268,22 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.2.0", + "name": "edgex-core-consul", + "image": "consul:1.10.10", + "ports": [ + { + "name": "tcp-8500", + "containerPort": 8500, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -2265,51 +2293,35 @@ ], "env": [ { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "KONGURL_SERVER", - "value": "edgex-kong" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" }, { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" + "name": "ADD_REGISTRY_ACL_ROLES" }, { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" } ], "resources": {}, "volumeMounts": [ + { + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" @@ -2320,13 +2332,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -2338,31 +2350,31 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-58890", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-sys-mgmt-agent" } }, "spec": { @@ -2374,19 +2386,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.2.0", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.2.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -2399,20 +2411,16 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, @@ -2423,13 +2431,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -2507,16 +2515,16 @@ ], "env": [ { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "VAULT_UI", + "value": "true" }, { "name": "VAULT_CONFIG_DIR", "value": "/vault/config" }, { - "name": "VAULT_UI", - "value": "true" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" } ], "resources": {}, @@ -2553,31 +2561,31 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59701", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -2589,19 +2597,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.2.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.2.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -2614,16 +2622,20 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -2634,13 +2646,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -2652,70 +2664,126 @@ } }, { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", - "protocol": "TCP", - "port": 8500, - "targetPort": 8500 - } - ], + "name": "edgex-security-bootstrapper", + "deployment": { "selector": { - "app": "edgex-core-consul" + "matchLabels": { + "app": "edgex-security-bootstrapper" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-security-bootstrapper" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.2.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-security-bootstrapper" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } } - }, + } + }, + { + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ { - "name": "consul-config", + "name": "tmpfs-volume1", "emptyDir": {} }, { - "name": "consul-data", + "name": "tmpfs-volume2", "emptyDir": {} }, { "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.10.10", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.2.0", "envFrom": [ { "configMapRef": { @@ -2725,52 +2793,64 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "tmpfs-volume2", + "mountPath": "/vault" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "name": "kong", + "mountPath": "/tmp/kong" + }, + { + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" + }, + { + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -2782,31 +2862,31 @@ } }, { - "name": "edgex-redis", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-5432", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "spec": { @@ -2816,7 +2896,11 @@ "emptyDir": {} }, { - "name": "db-data", + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", "emptyDir": {} }, { @@ -2824,25 +2908,22 @@ "emptyDir": {} }, { - "name": "redis-config", + "name": "postgres-config", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" - } + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.6-alpine", + "name": "edgex-kong-db", + "image": "postgres:13.5-alpine", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -2855,41 +2936,49 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "POSTGRES_USER", + "value": "kong" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" + "mountPath": "/var/run" }, { - "name": "db-data", - "mountPath": "/data" + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/run" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-kong-db" } }, "strategy": { @@ -2901,31 +2990,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59900", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-device-virtual" } }, "spec": { @@ -2937,19 +3026,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-virtual", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.2.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.2.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -2961,13 +3050,9 @@ } ], "env": [ - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -2978,13 +3063,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -2996,35 +3081,55 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-8000", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", + "protocol": "TCP", + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -3032,19 +3137,37 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.2.0", + "name": "edgex-kong", + "image": "kong:2.6.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -3057,25 +3180,89 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" + }, + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_DNS_VALID_TTL", + "value": "1" + }, + { + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-kong" } }, "strategy": { @@ -3087,68 +3274,55 @@ } }, { - "name": "edgex-kong-db", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59881", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.5-alpine", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.2.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -3161,49 +3335,29 @@ ], "env": [ { - "name": "POSTGRES_DB", - "value": "kong" - }, - { - "name": "POSTGRES_USER", - "value": "kong" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -3215,31 +3369,18 @@ } }, { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-59720", - "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -3249,30 +3390,22 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", + "name": "consul-acl-token", "emptyDir": {} }, { - "name": "kuiper-sources", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", - "ports": [ - { - "name": "tcp-59720", - "containerPort": 59720, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.2.0", + "envFrom": [ { "configMapRef": { "name": "common-variables" @@ -3281,48 +3414,47 @@ ], "env": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" }, { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" + "name": "ADD_PROXY_ROUTE" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "KONGURL_SERVER", + "value": "edgex-kong" } ], "resources": {}, @@ -3332,22 +3464,18 @@ "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" }, { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -3359,31 +3487,31 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59882", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-core-command" } }, "spec": { @@ -3395,19 +3523,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.2.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.2.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -3421,7 +3549,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-command" } ], "resources": {}, @@ -3432,13 +3560,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-command" } }, "strategy": { @@ -3549,7 +3677,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -3603,93 +3731,60 @@ } }, { - "name": "edgex-kong", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8100", - "protocol": "TCP", - "port": 8100, - "targetPort": 8100 - }, - { - "name": "tcp-8443", + "name": "tcp-59720", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" - } + "name": "kuiper-data", + "emptyDir": {} }, { - "name": "postgres-config", + "name": "kuiper-connections", "emptyDir": {} }, { - "name": "kong", + "name": "kuiper-sources", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.6.1", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -3702,89 +3797,73 @@ ], "env": [ { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" }, { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" }, { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "name": "kuiper-data", + "mountPath": "/kuiper/data" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -3796,33 +3875,72 @@ } }, { - "name": "edgex-security-bootstrapper", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-redis" } }, "spec": { "volumes": [ { - "name": "edgex-init", + "name": "tmpfs-volume1", "emptyDir": {} - } - ], - "containers": [ + }, { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.2.0", - "envFrom": [ - { + "name": "db-data", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "redis-config", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-redis", + "image": "redis:6.2.6-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], + "envFrom": [ + { "configMapRef": { "name": "common-variables" } @@ -3830,25 +3948,41 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "redis-config", + "mountPath": "/run/redis/conf" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-redis" } }, "strategy": { @@ -3860,31 +3994,37 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-5563", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "spec": { @@ -3896,19 +4036,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.2.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.2.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -3922,7 +4067,11 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-data" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -3933,13 +4082,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-data" } }, "strategy": { @@ -3951,31 +4100,31 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59861", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-scheduler" } }, "spec": { @@ -3987,19 +4136,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.2.0", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.2.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -4013,15 +4162,15 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-support-scheduler" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -4032,13 +4181,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -4050,37 +4199,31 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { @@ -4092,24 +4235,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.2.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.2.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -4121,13 +4259,9 @@ } ], "env": [ - { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-device-rest" } ], "resources": {}, @@ -4138,13 +4272,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -4154,64 +4288,104 @@ } } } - }, + } + ] + }, + { + "versionName": "jakarta", + "configMaps": [ { - "name": "edgex-security-secretstore-setup", + "metadata": { + "name": "common-variables", + "creationTimestamp": null + }, + "data": { + "API_GATEWAY_HOST": "edgex-kong", + "API_GATEWAY_STATUS_PORT": "8100", + "CLIENTS_CORE_COMMAND_HOST": "edgex-core-command", + "CLIENTS_CORE_DATA_HOST": "edgex-core-data", + "CLIENTS_CORE_METADATA_HOST": "edgex-core-metadata", + "CLIENTS_SUPPORT_NOTIFICATIONS_HOST": "edgex-support-notifications", + "CLIENTS_SUPPORT_SCHEDULER_HOST": "edgex-support-scheduler", + "DATABASES_PRIMARY_HOST": "edgex-redis", + "EDGEX_SECURITY_SECRET_STORE": "true", + "MESSAGEQUEUE_HOST": "edgex-redis", + "PROXY_SETUP_HOST": "edgex-security-proxy-setup", + "REGISTRY_HOST": "edgex-core-consul", + "SECRETSTORE_HOST": "edgex-vault", + "SECRETSTORE_PORT": "8200", + "STAGEGATE_BOOTSTRAPPER_HOST": "edgex-security-bootstrapper", + "STAGEGATE_BOOTSTRAPPER_STARTPORT": "54321", + "STAGEGATE_DATABASE_HOST": "edgex-redis", + "STAGEGATE_DATABASE_PORT": "6379", + "STAGEGATE_DATABASE_READYPORT": "6379", + "STAGEGATE_KONGDB_HOST": "edgex-kong-db", + "STAGEGATE_KONGDB_PORT": "5432", + "STAGEGATE_KONGDB_READYPORT": "54325", + "STAGEGATE_READY_TORUNPORT": "54329", + "STAGEGATE_REGISTRY_HOST": "edgex-core-consul", + "STAGEGATE_REGISTRY_PORT": "8500", + "STAGEGATE_REGISTRY_READYPORT": "54324", + "STAGEGATE_SECRETSTORESETUP_HOST": "edgex-security-secretstore-setup", + "STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT": "54322", + "STAGEGATE_WAITFOR_TIMEOUT": "60s" + } + } + ], + "components": [ + { + "name": "edgex-support-notifications", + "service": { + "ports": [ + { + "name": "tcp-59860", + "protocol": "TCP", + "port": 59860, + "targetPort": 59860 + } + ], + "selector": { + "app": "edgex-support-notifications" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-support-notifications" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "edgex-init", + "name": "edgex-init", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-notifications", + "type": "FileOrCreate" } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "vault-config", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.2.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.1.1", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -4221,64 +4395,25 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "ADD_SECRETSTORE_TOKENS" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kong", - "mountPath": "/tmp/kong" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" - }, - { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" - }, - { - "name": "vault-config", - "mountPath": "/vault/config" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -4288,101 +4423,37 @@ } } } - } - ] - }, - { - "versionName": "jakarta", - "configMaps": [ - { - "metadata": { - "name": "common-variables", - "creationTimestamp": null - }, - "data": { - "API_GATEWAY_HOST": "edgex-kong", - "API_GATEWAY_STATUS_PORT": "8100", - "CLIENTS_CORE_COMMAND_HOST": "edgex-core-command", - "CLIENTS_CORE_DATA_HOST": "edgex-core-data", - "CLIENTS_CORE_METADATA_HOST": "edgex-core-metadata", - "CLIENTS_SUPPORT_NOTIFICATIONS_HOST": "edgex-support-notifications", - "CLIENTS_SUPPORT_SCHEDULER_HOST": "edgex-support-scheduler", - "DATABASES_PRIMARY_HOST": "edgex-redis", - "EDGEX_SECURITY_SECRET_STORE": "true", - "MESSAGEQUEUE_HOST": "edgex-redis", - "PROXY_SETUP_HOST": "edgex-security-proxy-setup", - "REGISTRY_HOST": "edgex-core-consul", - "SECRETSTORE_HOST": "edgex-vault", - "SECRETSTORE_PORT": "8200", - "STAGEGATE_BOOTSTRAPPER_HOST": "edgex-security-bootstrapper", - "STAGEGATE_BOOTSTRAPPER_STARTPORT": "54321", - "STAGEGATE_DATABASE_HOST": "edgex-redis", - "STAGEGATE_DATABASE_PORT": "6379", - "STAGEGATE_DATABASE_READYPORT": "6379", - "STAGEGATE_KONGDB_HOST": "edgex-kong-db", - "STAGEGATE_KONGDB_PORT": "5432", - "STAGEGATE_KONGDB_READYPORT": "54325", - "STAGEGATE_READY_TORUNPORT": "54329", - "STAGEGATE_REGISTRY_HOST": "edgex-core-consul", - "STAGEGATE_REGISTRY_PORT": "8500", - "STAGEGATE_REGISTRY_READYPORT": "54324", - "STAGEGATE_SECRETSTORESETUP_HOST": "edgex-security-secretstore-setup", - "STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT": "54322", - "STAGEGATE_WAITFOR_TIMEOUT": "60s" - } - } - ], - "components": [ + }, { - "name": "edgex-kong", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8100", - "protocol": "TCP", - "port": 8100, - "targetPort": 8100 - }, - { - "name": "tcp-8443", + "name": "tcp-58890", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -4390,37 +4461,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "type": "FileOrCreate" } - }, - { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "kong", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.5.1", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.1.1", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -4433,89 +4486,33 @@ ], "env": [ { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - }, - { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "kong", - "mountPath": "/usr/local/kong" + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -4527,35 +4524,30 @@ } }, { - "name": "edgex-sys-mgmt-agent", - "service": { - "ports": [ - { - "name": "tcp-58890", - "protocol": "TCP", - "port": 58890, - "targetPort": 58890 - } - ], - "selector": { - "app": "edgex-sys-mgmt-agent" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -4563,22 +4555,31 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.1.1", - "ports": [ - { - "name": "tcp-58890", - "containerPort": 58890, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.1.1", "envFrom": [ { "configMapRef": { @@ -4588,33 +4589,64 @@ ], "env": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + }, + { + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" + }, + { + "name": "ADD_SECRETSTORE_TOKENS" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/tmp/edgex/secrets" + }, + { + "name": "kong", + "mountPath": "/tmp/kong" + }, + { + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" + }, + { + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -4626,31 +4658,37 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-5563", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "spec": { @@ -4662,19 +4700,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.1.1", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.1.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -4688,7 +4731,11 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-core-data" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -4699,13 +4746,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-data" } }, "strategy": { @@ -4717,55 +4764,68 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-5432", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-kong-db" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" - } + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.1.1", + "name": "edgex-kong-db", + "image": "postgres:13.4-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -4778,33 +4838,49 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_USER", + "value": "kong" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/var/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/run" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kong-db" } }, "strategy": { @@ -4816,35 +4892,55 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-8000", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", + "protocol": "TCP", + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -4852,19 +4948,37 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.1.2", + "name": "edgex-kong", + "image": "kong:2.5.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -4877,37 +4991,89 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "KONG_DATABASE", + "value": "postgres" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" + }, + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_DNS_VALID_TTL", + "value": "1" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-kong" } }, "strategy": { @@ -4919,68 +5085,55 @@ } }, { - "name": "edgex-kong-db", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59900", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/device-virtual", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.4-alpine", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.1.1", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -4993,49 +5146,25 @@ ], "env": [ { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "POSTGRES_DB", - "value": "kong" - }, - { - "name": "POSTGRES_USER", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -5047,70 +5176,31 @@ } }, { - "name": "edgex-redis", - "service": { - "ports": [ - { - "name": "tcp-6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "app": "edgex-redis" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-security-bootstrapper" } }, - "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "db-data", - "emptyDir": {} - }, - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "redis-config", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" - } + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.6-alpine", - "ports": [ - { - "name": "tcp-6379", - "containerPort": 6379, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.1.1", "envFrom": [ { "configMapRef": { @@ -5120,41 +5210,25 @@ ], "env": [ { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "db-data", - "mountPath": "/data" - }, { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "redis-config", - "mountPath": "/run/redis/conf" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-security-bootstrapper" } }, "strategy": { @@ -5166,31 +5240,31 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59882", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "spec": { @@ -5202,19 +5276,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.1.1", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.1.1", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -5228,7 +5302,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-command" } ], "resources": {}, @@ -5239,13 +5313,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-command" } }, "strategy": { @@ -5257,55 +5331,42 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-4000", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.1.1", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:2.1.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -5316,31 +5377,11 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - } - ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -5352,30 +5393,35 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-app-rules-engine", + "service": { + "ports": [ + { + "name": "tcp-59701", + "protocol": "TCP", + "port": 59701, + "targetPort": 59701 + } + ], + "selector": { + "app": "edgex-app-rules-engine" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-app-rules-engine" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -5383,31 +5429,22 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "vault-config", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.1.1", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.1.2", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -5417,64 +5454,37 @@ ], "env": [ { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" - }, - { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kong", - "mountPath": "/tmp/kong" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" - }, - { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" - }, - { - "name": "vault-config", - "mountPath": "/vault/config" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -5486,60 +5496,67 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-8500", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "edgex-init", + "name": "consul-config", "emptyDir": {} }, { - "name": "kuiper-data", + "name": "consul-data", "emptyDir": {} }, { - "name": "kuiper-connections", + "name": "edgex-init", "emptyDir": {} }, { - "name": "kuiper-sources", + "name": "consul-acl-token", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", + "name": "edgex-core-consul", + "image": "consul:1.10.3", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -5552,73 +5569,52 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "ADD_REGISTRY_ACL_ROLES" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" } ], "resources": {}, "volumeMounts": [ { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "consul-data", + "mountPath": "/consul/data" }, { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -5630,31 +5626,18 @@ } }, { - "name": "edgex-device-rest", - "service": { - "ports": [ - { - "name": "tcp-59986", - "protocol": "TCP", - "port": 59986, - "targetPort": 59986 - } - ], - "selector": { - "app": "edgex-device-rest" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -5663,25 +5646,22 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.1.1", - "ports": [ - { - "name": "tcp-59986", - "containerPort": 59986, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.1.1", "envFrom": [ { "configMapRef": { @@ -5691,8 +5671,47 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" } ], "resources": {}, @@ -5701,15 +5720,19 @@ "name": "edgex-init", "mountPath": "/edgex-init" }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -5721,67 +5744,55 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59881", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-metadata", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.10.3", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.1.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -5794,52 +5805,29 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "volumeMounts": [ - { - "name": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -5851,31 +5839,31 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59720", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "spec": { @@ -5885,21 +5873,26 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" - } + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.1.1", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -5912,8 +5905,48 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" } ], "resources": {}, @@ -5923,14 +5956,22 @@ "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -6008,16 +6049,16 @@ ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "VAULT_UI", + "value": "true" }, { "name": "VAULT_ADDR", "value": "http://edgex-vault:8200" }, { - "name": "VAULT_UI", - "value": "true" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" } ], "resources": {}, @@ -6054,42 +6095,70 @@ } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-redis" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "db-data", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "consul-acl-token", + "name": "redis-config", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.1.1", + "name": "edgex-redis", + "image": "redis:6.2.6-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -6099,68 +6168,41 @@ ], "env": [ { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "ADD_PROXY_ROUTE" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-redis" } }, "strategy": { @@ -6172,80 +6214,31 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59861", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-ui-go" - } - }, - "spec": { - "containers": [ - { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:2.1.0", - "ports": [ - { - "name": "tcp-4000", - "containerPort": 4000, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-ui-go" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-security-bootstrapper", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-support-scheduler" } }, "spec": { @@ -6253,12 +6246,26 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.1.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.1.1", + "ports": [ + { + "name": "tcp-59861", + "containerPort": 59861, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -6268,12 +6275,16 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -6281,12 +6292,16 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -6298,37 +6313,31 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { @@ -6340,24 +6349,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.1.1", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.1.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -6371,11 +6375,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" - }, - { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "value": "edgex-device-rest" } ], "resources": {}, @@ -6386,13 +6386,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -6451,213 +6451,31 @@ ], "components": [ { - "name": "edgex-security-proxy-setup", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-security-proxy-setup" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-security-proxy-setup" - } - }, - "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" - } - } - ], - "containers": [ - { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.3.0", - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-security-proxy-setup" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-security-bootstrapper", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-security-bootstrapper" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-security-bootstrapper" - } - }, - "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - } - ], - "containers": [ - { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.3.0", - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "EDGEX_USER", - "value": "2002" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-security-bootstrapper" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-redis", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-5432", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-kong-db" } }, "spec": { @@ -6667,7 +6485,11 @@ "emptyDir": {} }, { - "name": "db-data", + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", "emptyDir": {} }, { @@ -6675,25 +6497,22 @@ "emptyDir": {} }, { - "name": "redis-config", + "name": "postgres-config", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" - } + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.5-alpine", + "name": "edgex-kong-db", + "image": "postgres:13.8-alpine", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -6706,41 +6525,49 @@ ], "env": [ { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "POSTGRES_DB", + "value": "kong" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" + "mountPath": "/var/run" }, { - "name": "db-data", - "mountPath": "/data" + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/run" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-kong-db" } }, "strategy": { @@ -6752,31 +6579,18 @@ } }, { - "name": "edgex-device-rest", - "service": { - "ports": [ - { - "name": "tcp-59986", - "protocol": "TCP", - "port": 59986, - "targetPort": 59986 - } - ], - "selector": { - "app": "edgex-device-rest" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-security-bootstrapper" } }, "spec": { @@ -6784,26 +6598,12 @@ { "name": "edgex-init", "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" - } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.3.0", - "ports": [ - { - "name": "tcp-59986", - "containerPort": 59986, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.3.0", "envFrom": [ { "configMapRef": { @@ -6813,8 +6613,12 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, @@ -6822,16 +6626,12 @@ { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-security-bootstrapper" } }, "strategy": { @@ -6843,55 +6643,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-4000", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.3.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:2.3.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -6903,34 +6690,16 @@ } ], "env": [ - { - "name": "MESSAGEQUEUE_EXTERNAL_URL", - "value": "tcp://edgex-mqtt-broker:1883" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-command" - }, - { - "name": "MESSAGEQUEUE_INTERNAL_HOST", - "value": "edgex-redis" + "value": "edgex-ui-go" } ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -6942,31 +6711,31 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59701", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -6978,19 +6747,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.3.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -7003,16 +6772,20 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -7023,13 +6796,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -7078,7 +6851,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -7101,10 +6874,6 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", "value": "edgex-support-scheduler" @@ -7112,6 +6881,10 @@ { "name": "INTERVALACTIONS_SCRUBAGED_HOST", "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -7210,35 +6983,35 @@ "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", "value": "6379" }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, { "name": "EDGEX__DEFAULT__SERVER", "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__TYPE", + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" }, { @@ -7246,8 +7019,8 @@ "value": "59720" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" } ], "resources": {}, @@ -7284,37 +7057,31 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-core-command", "service": { - "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, + "ports": [ { - "name": "tcp-59880", + "name": "tcp-59882", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-core-command" } }, "spec": { @@ -7326,24 +7093,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.3.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.3.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -7355,13 +7117,17 @@ } ], "env": [ + { + "name": "MESSAGEQUEUE_EXTERNAL_URL", + "value": "tcp://edgex-mqtt-broker:1883" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-core-command" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "MESSAGEQUEUE_INTERNAL_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -7372,13 +7138,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-core-command" } }, "strategy": { @@ -7390,18 +7156,31 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-redis" } }, "spec": { @@ -7411,7 +7190,7 @@ "emptyDir": {} }, { - "name": "tmpfs-volume2", + "name": "db-data", "emptyDir": {} }, { @@ -7419,33 +7198,28 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", + "name": "redis-config", "emptyDir": {} }, { - "name": "vault-config", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.3.0", + "name": "edgex-redis", + "image": "redis:7.0.5-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -7455,23 +7229,12 @@ ], "env": [ { - "name": "ADD_SECRETSTORE_TOKENS" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" - }, - { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, @@ -7481,38 +7244,26 @@ "mountPath": "/run" }, { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kong", - "mountPath": "/tmp/kong" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" - }, - { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-redis" } }, "strategy": { @@ -7524,60 +7275,55 @@ } }, { - "name": "edgex-vault", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59881", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.11.4", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.3.0", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -7590,41 +7336,29 @@ ], "env": [ { - "name": "VAULT_UI", - "value": "true" - }, - { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" - }, - { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -7636,31 +7370,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-58890", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "spec": { @@ -7672,19 +7406,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.3.0", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.3.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -7697,12 +7431,16 @@ ], "env": [ { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, @@ -7713,13 +7451,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -7728,34 +7466,21 @@ "maxSurge": 0 } } - } - }, - { - "name": "edgex-app-rules-engine", - "service": { - "ports": [ - { - "name": "tcp-59701", - "protocol": "TCP", - "port": 59701, - "targetPort": 59701 - } - ], - "selector": { - "app": "edgex-app-rules-engine" - } - }, + } + }, + { + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -7764,25 +7489,22 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.3.1", - "ports": [ - { - "name": "tcp-59701", - "containerPort": 59701, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.3.0", "envFrom": [ { "configMapRef": { @@ -7792,20 +7514,47 @@ ], "env": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" } ], "resources": {}, @@ -7814,15 +7563,19 @@ "name": "edgex-init", "mountPath": "/edgex-init" }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -7891,7 +7644,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { @@ -7932,57 +7685,57 @@ } ], "env": [ - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, { "name": "KONG_STATUS_LISTEN", "value": "0.0.0.0:8100" }, + { + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" + }, { "name": "KONG_ADMIN_LISTEN", "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" }, { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" }, { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" + "name": "KONG_DNS_VALID_TTL", + "value": "1" }, { - "name": "KONG_ADMIN_ERROR_LOG", + "name": "KONG_PROXY_ERROR_LOG", "value": "/dev/stderr" }, { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" + "name": "KONG_DATABASE", + "value": "postgres" }, { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { "name": "KONG_ADMIN_ACCESS_LOG", "value": "/dev/stdout" }, { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" }, { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" } ], "resources": {}, @@ -8015,7 +7768,141 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-kong" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + }, + { + "name": "edgex-security-secretstore-setup", + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-security-secretstore-setup" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-security-secretstore-setup" + } + }, + "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" + } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.3.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" + }, + { + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" + }, + { + "name": "ADD_SECRETSTORE_TOKENS" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets" + }, + { + "name": "kong", + "mountPath": "/tmp/kong" + }, + { + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" + }, + { + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -8027,68 +7914,55 @@ } }, { - "name": "edgex-kong-db", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59900", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-device-virtual" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/device-virtual", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.8-alpine", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.3.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -8101,49 +7975,25 @@ ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" - }, - { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "POSTGRES_DB", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -8155,42 +8005,66 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-5563", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-core-data" } }, "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" + } + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:2.3.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.3.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -8204,14 +8078,28 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "value": "edgex-core-data" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-core-data" } }, "strategy": { @@ -8260,7 +8148,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -8313,6 +8201,97 @@ } } }, + { + "name": "edgex-device-rest", + "service": { + "ports": [ + { + "name": "tcp-59986", + "protocol": "TCP", + "port": 59986, + "targetPort": 59986 + } + ], + "selector": { + "app": "edgex-device-rest" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-device-rest" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-device-rest" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.3.0", + "ports": [ + { + "name": "tcp-59986", + "containerPort": 59986, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-device-rest" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/device-rest" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-device-rest" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + }, { "name": "edgex-core-consul", "service": { @@ -8363,7 +8342,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -8386,10 +8365,6 @@ } ], "env": [ - { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" - }, { "name": "ADD_REGISTRY_ACL_ROLES" }, @@ -8402,12 +8377,16 @@ "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", "value": "/consul/config/consul_acl_done" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -8448,55 +8427,60 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-8200", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.3.0", + "name": "edgex-vault", + "image": "vault:1.11.4", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -8509,25 +8493,41 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_UI", + "value": "true" + }, + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/vault/config" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-vault" } }, "strategy": { @@ -8569,31 +8569,31 @@ ], "components": [ { - "name": "edgex-support-scheduler", + "name": "edgex-proxy-auth", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59842", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59842, + "targetPort": 59842 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "spec": { @@ -8605,19 +8605,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-auth", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:3.0.0", + "name": "edgex-proxy-auth", + "image": "edgexfoundry/security-proxy-auth:3.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59842", + "containerPort": 59842, "protocol": "TCP" } ], @@ -8630,16 +8630,95 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "SERVICE_HOST", + "value": "edgex-proxy-auth" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-proxy-auth" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-proxy-auth" + } + }, + "strategy": { + "type": "RollingUpdate", + "rollingUpdate": { + "maxSurge": 0 + } + } + } + }, + { + "name": "edgex-core-common-config-bootstrapper", + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-common-config-bootstrapper" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-common-config-bootstrapper" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", + "type": "FileOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-core-common-config-bootstrapper", + "image": "edgexfoundry/core-common-config-bootstrapper:3.0.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" + }, + { + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -8650,13 +8729,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": { @@ -8668,31 +8747,31 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-59882", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-command" } }, "spec": { @@ -8702,30 +8781,21 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-log", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.9.2-alpine", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:3.0.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -8738,48 +8808,12 @@ ], "env": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, @@ -8789,26 +8823,14 @@ "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" - }, - { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" - }, - { - "name": "kuiper-log", - "mountPath": "/kuiper/log" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-command" } }, "strategy": { @@ -8820,70 +8842,54 @@ } }, { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", - "protocol": "TCP", - "port": 8500, - "targetPort": 8500 - } - ], - "selector": { - "app": "edgex-core-consul" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-security-proxy-setup" } }, "spec": { "volumes": [ { - "name": "consul-config", + "name": "edgex-init", "emptyDir": {} }, { - "name": "consul-data", + "name": "vault-config", "emptyDir": {} }, { - "name": "edgex-init", + "name": "nginx-templates", "emptyDir": {} }, { - "name": "consul-acl-token", + "name": "nginx-tls", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } + }, + { + "name": "consul-acl-token", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "hashicorp/consul:1.15.2", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:3.0.0", "envFrom": [ { "configMapRef": { @@ -8893,56 +8899,77 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" }, { - "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" }, { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" }, { - "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "EDGEX_ADD_PROXY_ROUTE", + "value": "device-rest.http://edgex-device-rest:59986" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "vault-config", + "mountPath": "/vault/config" }, { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -8954,55 +8981,60 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-8200", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:3.0.0", + "name": "edgex-vault", + "image": "hashicorp/vault:1.13.2", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -9015,25 +9047,41 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_UI", + "value": "true" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/vault/config" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-vault" } }, "strategy": { @@ -9045,55 +9093,72 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-nginx", "service": { "ports": [ { - "name": "tcp-59880", + "name": "tcp-8443", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-nginx" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-nginx" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-nginx" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, + { + "name": "tmpfs-volume4", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" - } + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:3.0.0", + "name": "edgex-nginx", + "image": "nginx:1.24.0-alpine-slim", "ports": [ { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -9104,27 +9169,41 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-data" - } - ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/etc/nginx/conf.d" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/var/cache/nginx" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/var/log/nginx" + }, + { + "name": "tmpfs-volume4", + "mountPath": "/var/run" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" + }, + { + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-nginx" } }, "strategy": { @@ -9136,67 +9215,55 @@ } }, { - "name": "edgex-redis", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59701", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-app-rules-engine" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "db-data", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, - { - "name": "redis-config", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.11-alpine", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:3.0.1", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -9209,41 +9276,29 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "db-data", - "mountPath": "/data" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, - { - "name": "redis-config", - "mountPath": "/run/redis/conf" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -9255,55 +9310,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-4000", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:3.0.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:3.0.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -9317,24 +9359,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-ui-go" } ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-ui-go" } }, "strategy": { @@ -9346,42 +9378,67 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-6379", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "db-data", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "redis-config", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" + } + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:3.0.0", + "name": "edgex-redis", + "image": "redis:7.0.11-alpine", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -9394,15 +9451,41 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" + }, + { + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" + }, + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "redis-config", + "mountPath": "/run/redis/conf" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-redis" } }, "strategy": { @@ -9478,54 +9561,58 @@ } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "vault-config", + "name": "tmpfs-volume1", "emptyDir": {} }, { - "name": "nginx-templates", + "name": "tmpfs-volume2", "emptyDir": {} }, { - "name": "nginx-tls", + "name": "edgex-init", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" } }, { - "name": "consul-acl-token", + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:3.0.0", + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:3.0.0", "envFrom": [ { "configMapRef": { @@ -9535,77 +9622,60 @@ ], "env": [ { - "name": "EDGEX_ADD_PROXY_ROUTE", - "value": "device-rest.http://edgex-device-rest:59986" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "EDGEX_ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" }, { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" + "name": "EDGEX_ADD_SECRETSTORE_TOKENS" } ], "resources": {}, "volumeMounts": [ { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "tmpfs-volume2", + "mountPath": "/vault" }, { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -9654,7 +9724,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -9708,147 +9778,55 @@ } }, { - "name": "edgex-core-common-config-bootstrapper", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-core-common-config-bootstrapper" - } - }, - "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", - "type": "DirectoryOrCreate" - } - } - ], - "containers": [ - { - "name": "edgex-core-common-config-bootstrapper", - "image": "edgexfoundry/core-common-config-bootstrapper:3.0.0", - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" - }, - { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" - }, - { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-common-config-bootstrapper" - } - }, - "strategy": { - "type": "RollingUpdate", - "rollingUpdate": { - "maxSurge": 0 - } - } - } - }, - { - "name": "edgex-vault", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59986", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-device-rest" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "hashicorp/vault:1.13.2", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:3.0.0", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -9861,41 +9839,25 @@ ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - }, - { - "name": "VAULT_UI", - "value": "true" - }, - { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" - }, - { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -9907,72 +9869,55 @@ } }, { - "name": "edgex-nginx", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-8443", + "name": "tcp-59880", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-nginx" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-nginx" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-nginx" + "app": "edgex-core-data" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, - { - "name": "tmpfs-volume4", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "nginx-templates", - "emptyDir": {} - }, - { - "name": "nginx-tls", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-nginx", - "image": "nginx:1.24.0-alpine-slim", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:3.0.0", "ports": [ { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -9983,41 +9928,27 @@ } } ], - "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/etc/nginx/conf.d" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/var/cache/nginx" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/var/log/nginx" - }, - { - "name": "tmpfs-volume4", - "mountPath": "/var/run" - }, + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-core-data" + } + ], + "resources": {}, + "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" - }, - { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-nginx" + "hostname": "edgex-core-data" } }, "strategy": { @@ -10029,31 +9960,31 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59720", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-kuiper" } }, "spec": { @@ -10063,21 +9994,30 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" - } + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:3.0.0", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.9.2-alpine", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -10090,12 +10030,48 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" } ], "resources": {}, @@ -10105,14 +10081,26 @@ "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" + }, + { + "name": "kuiper-log", + "mountPath": "/kuiper/log" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -10161,7 +10149,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -10215,31 +10203,31 @@ } }, { - "name": "edgex-proxy-auth", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59842", + "name": "tcp-59900", "protocol": "TCP", - "port": 59842, - "targetPort": 59842 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-proxy-auth" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy-auth" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy-auth" + "app": "edgex-device-virtual" } }, "spec": { @@ -10251,19 +10239,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-auth", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-virtual", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-proxy-auth", - "image": "edgexfoundry/security-proxy-auth:3.0.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:3.0.0", "ports": [ { - "name": "tcp-59842", - "containerPort": 59842, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -10277,7 +10265,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-proxy-auth" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -10288,13 +10276,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-auth" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy-auth" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -10306,28 +10294,41 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-core-consul", + "service": { + "ports": [ + { + "name": "tcp-8500", + "protocol": "TCP", + "port": 8500, + "targetPort": 8500 + } + ], + "selector": { + "app": "edgex-core-consul" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", + "name": "consul-config", "emptyDir": {} }, { - "name": "tmpfs-volume2", + "name": "consul-data", "emptyDir": {} }, { @@ -10335,29 +10336,28 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", + "name": "consul-acl-token", "emptyDir": {} }, { - "name": "vault-config", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:3.0.0", + "name": "edgex-core-consul", + "image": "hashicorp/consul:1.15.2", + "ports": [ + { + "name": "tcp-8500", + "containerPort": 8500, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -10367,60 +10367,56 @@ ], "env": [ { - "name": "EDGEX_ADD_SECRETSTORE_TOKENS" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "EDGEX_ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" + "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" }, { "name": "EDGEX_GROUP", "value": "2001" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/run" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "name": "consul-data", + "mountPath": "/consul/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" - }, - { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -10432,31 +10428,31 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59861", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-scheduler" } }, "spec": { @@ -10468,19 +10464,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:3.0.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:3.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -10493,12 +10489,16 @@ ], "env": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -10509,13 +10509,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -10571,70 +10571,31 @@ ], "components": [ { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", - "protocol": "TCP", - "port": 8500, - "targetPort": 8500 - } - ], - "selector": { - "app": "edgex-core-consul" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-security-bootstrapper" } }, "spec": { "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} - }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" - } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.9.5", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.0.0", "envFrom": [ { "configMapRef": { @@ -10643,53 +10604,26 @@ } ], "env": [ - { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" - }, - { - "name": "ADD_REGISTRY_ACL_ROLES" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" - }, { "name": "EDGEX_USER", "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, "volumeMounts": [ - { - "name": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" - }, { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-security-bootstrapper" } }, "strategy": { @@ -10701,31 +10635,31 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59701", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -10737,19 +10671,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.0.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.0.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -10761,9 +10695,21 @@ } ], "env": [ + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -10774,13 +10720,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-app-rules-engine" } }, "strategy": { @@ -10792,18 +10738,31 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-redis" } }, "spec": { @@ -10813,7 +10772,7 @@ "emptyDir": {} }, { - "name": "tmpfs-volume2", + "name": "db-data", "emptyDir": {} }, { @@ -10821,29 +10780,28 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-config", + "name": "redis-config", "emptyDir": {} }, { - "name": "vault-config", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.0.0", + "name": "edgex-redis", + "image": "redis:6.2.4-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -10853,23 +10811,12 @@ ], "env": [ { - "name": "ADD_SECRETSTORE_TOKENS" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "EDGEX_USER", - "value": "2002" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, @@ -10879,34 +10826,26 @@ "mountPath": "/run" }, { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kong", - "mountPath": "/tmp/kong" - }, - { - "name": "kuiper-config", - "mountPath": "/tmp/kuiper" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-redis" } }, "strategy": { @@ -10915,21 +10854,34 @@ "maxSurge": 0 } } - } - }, - { - "name": "edgex-security-bootstrapper", + } + }, + { + "name": "edgex-support-scheduler", + "service": { + "ports": [ + { + "name": "tcp-59861", + "protocol": "TCP", + "port": 59861, + "targetPort": 59861 + } + ], + "selector": { + "app": "edgex-support-scheduler" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-support-scheduler" } }, "spec": { @@ -10937,12 +10889,26 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.0.0", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.0.0", + "ports": [ + { + "name": "tcp-59861", + "containerPort": 59861, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -10952,12 +10918,16 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -10965,12 +10935,16 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -10982,18 +10956,31 @@ } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-support-notifications", + "service": { + "ports": [ + { + "name": "tcp-59860", + "protocol": "TCP", + "port": 59860, + "targetPort": 59860 + } + ], + "selector": { + "app": "edgex-support-notifications" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-support-notifications" } }, "spec": { @@ -11002,22 +10989,25 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/support-notifications", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.0.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.0.0", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -11027,47 +11017,8 @@ ], "env": [ { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "name": "SERVICE_HOST", "value": "edgex-support-notifications" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ADD_PROXY_ROUTE" } ], "resources": {}, @@ -11076,19 +11027,15 @@ "name": "edgex-init", "mountPath": "/edgex-init" }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -11100,93 +11047,56 @@ } }, { - "name": "edgex-kong", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8100", - "protocol": "TCP", - "port": 8100, - "targetPort": 8100 - }, - { - "name": "tcp-8443", + "name": "tcp-59720", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" - } - }, - { - "name": "postgres-config", + "name": "kuiper-data", "emptyDir": {} }, { - "name": "kong", + "name": "kuiper-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.4.1-alpine", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.3.0-alpine", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -11199,81 +11109,53 @@ ], "env": [ { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - }, - { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kuiper-data", + "mountPath": "/kuiper/data" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "kuiper-config", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -11285,31 +11167,37 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-5563", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "spec": { @@ -11321,19 +11209,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-data", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.0.1", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -11346,20 +11239,12 @@ ], "env": [ { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "value": "edgex-core-data" } ], "resources": {}, @@ -11370,13 +11255,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-data" } }, "strategy": { @@ -11388,63 +11273,42 @@ } }, { - "name": "edgex-vault", - "service": { - "ports": [ - { - "name": "tcp-8200", - "protocol": "TCP", - "port": 8200, - "targetPort": 8200 - } - ], - "selector": { - "app": "edgex-vault" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-security-proxy-setup" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", + "name": "consul-acl-token", "emptyDir": {} }, { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.7.2", - "ports": [ - { - "name": "tcp-8200", - "containerPort": 8200, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.0.0", "envFrom": [ { "configMapRef": { @@ -11454,41 +11318,68 @@ ], "env": [ { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" }, { - "name": "VAULT_UI", - "value": "true" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-security-proxy-setup" } }, "strategy": { @@ -11500,41 +11391,55 @@ } }, { - "name": "edgex-core-data", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-5563", + "name": "tcp-8000", "protocol": "TCP", - "port": 5563, - "targetPort": 5563 + "port": 8000, + "targetPort": 8000 }, { - "name": "tcp-59880", + "name": "tcp-8100", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -11542,59 +11447,124 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "FileOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.0.0", + "name": "edgex-kong", + "image": "kong:2.4.1-alpine", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, "protocol": "TCP" }, { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_DNS_VALID_TTL", + "value": "1" + }, + { + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + }, + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, { - "name": "SERVICE_HOST", - "value": "edgex-core-data" + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-kong" } }, "strategy": { @@ -11606,31 +11576,31 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59986", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-device-rest" } }, "spec": { @@ -11642,19 +11612,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/device-rest", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.0.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -11668,7 +11638,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-rest" } ], "resources": {}, @@ -11679,13 +11649,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-device-rest" } }, "strategy": { @@ -11697,35 +11667,30 @@ } }, { - "name": "edgex-support-scheduler", - "service": { - "ports": [ - { - "name": "tcp-59861", - "protocol": "TCP", - "port": 59861, - "targetPort": 59861 - } - ], - "selector": { - "app": "edgex-support-scheduler" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -11733,22 +11698,27 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-config", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.0.0", - "ports": [ - { - "name": "tcp-59861", - "containerPort": 59861, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.0.0", "envFrom": [ { "configMapRef": { @@ -11758,33 +11728,60 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets" + }, + { + "name": "kong", + "mountPath": "/tmp/kong" + }, + { + "name": "kuiper-config", + "mountPath": "/tmp/kuiper" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": { @@ -11796,55 +11793,60 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-8200", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.0.0", + "name": "edgex-vault", + "image": "vault:1.7.2", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -11857,33 +11859,41 @@ ], "env": [ { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "VAULT_UI", + "value": "true" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/vault/config" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-vault" } }, "strategy": { @@ -11895,55 +11905,67 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-8500", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.0.0", + "name": "edgex-core-consul", + "image": "consul:1.9.5", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -11956,25 +11978,52 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, "volumeMounts": [ + { + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-consul" } }, "strategy": { @@ -11986,31 +12035,31 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-58890", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-sys-mgmt-agent" } }, "spec": { @@ -12020,22 +12069,21 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-config", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.3.0-alpine", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.0.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -12048,32 +12096,16 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, @@ -12083,18 +12115,14 @@ "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-config", - "mountPath": "/kuiper/etc/sources" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -12106,67 +12134,55 @@ } }, { - "name": "edgex-redis", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59882", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-core-command" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "db-data", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, - { - "name": "redis-config", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/core-command", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.4-alpine", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -12179,41 +12195,25 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" - }, - { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "db-data", - "mountPath": "/data" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, - { - "name": "redis-config", - "mountPath": "/run/redis/conf" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-command" } }, "strategy": { @@ -12225,68 +12225,55 @@ } }, { - "name": "edgex-kong-db", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59881", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:12.3-alpine", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.0.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -12299,49 +12286,29 @@ ], "env": [ { - "name": "POSTGRES_DB", - "value": "kong" - }, - { - "name": "POSTGRES_USER", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -12390,7 +12357,7 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/device-virtual", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -12444,55 +12411,68 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-5432", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-kong-db" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" - } + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.0.0", + "name": "edgex-kong-db", + "image": "postgres:12.3-alpine", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -12505,29 +12485,49 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "POSTGRES_USER", + "value": "kong" + }, + { + "name": "POSTGRES_DB", + "value": "kong" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/var/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/run" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-kong-db" } }, "strategy": { @@ -12570,45 +12570,49 @@ ], "components": [ { - "name": "edgex-proxy", + "name": "edgex-security-bootstrap-database", "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy" + "app": "edgex-security-bootstrap-database" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy" + "app": "edgex-security-bootstrap-database" } }, "spec": { "volumes": [ { - "name": "consul-scripts", + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-security-proxy-setup", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-proxy", - "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", + "name": "edgex-security-bootstrap-database", + "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -12618,31 +12622,23 @@ ], "env": [ { - "name": "SECRETSERVICE_SERVER", - "value": "edgex-vault" - }, - { - "name": "SECRETSERVICE_TOKENPATH", - "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" - }, - { - "name": "SECRETSERVICE_SNIS", - "value": "edgex-kong" - }, - { - "name": "SECRETSERVICE_CACERTPATH", - "value": "/tmp/edgex/secrets/ca/ca.pem" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" }, { - "name": "KONGURL_SERVER", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-security-bootstrap-database" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" }, { "name": "anonymous-volume1", @@ -12650,13 +12646,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy" + "hostname": "edgex-security-bootstrap-database" } }, "strategy": { @@ -12668,45 +12664,50 @@ } }, { - "name": "edgex-app-service-configurable-rules", - "service": { - "ports": [ - { - "name": "tcp-48100", - "protocol": "TCP", - "port": 48100, - "targetPort": 48100 - } - ], - "selector": { - "app": "edgex-app-service-configurable-rules" - } - }, + "name": "edgex-secrets-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-secrets-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-secrets-setup" } }, "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "secrets-setup-cache", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets", + "type": "FileOrCreate" + } + }, + { + "name": "vault-init", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-app-service-configurable-rules", - "image": "edgexfoundry/docker-app-service-configurable:1.3.1", - "ports": [ - { - "name": "tcp-48100", - "containerPort": 48100, - "protocol": "TCP" - } - ], + "name": "edgex-secrets-setup", + "image": "edgexfoundry/docker-security-secrets-setup-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -12714,33 +12715,33 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-service-configurable-rules" + "name": "tmpfs-volume1", + "mountPath": "/tmp" }, { - "name": "SERVICE_PORT", - "value": "48100" + "name": "tmpfs-volume2", + "mountPath": "/run" }, { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-core-data" + "name": "secrets-setup-cache", + "mountPath": "/etc/edgex/pki" }, { - "name": "BINDING_PUBLISHTOPIC", - "value": "events" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "vault-init", + "mountPath": "/vault/init" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-secrets-setup" } }, "strategy": { @@ -12752,49 +12753,61 @@ } }, { - "name": "edgex-security-bootstrap-database", + "name": "edgex-core-metadata", + "service": { + "ports": [ + { + "name": "tcp-48081", + "protocol": "TCP", + "port": 48081, + "targetPort": 48081 + } + ], + "selector": { + "app": "edgex-core-metadata" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrap-database" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrap-database" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-core-metadata", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-security-bootstrap-database", - "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", + "name": "edgex-core-metadata", + "image": "edgexfoundry/docker-core-metadata-go:1.3.1", + "ports": [ + { + "name": "tcp-48081", + "containerPort": 48081, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -12805,36 +12818,32 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-security-bootstrap-database" + "value": "edgex-core-metadata" + }, + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" + "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets/ca" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" + "mountPath": "/tmp/edgex/secrets/edgex-core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrap-database" + "hostname": "edgex-core-metadata" } }, "strategy": { @@ -12885,14 +12894,14 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { "path": "/tmp/edgex/secrets/edgex-core-data", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -12955,58 +12964,42 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-48082", + "name": "tcp-48090", "protocol": "TCP", - "port": 48082, - "targetPort": 48082 + "port": 48090, + "targetPort": 48090 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-sys-mgmt-agent" } }, "spec": { - "volumes": [ - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" - } - }, - { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-core-command", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/docker-core-command-go:1.3.1", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-48090", + "containerPort": 48090, "protocol": "TCP" } ], @@ -13020,28 +13013,22 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-sys-mgmt-agent" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-command" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": { @@ -13053,42 +13040,48 @@ } }, { - "name": "edgex-device-virtual", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-49990", + "name": "tcp-6379", "protocol": "TCP", - "port": 49990, - "targetPort": 49990 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/docker-device-virtual-go:1.3.1", + "name": "edgex-redis", + "image": "redis:6.0.9-alpine", "ports": [ { - "name": "tcp-49990", - "containerPort": 49990, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -13099,17 +13092,17 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-redis" } }, "strategy": { @@ -13121,18 +13114,31 @@ } }, { - "name": "", + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "" + "app": "edgex-vault" } }, "spec": { @@ -13142,14 +13148,36 @@ "emptyDir": {} }, { - "name": "consul-scripts", + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-vault", + "type": "FileOrCreate" + } + }, + { + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-init", + "emptyDir": {} + }, + { + "name": "vault-logs", "emptyDir": {} } ], "containers": [ { - "name": "", - "image": "kong:2.0.5", + "name": "edgex-vault", + "image": "vault:1.5.3", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -13159,32 +13187,45 @@ ], "env": [ { - "name": "KONG_PG_PASSWORD", - "value": "kong" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "VAULT_UI", + "value": "true" }, { - "name": "KONG_PG_HOST", - "value": "kong-db" + "name": "VAULT_ADDR", + "value": "https://edgex-vault:8200" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/tmp" + "mountPath": "/vault/config" }, { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/edgex-vault" + }, + { + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-init", + "mountPath": "/vault/init" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } - ] + ], + "hostname": "edgex-vault" } }, "strategy": { @@ -13196,48 +13237,58 @@ } }, { - "name": "edgex-redis", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-48060", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 48060, + "targetPort": 48060 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-support-notifications" } }, "spec": { "volumes": [ { - "name": "db-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "FileOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-support-notifications", + "type": "FileOrCreate" + } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.0.9-alpine", + "name": "edgex-support-notifications", + "image": "edgexfoundry/docker-support-notifications-go:1.3.1", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-48060", + "containerPort": 48060, "protocol": "TCP" } ], @@ -13248,17 +13299,31 @@ } } ], + "env": [ + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" + }, + { + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-support-notifications" } }, "strategy": { @@ -13270,42 +13335,58 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-48090", + "name": "tcp-48082", "protocol": "TCP", - "port": 48090, - "targetPort": 48090 + "port": 48082, + "targetPort": 48082 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-command" } }, "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "FileOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-core-command", + "type": "FileOrCreate" + } + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", + "name": "edgex-core-command", + "image": "edgexfoundry/docker-core-command-go:1.3.1", "ports": [ { - "name": "tcp-48090", - "containerPort": 48090, + "name": "tcp-48082", + "containerPort": 48082, "protocol": "TCP" } ], @@ -13318,23 +13399,29 @@ ], "env": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-core-command" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-core-command" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-command" } }, "strategy": { @@ -13346,18 +13433,18 @@ } }, { - "name": "edgex-secrets-setup", + "name": "edgex-vault-worker", "deployment": { "selector": { "matchLabels": { - "app": "edgex-secrets-setup" + "app": "edgex-vault-worker" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-secrets-setup" + "app": "edgex-vault-worker" } }, "spec": { @@ -13371,25 +13458,25 @@ "emptyDir": {} }, { - "name": "secrets-setup-cache", + "name": "consul-scripts", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { - "name": "vault-init", + "name": "vault-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-secrets-setup", - "image": "edgexfoundry/docker-security-secrets-setup-go:1.3.1", + "name": "edgex-vault-worker", + "image": "edgexfoundry/docker-security-secretstore-setup-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -13397,33 +13484,39 @@ } } ], + "env": [ + { + "name": "SECRETSTORE_SETUP_DONE_FLAG", + "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + } + ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/tmp" + "mountPath": "/run" }, { "name": "tmpfs-volume2", - "mountPath": "/run" + "mountPath": "/vault" }, { - "name": "secrets-setup-cache", - "mountPath": "/etc/edgex/pki" + "name": "consul-scripts", + "mountPath": "/consul/scripts" }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets" }, { - "name": "vault-init", - "mountPath": "/vault/init" + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-secrets-setup" + "hostname": "edgex-vault-worker" } }, "strategy": { @@ -13435,42 +13528,42 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-49986", + "name": "tcp-48100", "protocol": "TCP", - "port": 49986, - "targetPort": 49986 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-app-service-configurable-rules" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/docker-device-rest-go:1.2.1", + "name": "edgex-app-service-configurable-rules", + "image": "edgexfoundry/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-49986", - "containerPort": 49986, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], @@ -13484,14 +13577,30 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-app-service-configurable-rules" + }, + { + "name": "SERVICE_PORT", + "value": "48100" + }, + { + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-core-data" + }, + { + "name": "BINDING_PUBLISHTOPIC", + "value": "events" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": { @@ -13503,49 +13612,31 @@ } }, { - "name": "kong", + "name": "kong-db", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8001", - "protocol": "TCP", - "port": 8001, - "targetPort": 8001 - }, - { - "name": "tcp-8443", - "protocol": "TCP", - "port": 8443, - "targetPort": 8443 - }, - { - "name": "tcp-8444", + "name": "tcp-5432", "protocol": "TCP", - "port": 8444, - "targetPort": 8444 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "kong" + "app": "kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "kong" + "app": "kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "kong" + "app": "kong-db" } }, "spec": { @@ -13559,37 +13650,22 @@ "emptyDir": {} }, { - "name": "consul-scripts", + "name": "tmpfs-volume3", "emptyDir": {} }, { - "name": "kong", + "name": "postgres-data", "emptyDir": {} } ], "containers": [ { - "name": "kong", - "image": "kong:2.0.5", + "name": "kong-db", + "image": "postgres:12.3-alpine", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8001", - "containerPort": 8001, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, - "protocol": "TCP" - }, - { - "name": "tcp-8444", - "containerPort": 8444, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -13602,61 +13678,41 @@ ], "env": [ { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "0.0.0.0:8001, 0.0.0.0:8444 ssl" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_PG_HOST", - "value": "kong-db" - }, - { - "name": "KONG_PG_PASSWORD", + "name": "POSTGRES_DB", "value": "kong" }, { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" + "name": "POSTGRES_PASSWORD", + "value": "kong" }, { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "POSTGRES_USER", + "value": "kong" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" + "mountPath": "/var/run" }, { "name": "tmpfs-volume2", "mountPath": "/tmp" }, { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "tmpfs-volume3", + "mountPath": "/run" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "kong" + "hostname": "kong-db" } }, "strategy": { @@ -13668,53 +13724,93 @@ } }, { - "name": "edgex-kuiper", + "name": "kong", "service": { "ports": [ { - "name": "tcp-20498", + "name": "tcp-8000", "protocol": "TCP", - "port": 20498, - "targetPort": 20498 + "port": 8000, + "targetPort": 8000 }, { - "name": "tcp-48075", + "name": "tcp-8001", "protocol": "TCP", - "port": 48075, - "targetPort": 48075 + "port": 8001, + "targetPort": 8001 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 + }, + { + "name": "tcp-8444", + "protocol": "TCP", + "port": 8444, + "targetPort": 8444 } ], "selector": { - "app": "edgex-kuiper" + "app": "kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "kong" } }, "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "consul-scripts", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-kuiper", - "image": "emqx/kuiper:1.1.1-alpine", + "name": "kong", + "image": "kong:2.0.5", "ports": [ { - "name": "tcp-20498", - "containerPort": 20498, + "name": "tcp-8000", + "containerPort": 8000, "protocol": "TCP" }, { - "name": "tcp-48075", - "containerPort": 48075, + "name": "tcp-8001", + "containerPort": 8001, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + }, + { + "name": "tcp-8444", + "containerPort": 8444, "protocol": "TCP" } ], @@ -13727,39 +13823,61 @@ ], "env": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "48075" + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "5566" + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" + "name": "KONG_ADMIN_LISTEN", + "value": "0.0.0.0:8001, 0.0.0.0:8444 ssl" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" + "name": "KONG_DATABASE", + "value": "postgres" }, { - "name": "EDGEX__DEFAULT__SERVICESERVER", - "value": "http://edgex-core-data:48080" + "name": "KONG_PG_HOST", + "value": "kong-db" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "events" + "name": "KONG_PG_PASSWORD", + "value": "kong" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" } ], "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "kong" } }, "strategy": { @@ -13816,28 +13934,28 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume3", "hostPath": { "path": "/tmp/edgex/secrets/edgex-kong", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume4", "hostPath": { "path": "/tmp/edgex/secrets/edgex-vault", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } } ], @@ -13860,10 +13978,6 @@ } ], "env": [ - { - "name": "EDGEX_DB", - "value": "redis" - }, { "name": "EDGEX_SECURE", "value": "true" @@ -13871,6 +13985,10 @@ { "name": "SECRETSTORE_SETUP_DONE_FLAG", "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + }, + { + "name": "EDGEX_DB", + "value": "redis" } ], "resources": {}, @@ -13919,31 +14037,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-48081", + "name": "tcp-48085", "protocol": "TCP", - "port": 48081, - "targetPort": 48081 + "port": 48085, + "targetPort": 48085 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-support-scheduler" } }, "spec": { @@ -13952,25 +14070,25 @@ "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-core-metadata", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-support-scheduler", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/docker-core-metadata-go:1.3.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/docker-support-scheduler-go:1.3.1", "ports": [ { - "name": "tcp-48081", - "containerPort": 48081, + "name": "tcp-48085", + "containerPort": 48085, "protocol": "TCP" } ], @@ -13984,15 +14102,19 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" + "value": "/tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -14003,13 +14125,13 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-metadata" + "mountPath": "/tmp/edgex/secrets/edgex-support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-scheduler" } }, "strategy": { @@ -14021,61 +14143,45 @@ } }, { - "name": "edgex-support-scheduler", - "service": { - "ports": [ - { - "name": "tcp-48085", - "protocol": "TCP", - "port": 48085, - "targetPort": 48085 - } - ], - "selector": { - "app": "edgex-support-scheduler" - } - }, + "name": "edgex-proxy", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy" } }, "spec": { "volumes": [ + { + "name": "consul-scripts", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" + "type": "FileOrCreate" } }, { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-support-scheduler", - "type": "DirectoryOrCreate" + "path": "/tmp/edgex/secrets/edgex-security-proxy-setup", + "type": "FileOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/docker-support-scheduler-go:1.3.1", - "ports": [ - { - "name": "tcp-48085", - "containerPort": 48085, - "protocol": "TCP" - } - ], + "name": "edgex-proxy", + "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -14085,37 +14191,45 @@ ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json" + "name": "KONGURL_SERVER", + "value": "kong" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "SECRETSERVICE_TOKENPATH", + "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "SECRETSERVICE_SNIS", + "value": "edgex-kong" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "SECRETSERVICE_SERVER", + "value": "edgex-vault" + }, + { + "name": "SECRETSERVICE_CACERTPATH", + "value": "/tmp/edgex/secrets/ca/ca.pem" } ], "resources": {}, "volumeMounts": [ + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets/ca" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-support-scheduler" + "mountPath": "/tmp/edgex/secrets/edgex-security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-proxy" } }, "strategy": { @@ -14127,61 +14241,35 @@ } }, { - "name": "edgex-support-notifications", - "service": { - "ports": [ - { - "name": "tcp-48060", - "protocol": "TCP", - "port": 48060, - "targetPort": 48060 - } - ], - "selector": { - "app": "edgex-support-notifications" - } - }, + "name": "", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "" } }, "spec": { "volumes": [ { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" - } + "name": "tmpfs-volume1", + "emptyDir": {} }, { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-support-notifications", - "type": "DirectoryOrCreate" - } + "name": "consul-scripts", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/docker-support-notifications-go:1.3.1", - "ports": [ - { - "name": "tcp-48060", - "containerPort": 48060, - "protocol": "TCP" - } - ], + "name": "", + "image": "kong:2.0.5", "envFrom": [ { "configMapRef": { @@ -14191,29 +14279,32 @@ ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" + "name": "KONG_PG_PASSWORD", + "value": "kong" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_PG_HOST", + "value": "kong-db" } ], "resources": {}, "volumeMounts": [ { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "name": "tmpfs-volume1", + "mountPath": "/tmp" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" + "name": "consul-scripts", + "mountPath": "/consul/scripts" } ], "imagePullPolicy": "IfNotPresent" } - ], - "hostname": "edgex-support-notifications" + ] } }, "strategy": { @@ -14225,60 +14316,42 @@ } }, { - "name": "kong-db", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-49990", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 49990, + "targetPort": 49990 } ], "selector": { - "app": "kong-db" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "kong-db" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "kong-db" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "kong-db", - "image": "postgres:12.3-alpine", + "name": "edgex-device-virtual", + "image": "edgexfoundry/docker-device-virtual-go:1.3.1", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-49990", + "containerPort": 49990, "protocol": "TCP" } ], @@ -14291,41 +14364,15 @@ ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" - }, - { - "name": "POSTGRES_DB", - "value": "kong" - }, - { - "name": "POSTGRES_PASSWORD", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "kong-db" + "hostname": "edgex-device-virtual" } }, "strategy": { @@ -14337,67 +14384,53 @@ } }, { - "name": "edgex-vault", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-20498", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 20498, + "targetPort": 20498 + }, + { + "name": "tcp-48075", + "protocol": "TCP", + "port": 48075, + "targetPort": 48075 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-kuiper" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-vault", - "type": "DirectoryOrCreate" - } - }, - { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-init", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.5.3", + "name": "edgex-kuiper", + "image": "emqx/kuiper:1.1.1-alpine", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-20498", + "containerPort": 20498, + "protocol": "TCP" + }, + { + "name": "tcp-48075", + "containerPort": 48075, "protocol": "TCP" } ], @@ -14410,45 +14443,39 @@ ], "env": [ { - "name": "VAULT_UI", - "value": "true" + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" }, { - "name": "VAULT_ADDR", - "value": "https://edgex-vault:8200" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-app-service-configurable-rules" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-vault" + "name": "EDGEX__DEFAULT__SERVICESERVER", + "value": "http://edgex-core-data:48080" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "events" }, { - "name": "vault-init", - "mountPath": "/vault/init" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-kuiper" } }, "strategy": { @@ -14460,50 +14487,45 @@ } }, { - "name": "edgex-vault-worker", + "name": "edgex-device-rest", + "service": { + "ports": [ + { + "name": "tcp-49986", + "protocol": "TCP", + "port": 49986, + "targetPort": 49986 + } + ], + "selector": { + "app": "edgex-device-rest" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault-worker" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault-worker" + "app": "edgex-device-rest" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "consul-scripts", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "vault-config", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-vault-worker", - "image": "edgexfoundry/docker-security-secretstore-setup-go:1.3.1", + "name": "edgex-device-rest", + "image": "edgexfoundry/docker-device-rest-go:1.2.1", + "ports": [ + { + "name": "tcp-49986", + "containerPort": 49986, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -14513,37 +14535,15 @@ ], "env": [ { - "name": "SECRETSTORE_SETUP_DONE_FLAG", - "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "vault-config", - "mountPath": "/vault/config" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault-worker" + "hostname": "edgex-device-rest" } }, "strategy": {