diff --git a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json index 99ff66567ae..9eb5e537bfd 100644 --- a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json +++ b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config-nosecty.json @@ -1,64 +1,62 @@ { "versions": [ { - "versionName": "kamakura", + "versionName": "napa", "configMaps": [ { "metadata": { "name": "common-variables", "creationTimestamp": null - }, - "data": { - "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": "false", - "MESSAGEQUEUE_HOST": "edgex-redis", - "REGISTRY_HOST": "edgex-core-consul" } } ], "components": [ { - "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": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.2.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:3.1.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -70,58 +68,85 @@ } ], "env": [ + { + "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": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59882", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-core-command" } }, "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.2.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:3.1.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -135,64 +160,79 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-core-command" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-ui-go", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59880", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "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": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.2.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:3.1.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -203,53 +243,78 @@ } } ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-data" + } + ], "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59881", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.2.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:3.1.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -261,66 +326,74 @@ } ], "env": [ - { - "name": "METRICSMECHANISM", - "value": "executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-core-metadata" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "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": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.2.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.14-alpine", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -331,59 +404,68 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.2.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:3.1.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -397,166 +479,35 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-support-notifications" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" } ], "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59881", - "protocol": "TCP", - "port": 59881, - "targetPort": 59881 - } - ], - "selector": { - "app": "edgex-core-metadata" - } - }, - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-core-metadata" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-core-metadata" - } - }, - "spec": { - "containers": [ - { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.2.0", - "ports": [ - { - "name": "tcp-59881", - "containerPort": 59881, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-metadata" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-core-data", - "service": { - "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "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": { - "containers": [ - { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.2.0", - "ports": [ - { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-data" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-data" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", + "name": "tcp-8500", "protocol": "TCP", "port": 8500, "targetPort": 8500 @@ -593,7 +544,7 @@ "containers": [ { "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.10", + "image": "openyurt/consul:1.16.2", "ports": [ { "name": "tcp-8500", @@ -629,48 +580,51 @@ } }, { - "name": "edgex-redis", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59986", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "spec": { "volumes": [ { - "name": "db-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.6-alpine", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:3.1.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -681,59 +635,78 @@ } } ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-device-rest" + } + ], "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "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": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.2.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:3.1.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -746,27 +719,25 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-virtual" } }, "strategy": {} @@ -802,15 +773,34 @@ }, "spec": { "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, { "name": "kuiper-data", "emptyDir": {} + }, + { + "name": "kuiper-etc", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} + }, + { + "name": "kuiper-plugins", + "emptyDir": {} } ], "containers": [ { "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.4.4-alpine", + "image": "openyurt/ekuiper:1.11.4-alpine", "ports": [ { "name": "tcp-59720", @@ -827,103 +817,1266 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "value": "edgex/rules-events" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", "value": "6379" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { "name": "KUIPER__BASIC__RESTPORT", "value": "59720" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + }, + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-etc", + "mountPath": "/kuiper/etc" + }, + { + "name": "kuiper-log", + "mountPath": "/kuiper/log" + }, + { + "name": "kuiper-plugins", + "mountPath": "/kuiper/plugins" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kuiper" + } + }, + "strategy": {} + } + }, + { + "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": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-core-common-config-bootstrapper", + "image": "openyurt/core-common-config-bootstrapper:3.1.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "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" + }, + { + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-common-config-bootstrapper" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-ui-go", + "service": { + "ports": [ + { + "name": "tcp-4000", + "protocol": "TCP", + "port": 4000, + "targetPort": 4000 + } + ], + "selector": { + "app": "edgex-ui-go" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-ui-go" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-ui-go" + } + }, + "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:3.1.0", + "ports": [ + { + "name": "tcp-4000", + "containerPort": 4000, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-ui-go" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-ui-go" + } + }, + "strategy": {} + } + }, + { + "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-app-rules-engine" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-app-rules-engine" + } + }, + "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:3.1.0", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" } ], "resources": {}, "volumeMounts": [ { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-app-rules-engine" + } + }, + "strategy": {} + } + } + ] + }, + { + "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": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" + }, + { + "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-common-config-bootstrapper" + } + }, + "strategy": {} + } + }, + { + "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-support-scheduler" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-support-scheduler" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:3.0.0", + "ports": [ + { + "name": "tcp-59861", + "containerPort": 59861, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-scheduler" + } + }, + "strategy": {} + } + }, + { + "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-core-consul" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-consul" + } + }, + "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-core-consul", + "image": "openyurt/consul:1.15.2", + "ports": [ + { + "name": "tcp-8500", + "containerPort": 8500, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-consul" + } + }, + "strategy": {} + } + }, + { + "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": { + "containers": [ + { + "name": "edgex-core-command", + "image": "openyurt/core-command:3.0.0", + "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": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-command" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-kuiper", + "service": { + "ports": [ + { + "name": "tcp-59720", + "protocol": "TCP", + "port": 59720, + "targetPort": 59720 + } + ], + "selector": { + "app": "edgex-kuiper" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-kuiper" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-kuiper" + } + }, + "spec": { + "volumes": [ + { + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.9.2-alpine", + "ports": [ + { + "name": "tcp-59720", + "containerPort": 59720, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-log", + "mountPath": "/kuiper/log" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kuiper" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-metadata", + "service": { + "ports": [ + { + "name": "tcp-59881", + "protocol": "TCP", + "port": 59881, + "targetPort": 59881 + } + ], + "selector": { + "app": "edgex-core-metadata" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-metadata" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-metadata" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:3.0.0", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-metadata" + } + }, + "strategy": {} + } + }, + { + "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-support-notifications" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-support-notifications" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:3.0.0", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-notifications" + } + }, + "strategy": {} + } + }, + { + "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-app-rules-engine" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-app-rules-engine" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:3.0.1", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-app-rules-engine" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-ui-go", + "service": { + "ports": [ + { + "name": "tcp-4000", + "protocol": "TCP", + "port": 4000, + "targetPort": 4000 + } + ], + "selector": { + "app": "edgex-ui-go" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-ui-go" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-ui-go" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:3.0.0", + "ports": [ + { + "name": "tcp-4000", + "containerPort": 4000, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-ui-go" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-ui-go" + } + }, + "strategy": {} + } + }, + { + "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": "tcp-59986", + "containerPort": 59986, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-device-rest" + }, + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-device-rest" + } + }, + "strategy": {} + } + }, + { + "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-device-virtual" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:3.0.0", + "ports": [ + { + "name": "tcp-59900", + "containerPort": 59900, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_SECURITY_SECRET_STORE", + "value": "false" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-device-virtual" + } + }, + "strategy": {} + } + }, + { + "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": { + "containers": [ + { + "name": "edgex-core-data", + "image": "openyurt/core-data:3.0.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": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-6379", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.2.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.11-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -934,17 +2087,17 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-redis" } }, "strategy": {} @@ -953,7 +2106,7 @@ ] }, { - "versionName": "jakarta", + "versionName": "kamakura", "configMaps": [ { "metadata": { @@ -975,42 +2128,42 @@ ], "components": [ { - "name": "edgex-core-command", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59900", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.1.1", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.2.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -1024,56 +2177,62 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.1.0", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.6-alpine", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -1085,52 +2244,58 @@ } ], "resources": {}, + "volumeMounts": [ + { + "name": "db-data", + "mountPath": "/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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.1.1", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.2.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -1144,14 +2309,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": {} @@ -1212,27 +2377,31 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", "value": "6379" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { - "name": "EDGEX__DEFAULT__SERVER", + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", "value": "edgex-redis" }, { @@ -1240,20 +2409,16 @@ "value": "true" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" } ], "resources": {}, @@ -1273,42 +2438,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.1.1", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.10", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -1319,78 +2494,63 @@ } } ], - "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "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": {} } }, { - "name": "edgex-core-data", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "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": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.1.1", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.2.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -1404,56 +2564,56 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "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.2.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -1465,64 +2625,70 @@ } ], "env": [ + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-app-rules-engine" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59881", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-core-metadata" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.6-alpine", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.2.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -1533,59 +2699,63 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59860", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.1.1", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.2.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -1599,56 +2769,67 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-5563", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "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": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.1.1", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.2.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -1662,60 +2843,56 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "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.2.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -1728,65 +2905,65 @@ ], "env": [ { - "name": "METRICSMECHANISM", - "value": "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": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-4000", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.1.2", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.2.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -1797,81 +2974,53 @@ } } ], - "env": [ - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - } - ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-58890", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.3", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.2.0", "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, + { + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -1882,21 +3031,25 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} @@ -1905,7 +3058,7 @@ ] }, { - "versionName": "levski", + "versionName": "jakarta", "configMaps": [ { "metadata": { @@ -1927,42 +3080,53 @@ ], "components": [ { - "name": "edgex-device-rest", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-5563", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.3.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.1.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -1976,56 +3140,62 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "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.3.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -2038,65 +3208,103 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59861", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.3.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.1.1", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -2108,58 +3316,76 @@ } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-ui-go", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-8500", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.3.0", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.3", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -2170,59 +3396,63 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59986", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.3.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.1.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -2234,62 +3464,58 @@ } ], "env": [ - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59860", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.3.1", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.1.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -2301,80 +3527,58 @@ } ], "env": [ - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59882", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.13.2", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.1.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -2385,63 +3589,59 @@ } } ], - "resources": {}, - "volumeMounts": [ - { - "name": "consul-config", - "mountPath": "/consul/config" - }, + "env": [ { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59881", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.3.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.1.1", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -2453,66 +3653,68 @@ } ], "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-core-metadata" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "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": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.3.0", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.6-alpine", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -2523,73 +3725,59 @@ } } ], - "env": [ - { - "name": "MESSAGEQUEUE_EXTERNAL_URL", - "value": "tcp://edgex-mqtt-broker:1883" - }, - { - "name": "SERVICE_HOST", - "value": "edgex-core-command" - }, + "resources": {}, + "volumeMounts": [ { - "name": "MESSAGEQUEUE_INTERNAL_HOST", - "value": "edgex-redis" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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.1.2", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -2602,103 +3790,69 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59900", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59900, + "targetPort": 59900 } ], "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/support-notifications:2.3.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.1.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -2712,67 +3866,56 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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.1.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -2786,62 +3929,64 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-4000", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:7.0.5-alpine", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.1.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -2853,16 +3998,10 @@ } ], "resources": {}, - "volumeMounts": [ - { - "name": "db-data", - "mountPath": "/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-ui-go" } }, "strategy": {} @@ -2871,7 +4010,7 @@ ] }, { - "versionName": "minnesota", + "versionName": "levski", "configMaps": [ { "metadata": { @@ -2879,48 +4018,67 @@ "creationTimestamp": null }, "data": { - "EDGEX_SECURITY_SECRET_STORE": "false" + "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": "false", + "MESSAGEQUEUE_HOST": "edgex-redis", + "REGISTRY_HOST": "edgex-core-consul" } } ], "components": [ { - "name": "edgex-device-rest", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-5563", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:3.0.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.3.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -2934,56 +4092,62 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "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": { + "volumes": [ + { + "name": "kuiper-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:3.0.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.7.1-alpine", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -2996,61 +4160,103 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59880", + "name": "tcp-59861", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:3.0.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.3.0", "ports": [ { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -3062,8 +4268,16 @@ } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", "value": "edgex-core-data" } ], @@ -3071,49 +4285,49 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-ui-go", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59701", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-app-rules-engine" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:3.0.0", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -3127,66 +4341,68 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59882", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-core-command" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.15.2", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.3.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -3197,21 +4413,25 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "MESSAGEQUEUE_EXTERNAL_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "MESSAGEQUEUE_INTERNAL_HOST", + "value": "edgex-redis" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -3249,7 +4469,7 @@ "containers": [ { "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:3.0.0", + "image": "openyurt/core-metadata:2.3.0", "ports": [ { "name": "tcp-59881", @@ -3265,6 +4485,10 @@ } ], "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, { "name": "SERVICE_HOST", "value": "edgex-core-metadata" @@ -3281,48 +4505,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:7.0.11-alpine", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.3.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -3333,59 +4551,59 @@ } } ], - "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": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-4000", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:3.0.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.3.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -3399,56 +4617,56 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-ui-go" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "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:3.0.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.3.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -3462,70 +4680,66 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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": "kuiper-log", + "name": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.9.2-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.13.2", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -3536,92 +4750,72 @@ } } ], - "env": [ - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - } - ], "resources": {}, "volumeMounts": [ { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "kuiper-log", - "mountPath": "/kuiper/log" + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-core-common-config-bootstrapper", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "openyurt/core-common-config-bootstrapper:3.0.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.5-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -3629,75 +4823,59 @@ } } ], - "env": [ - { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" - }, - { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" - }, + "resources": {}, + "volumeMounts": [ { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-common-config-bootstrapper" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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:3.0.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.3.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -3711,56 +4889,64 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "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:3.0.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.3.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -3772,24 +4958,16 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBPUSHED_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": {} @@ -3868,7 +5046,7 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "name": "INTERVALACTIONS_SCRUBAGED_HOST", "value": "edgex-core-data" }, { @@ -3876,7 +5054,7 @@ "value": "edgex-support-scheduler" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", "value": "edgex-core-data" } ], @@ -3891,42 +5069,52 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-8500", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.0.1", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.9.5", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -3937,71 +5125,130 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, + "name": "consul-data", + "mountPath": "/consul/data" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-consul" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-metadata", + "service": { + "ports": [ + { + "name": "tcp-59881", + "protocol": "TCP", + "port": 59881, + "targetPort": 59881 + } + ], + "selector": { + "app": "edgex-core-metadata" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-metadata" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-metadata" + } + }, + "spec": { + "containers": [ + { + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.0.0", + "ports": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "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.0.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.0.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -4013,72 +5260,58 @@ } ], "env": [ - { - "name": "METRICSMECHANISM", - "value": "executor" - }, - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "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.3.0-alpine", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.0.1", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -4091,87 +5324,69 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59860", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59860, + "targetPort": 59860 } ], "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/core-metadata:2.0.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.0.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -4185,18 +5400,14 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-notifications" } }, "strategy": {} @@ -4266,48 +5477,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-58890", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-sys-mgmt-agent" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.4-alpine", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -4318,59 +5523,73 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-6379", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.0.0", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.4-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -4381,17 +5600,17 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-redis" } }, "strategy": {} @@ -4461,77 +5680,99 @@ } }, { - "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.9.5", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.3.0-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { - "configMapRef": { - "name": "common-variables" - } + "configMapRef": { + "name": "common-variables" + } + } + ], + "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": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "kuiper-data", + "mountPath": "/kuiper/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-kuiper" } }, "strategy": {} @@ -4610,69 +5851,6 @@ }, "strategy": {} } - }, - { - "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": { - "containers": [ - { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.0.0", - "ports": [ - { - "name": "tcp-59882", - "containerPort": 59882, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-command" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-command" - } - }, - "strategy": {} - } } ] }, @@ -4833,42 +6011,42 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-48085", + "name": "tcp-48100", "protocol": "TCP", - "port": 48085, - "targetPort": 48085 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-app-service-configurable-rules" } }, "spec": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/docker-support-scheduler-go:1.3.1", + "name": "edgex-app-service-configurable-rules", + "image": "openyurt/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-48085", - "containerPort": 48085, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], @@ -4880,16 +6058,24 @@ } ], "env": [ + { + "name": "BINDING_PUBLISHTOPIC", + "value": "events" + }, + { + "name": "SERVICE_PORT", + "value": "48100" + }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-app-service-configurable-rules" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", "value": "edgex-core-data" } ], @@ -4897,7 +6083,7 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": {} @@ -4978,48 +6164,42 @@ } }, { - "name": "edgex-redis", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-49990", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 49990, + "targetPort": 49990 } ], "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.0.9-alpine", + "name": "edgex-device-virtual", + "image": "openyurt/docker-device-virtual-go:1.3.1", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-49990", + "containerPort": 49990, "protocol": "TCP" } ], @@ -5030,59 +6210,59 @@ } } ], - "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": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-49990", + "name": "tcp-48082", "protocol": "TCP", - "port": 49990, - "targetPort": 49990 + "port": 48082, + "targetPort": 48082 } ], "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/docker-device-virtual-go:1.3.1", + "name": "edgex-core-command", + "image": "openyurt/docker-core-command-go:1.3.1", "ports": [ { - "name": "tcp-49990", - "containerPort": 49990, + "name": "tcp-48082", + "containerPort": 48082, "protocol": "TCP" } ], @@ -5096,56 +6276,56 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-49986", + "name": "tcp-48085", "protocol": "TCP", - "port": 49986, - "targetPort": 49986 + "port": 48085, + "targetPort": 48085 } ], "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/docker-device-rest-go:1.2.1", + "name": "edgex-support-scheduler", + "image": "openyurt/docker-support-scheduler-go:1.3.1", "ports": [ { - "name": "tcp-49986", - "containerPort": 49986, + "name": "tcp-48085", + "containerPort": 48085, "protocol": "TCP" } ], @@ -5157,72 +6337,66 @@ } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-48090", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 48090, + "targetPort": 48090 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-sys-mgmt-agent" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - }, - { - "name": "consul-scripts", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/docker-edgex-consul:1.3.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/docker-sys-mgmt-agent-go:1.3.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-48090", + "containerPort": 48090, "protocol": "TCP" } ], @@ -5235,86 +6409,71 @@ ], "env": [ { - "name": "EDGEX_DB", - "value": "redis" - }, - { - "name": "EDGEX_SECURE", - "value": "false" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-kuiper", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-20498", - "protocol": "TCP", - "port": 20498, - "targetPort": 20498 - }, - { - "name": "tcp-48075", + "name": "tcp-6379", "protocol": "TCP", - "port": 48075, - "targetPort": 48075 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/kuiper:1.1.1-alpine", + "name": "edgex-redis", + "image": "openyurt/redis:6.0.9-alpine", "ports": [ { - "name": "tcp-20498", - "containerPort": 20498, - "protocol": "TCP" - }, - { - "name": "tcp-48075", - "containerPort": 48075, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -5325,83 +6484,73 @@ } } ], - "env": [ - { - "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": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" - }, + "resources": {}, + "volumeMounts": [ { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-48082", + "name": "tcp-8500", "protocol": "TCP", - "port": 48082, - "targetPort": 48082 + "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": "consul-scripts", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/docker-core-command-go:1.3.1", + "name": "edgex-core-consul", + "image": "openyurt/docker-edgex-consul:1.3.0", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -5414,57 +6563,75 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "EDGEX_DB", + "value": "redis" + }, + { + "name": "EDGEX_SECURE", + "value": "false" } ], "resources": {}, + "volumeMounts": [ + { + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "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" } ], @@ -5476,66 +6643,69 @@ } ], "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "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" } ], @@ -5548,31 +6718,39 @@ ], "env": [ { - "name": "BINDING_PUBLISHTOPIC", - "value": "events" + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" }, { - "name": "SERVICE_HOST", + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" + }, + { + "name": "EDGEX__DEFAULT__SERVER", "value": "edgex-app-service-configurable-rules" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "EDGEX__DEFAULT__SERVICESERVER", + "value": "http://edgex-core-data:48080" }, { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "events" }, { - "name": "SERVICE_PORT", - "value": "48100" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-kuiper" } }, "strategy": {} diff --git a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json index dc0ccf99e6f..75c600a4006 100644 --- a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json +++ b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/config.json @@ -1,7 +1,7 @@ { "versions": [ { - "versionName": "kamakura", + "versionName": "napa", "configMaps": [ { "metadata": { @@ -9,31 +9,15 @@ "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", - "SPIFFE_ENDPOINTSOCKET": "/tmp/edgex/secrets/spiffe/public/api.sock", - "SPIFFE_TRUSTBUNDLE_PATH": "/tmp/edgex/secrets/spiffe/trust/bundle", - "SPIFFE_TRUSTDOMAIN": "edgexfoundry.org", "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_PROXYSETUP_READYPORT": "54325", "STAGEGATE_READY_TORUNPORT": "54329", "STAGEGATE_REGISTRY_HOST": "edgex-core-consul", "STAGEGATE_REGISTRY_PORT": "8500", @@ -46,129 +30,31 @@ ], "components": [ { - "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-app-rules-engine" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-app-rules-engine" - } - }, - "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" - } - } - ], - "containers": [ - { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.2.0", - "ports": [ - { - "name": "tcp-59701", - "containerPort": 59701, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "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": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-app-rules-engine" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-kong-db", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-6379", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-redis" } }, "spec": { @@ -178,11 +64,7 @@ "emptyDir": {} }, { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", + "name": "db-data", "emptyDir": {} }, { @@ -190,22 +72,25 @@ "emptyDir": {} }, { - "name": "postgres-config", + "name": "redis-config", "emptyDir": {} }, { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.5-alpine", + "name": "edgex-redis", + "image": "redis:7.0.14-alpine", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -218,49 +103,41 @@ ], "env": [ { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "POSTGRES_USER", - "value": "kong" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" + "mountPath": "/run" }, { - "name": "tmpfs-volume3", - "mountPath": "/run" + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-redis" } }, "strategy": {} @@ -323,7 +200,7 @@ "containers": [ { "name": "edgex-core-consul", - "image": "consul:1.10.10", + "image": "hashicorp/consul:1.16.2", "ports": [ { "name": "tcp-8500", @@ -340,23 +217,27 @@ ], "env": [ { - "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": "ADD_REGISTRY_ACL_ROLES" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, @@ -392,55 +273,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": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" - } + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.2.0", + "name": "edgex-nginx", + "image": "nginx:1.25.3-alpine-slim", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -451,84 +349,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": "/tmp/edgex/secrets/device-rest" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-device-rest" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-ui-go", - "service": { - "ports": [ - { - "name": "tcp-4000", - "protocol": "TCP", - "port": 4000, - "targetPort": 4000 - } - ], - "selector": { - "app": "edgex-ui-go" - } - }, - "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.2.0", - "ports": [ - { - "name": "tcp-4000", - "containerPort": 4000, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" + }, { - "configMapRef": { - "name": "common-variables" - } + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-nginx" } }, "strategy": {} @@ -570,6 +425,13 @@ }, { "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", "hostPath": { "path": "/tmp/edgex/secrets/support-scheduler", "type": "DirectoryOrCreate" @@ -579,7 +441,7 @@ "containers": [ { "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.2.0", + "image": "edgexfoundry/support-scheduler:3.1.0", "ports": [ { "name": "tcp-59861", @@ -595,10 +457,6 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", "value": "edgex-support-scheduler" @@ -606,6 +464,10 @@ { "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -616,6 +478,10 @@ }, { "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + }, + { + "name": "anonymous-volume2", "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], @@ -629,31 +495,31 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59986", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59986, + "targetPort": 59986 } ], "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": { @@ -665,19 +531,26 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.2.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:3.1.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -689,17 +562,9 @@ } ], "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-device-rest" } ], "resources": {}, @@ -710,44 +575,48 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/etc/localtime" + }, + { + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59881", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-metadata" } }, "spec": { @@ -759,19 +628,26 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.2.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:3.1.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -785,7 +661,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-core-metadata" } ], "resources": {}, @@ -796,80 +672,79 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/etc/localtime" + }, + { + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-proxy-auth", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59842", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59842, + "targetPort": 59842 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-proxy-auth" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-proxy-auth" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-proxy-auth" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "db-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "redis-config", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", + "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "path": "/tmp/edgex/secrets/security-proxy-auth", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.6-alpine", + "name": "edgex-proxy-auth", + "image": "edgexfoundry/security-proxy-auth:3.1.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59842", + "containerPort": 59842, "protocol": "TCP" } ], @@ -882,82 +757,59 @@ ], "env": [ { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" - }, - { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "SERVICE_HOST", + "value": "edgex-proxy-auth" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "db-data", - "mountPath": "/data" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/security-proxy-auth" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-proxy-auth" } }, "strategy": {} } }, { - "name": "edgex-core-data", - "service": { - "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", - "protocol": "TCP", - "port": 59880, - "targetPort": 59880 - } - ], - "selector": { - "app": "edgex-core-data" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -965,27 +817,34 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.2.0", - "ports": [ - { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:3.1.0", "envFrom": [ { "configMapRef": { @@ -995,60 +854,95 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-data" + "name": "EDGEX_ADD_SECRETSTORE_TOKENS" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" + }, + { + "name": "EDGEX_ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" } ], "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/core-data" + "mountPath": "/etc/localtime" + }, + { + "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" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59720", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-kuiper" } }, "spec": { @@ -1060,19 +954,43 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/etc/localtime", "type": "DirectoryOrCreate" } + }, + { + "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-device-virtual", - "image": "edgexfoundry/device-virtual:2.2.0", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.11.4-alpine", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -1085,8 +1003,48 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" } ], "resources": {}, @@ -1097,68 +1055,72 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "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-device-virtual" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-kong", + "name": "edgex-device-virtual", "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-59900", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-device-virtual" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -1166,37 +1128,26 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/etc/localtime", "type": "DirectoryOrCreate" } }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "kong", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/device-virtual", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.6.1", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:3.1.0", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -1209,120 +1160,47 @@ ], "env": [ { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "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" + "mountPath": "/etc/localtime" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", - "service": { - "ports": [ - { - "name": "tcp-59881", - "protocol": "TCP", - "port": 59881, - "targetPort": 59881 - } - ], - "selector": { - "app": "edgex-core-metadata" - } - }, + "name": "edgex-core-common-config-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-core-common-config-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-core-common-config-bootstrapper" } }, "spec": { @@ -1334,22 +1212,22 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.2.0", - "ports": [ - { - "name": "tcp-59881", - "containerPort": 59881, - "protocol": "TCP" - } - ], + "name": "edgex-core-common-config-bootstrapper", + "image": "edgexfoundry/core-common-config-bootstrapper:3.1.0", "envFrom": [ { "configMapRef": { @@ -1359,11 +1237,23 @@ ], "env": [ { - "name": "NOTIFICATIONS_SENDER", + "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" + }, + { + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", "value": "edgex-core-metadata" }, { - "name": "SERVICE_HOST", + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", "value": "edgex-core-metadata" } ], @@ -1375,134 +1265,78 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-core-metadata" - } - }, - "strategy": {} - } - }, - { - "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.2.0", - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "EDGEX_USER", - "value": "2002" + "mountPath": "/etc/localtime" }, { - "name": "EDGEX_GROUP", - "value": "2001" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": {} } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-security-proxy-setup" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } + "name": "vault-config", + "emptyDir": {} }, { - "name": "kong", + "name": "nginx-templates", "emptyDir": {} }, { - "name": "kuiper-sources", + "name": "nginx-tls", "emptyDir": {} }, { - "name": "kuiper-connections", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "DirectoryOrCreate" + } }, { - "name": "vault-config", + "name": "consul-acl-token", "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.2.0", + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:3.1.0", "envFrom": [ { "configMapRef": { @@ -1512,82 +1346,112 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" }, { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" }, { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "EDGEX_ADD_PROXY_ROUTE", + "value": "device-rest.http://edgex-device-rest:59986" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" + "name": "vault-config", + "mountPath": "/vault/config" }, { - "name": "kong", - "mountPath": "/tmp/kong" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" }, { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" }, { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "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": { @@ -1597,21 +1461,31 @@ "emptyDir": {} }, { - "name": "consul-acl-token", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } }, { - "name": "anonymous-volume1", + "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.2.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:3.1.0", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -1621,47 +1495,8 @@ ], "env": [ { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "name": "SERVICE_HOST", "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "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" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ADD_PROXY_ROUTE" } ], "resources": {}, @@ -1671,78 +1506,69 @@ "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-kuiper", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-4000", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-ui-go" } }, "spec": { "volumes": [ { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:3.1.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -1755,136 +1581,59 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "SERVICE_HOST", + "value": "edgex-ui-go" } ], "resources": {}, "volumeMounts": [ { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" - }, - { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "name": "edgex-vault", - "service": { - "ports": [ - { - "name": "tcp-8200", - "protocol": "TCP", - "port": 8200, - "targetPort": 8200 - } - ], - "selector": { - "app": "edgex-vault" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-security-bootstrapper" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } }, { "name": "edgex-init", "emptyDir": {} - }, - { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.8.9", - "ports": [ - { - "name": "tcp-8200", - "containerPort": 8200, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:3.1.0", "envFrom": [ { "configMapRef": { @@ -1894,72 +1643,60 @@ ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - }, - { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "VAULT_UI", - "value": "true" + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "vault-file", - "mountPath": "/vault/file" - }, - { - "name": "vault-logs", - "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59701", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -1971,19 +1708,26 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.2.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:3.1.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -1997,7 +1741,11 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-app-rules-engine" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, @@ -2008,75 +1756,48 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/etc/localtime" + }, + { + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } - } - ] - }, - { - "versionName": "jakarta", - "configMaps": [ + }, { - "metadata": { - "name": "common-variables", - "creationTimestamp": null + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } }, - "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-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-vault" } }, "spec": { @@ -2085,42 +1806,30 @@ "name": "tmpfs-volume1", "emptyDir": {} }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", + "name": "vault-file", "emptyDir": {} }, { - "name": "vault-config", + "name": "vault-logs", "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.1.1", + "name": "edgex-vault", + "image": "hashicorp/vault:1.14.5", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -2130,95 +1839,72 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" - }, - { - "name": "EDGEX_USER", - "value": "2002" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" }, { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "VAULT_UI", + "value": "true" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "mountPath": "/vault/config" }, { "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-file", + "mountPath": "/vault/file" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "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": { @@ -2228,26 +1914,28 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } }, { - "name": "kuiper-sources", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/core-command", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:3.1.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], @@ -2260,48 +1948,12 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "SERVICE_HOST", + "value": "edgex-core-command" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, @@ -2311,22 +1963,18 @@ "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" + "name": "anonymous-volume1", + "mountPath": "/etc/localtime" }, { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -2336,12 +1984,6 @@ "name": "edgex-core-data", "service": { "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, { "name": "tcp-59880", "protocol": "TCP", @@ -2374,6 +2016,13 @@ }, { "name": "anonymous-volume1", + "hostPath": { + "path": "/etc/localtime", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", "hostPath": { "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" @@ -2383,13 +2032,8 @@ "containers": [ { "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.1.1", + "image": "edgexfoundry/core-data:3.1.0", "ports": [ - { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, { "name": "tcp-59880", "containerPort": 59880, @@ -2407,10 +2051,6 @@ { "name": "SERVICE_HOST", "value": "edgex-core-data" - }, - { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -2421,6 +2061,10 @@ }, { "name": "anonymous-volume1", + "mountPath": "/etc/localtime" + }, + { + "name": "anonymous-volume2", "mountPath": "/tmp/edgex/secrets/core-data" } ], @@ -2432,70 +2076,87 @@ }, "strategy": {} } - }, + } + ] + }, + { + "versionName": "minnesota", + "configMaps": [ { - "name": "edgex-kong-db", + "metadata": { + "name": "common-variables", + "creationTimestamp": null + }, + "data": { + "EDGEX_SECURITY_SECRET_STORE": "true", + "PROXY_SETUP_HOST": "edgex-security-proxy-setup", + "SECRETSTORE_HOST": "edgex-vault", + "STAGEGATE_BOOTSTRAPPER_HOST": "edgex-security-bootstrapper", + "STAGEGATE_BOOTSTRAPPER_STARTPORT": "54321", + "STAGEGATE_DATABASE_HOST": "edgex-redis", + "STAGEGATE_DATABASE_PORT": "6379", + "STAGEGATE_DATABASE_READYPORT": "6379", + "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-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": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.4-alpine", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:3.0.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -2508,119 +2169,63 @@ ], "env": [ { - "name": "POSTGRES_DB", - "value": "kong" - }, - { - "name": "POSTGRES_USER", - "value": "kong" - }, - { - "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": {} } }, { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", - "protocol": "TCP", - "port": 8500, - "targetPort": 8500 - } - ], - "selector": { - "app": "edgex-core-consul" - } - }, + "name": "edgex-core-common-config-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-core-common-config-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-core-common-config-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", + "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.10.3", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-core-common-config-bootstrapper", + "image": "edgexfoundry/core-common-config-bootstrapper:3.0.0", "envFrom": [ { "configMapRef": { @@ -2630,70 +2235,72 @@ ], "env": [ { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" }, { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", + "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-common-config-bootstrapper" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-common-config-bootstrapper" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrapper", + "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-bootstrapper" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-support-notifications" } }, "spec": { @@ -2701,12 +2308,26 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-notifications", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.1.1", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:3.0.0", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -2716,12 +2337,8 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "EDGEX_USER", - "value": "2002" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" } ], "resources": {}, @@ -2729,12 +2346,16 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-support-notifications" } }, "strategy": {} @@ -2797,7 +2418,7 @@ "containers": [ { "name": "edgex-redis", - "image": "redis:6.2.6-alpine", + "image": "redis:7.0.11-alpine", "ports": [ { "name": "tcp-6379", @@ -2855,31 +2476,31 @@ } }, { - "name": "edgex-core-metadata", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59720", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-kuiper" } }, "spec": { @@ -2889,21 +2510,30 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", - "type": "DirectoryOrCreate" - } + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-log", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.1.1", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.9.2-alpine", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -2916,12 +2546,48 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" } ], "resources": {}, @@ -2931,45 +2597,57 @@ "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "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-metadata" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59880", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "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": { @@ -2981,19 +2659,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.1.2", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:3.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -3005,21 +2683,9 @@ } ], "env": [ - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "value": "edgex-core-data" } ], "resources": {}, @@ -3030,68 +2696,85 @@ }, { "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": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-nginx", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-8443", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-nginx" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-nginx" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "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/sys-mgmt-agent", - "type": "DirectoryOrCreate" - } + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.1.1", + "name": "edgex-nginx", + "image": "nginx:1.24.0-alpine-slim", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -3102,35 +2785,41 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "tmpfs-volume1", + "mountPath": "/etc/nginx/conf.d" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "tmpfs-volume2", + "mountPath": "/var/cache/nginx" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - } - ], - "resources": {}, - "volumeMounts": [ + "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/sys-mgmt-agent" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" + }, + { + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-nginx" } }, "strategy": {} @@ -3181,7 +2870,7 @@ "containers": [ { "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.1.1", + "image": "edgexfoundry/core-command:3.0.0", "ports": [ { "name": "tcp-59882", @@ -3200,6 +2889,10 @@ { "name": "SERVICE_HOST", "value": "edgex-core-command" + }, + { + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, @@ -3223,31 +2916,31 @@ } }, { - "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": { @@ -3259,19 +2952,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.1.1", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:3.0.1", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -3285,7 +2978,11 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-app-rules-engine" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, @@ -3296,55 +2993,68 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "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": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:2.1.0", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:3.0.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -3355,42 +3065,66 @@ } } ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + } + ], "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-scheduler" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59900", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-device-virtual" } }, "spec": { @@ -3402,19 +3136,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", + "path": "/tmp/edgex/secrets/device-virtual", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.1.1", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:3.0.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -3428,7 +3162,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -3439,13 +3173,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-device-virtual" } }, "strategy": {} @@ -3501,7 +3235,7 @@ "containers": [ { "name": "edgex-vault", - "image": "vault:1.8.4", + "image": "hashicorp/vault:1.13.2", "ports": [ { "name": "tcp-8200", @@ -3521,13 +3255,13 @@ "name": "VAULT_UI", "value": "true" }, - { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" - }, { "name": "VAULT_CONFIG_DIR", "value": "/vault/config" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" } ], "resources": {}, @@ -3559,55 +3293,42 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-4000", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.1.1", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:3.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -3619,77 +3340,34 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "value": "edgex-ui-go" } ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "name": "edgex-kong", - "service": { - "ports": [ - { - "name": "tcp-8000", - "protocol": "TCP", - "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-kong" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-security-secretstore-setup" } }, "spec": { @@ -3709,40 +3387,27 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } }, { - "name": "postgres-config", + "name": "kuiper-sources", "emptyDir": {} }, { - "name": "kong", + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.5.1", - "ports": [ - { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:3.0.0", "envFrom": [ { "configMapRef": { @@ -3752,56 +3417,23 @@ ], "env": [ { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + "name": "EDGEX_ADD_SECRETSTORE_TOKENS" }, { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" + "name": "EDGEX_ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" } ], "resources": {}, @@ -3812,7 +3444,7 @@ }, { "name": "tmpfs-volume2", - "mountPath": "/tmp" + "mountPath": "/vault" }, { "name": "edgex-init", @@ -3820,39 +3452,56 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "kuiper-connections", + "mountPath": "/tmp/kuiper-connections" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "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-proxy-setup" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-device-rest" } }, "spec": { @@ -3861,22 +3510,25 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.1.1", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:3.0.0", + "ports": [ + { + "name": "tcp-59986", + "containerPort": 59986, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -3886,47 +3538,8 @@ ], "env": [ { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, @@ -3935,50 +3548,33 @@ "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/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", - "service": { - "ports": [ - { - "name": "tcp-59860", - "protocol": "TCP", - "port": 59860, - "targetPort": 59860 - } - ], - "selector": { - "app": "edgex-support-notifications" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -3988,24 +3584,33 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" + "name": "vault-config", + "emptyDir": {} + }, + { + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "DirectoryOrCreate" } + }, + { + "name": "consul-acl-token", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.1.1", - "ports": [ - { - "name": "tcp-59860", - "containerPort": 59860, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:3.0.0", "envFrom": [ { "configMapRef": { @@ -4015,8 +3620,44 @@ ], "env": [ { - "name": "SERVICE_HOST", + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", "value": "edgex-support-notifications" + }, + { + "name": "EDGEX_ADD_PROXY_ROUTE", + "value": "device-rest.http://edgex-device-rest:59986" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "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_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" } ], "resources": {}, @@ -4025,107 +3666,72 @@ "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": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } - } - ] - }, - { - "versionName": "levski", - "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", - "SPIFFE_ENDPOINTSOCKET": "/tmp/edgex/secrets/spiffe/public/api.sock", - "SPIFFE_TRUSTBUNDLE_PATH": "/tmp/edgex/secrets/spiffe/trust/bundle", - "SPIFFE_TRUSTDOMAIN": "edgexfoundry.org", - "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-db", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-8500", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", + "name": "consul-config", "emptyDir": {} }, { - "name": "tmpfs-volume3", + "name": "consul-data", "emptyDir": {} }, { @@ -4133,22 +3739,25 @@ "emptyDir": {} }, { - "name": "postgres-config", + "name": "consul-acl-token", "emptyDir": {} }, { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.8-alpine", + "name": "edgex-core-consul", + "image": "hashicorp/consul:1.15.2", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -4161,80 +3770,74 @@ ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" + "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "tmpfs-volume3", - "mountPath": "/run" + "name": "consul-data", + "mountPath": "/consul/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" }, { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", - "service": { - "ports": [ - { - "name": "tcp-59860", - "protocol": "TCP", - "port": 59860, - "targetPort": 59860 - } - ], - "selector": { - "app": "edgex-support-notifications" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-security-bootstrapper" } }, "spec": { @@ -4242,27 +3845,13 @@ { "name": "edgex-init", "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" - } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.3.0", - "ports": [ - { - "name": "tcp-59860", - "containerPort": 59860, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:3.0.0", + "envFrom": [ { "configMapRef": { "name": "common-variables" @@ -4271,8 +3860,12 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -4280,47 +3873,43 @@ { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-proxy-auth", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59842", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59842, + "targetPort": 59842 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-proxy-auth" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-proxy-auth" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-proxy-auth" } }, "spec": { @@ -4332,19 +3921,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/security-proxy-auth", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.3.1", + "name": "edgex-proxy-auth", + "image": "edgexfoundry/security-proxy-auth:3.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59842", + "containerPort": 59842, "protocol": "TCP" } ], @@ -4356,21 +3945,9 @@ } ], "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-proxy-auth" } ], "resources": {}, @@ -4381,58 +3958,91 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/security-proxy-auth" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-proxy-auth" } }, "strategy": {} } - }, + } + ] + }, + { + "versionName": "kamakura", + "configMaps": [ { - "name": "edgex-ui-go", - "service": { - "ports": [ - { - "name": "tcp-4000", - "protocol": "TCP", - "port": 4000, - "targetPort": 4000 - } - ], - "selector": { - "app": "edgex-ui-go" - } + "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", + "SPIFFE_ENDPOINTSOCKET": "/tmp/edgex/secrets/spiffe/public/api.sock", + "SPIFFE_TRUSTBUNDLE_PATH": "/tmp/edgex/secrets/spiffe/trust/bundle", + "SPIFFE_TRUSTDOMAIN": "edgexfoundry.org", + "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-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-security-bootstrapper" } }, "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:2.3.0", - "ports": [ - { - "name": "tcp-4000", - "containerPort": 4000, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.2.0", "envFrom": [ { "configMapRef": { @@ -4442,15 +4052,25 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} @@ -4501,7 +4121,7 @@ "containers": [ { "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.3.0", + "image": "edgexfoundry/core-command:2.2.0", "ports": [ { "name": "tcp-59882", @@ -4520,14 +4140,6 @@ { "name": "SERVICE_HOST", "value": "edgex-core-command" - }, - { - "name": "MESSAGEQUEUE_EXTERNAL_URL", - "value": "tcp://edgex-mqtt-broker:1883" - }, - { - "name": "MESSAGEQUEUE_INTERNAL_HOST", - "value": "edgex-redis" } ], "resources": {}, @@ -4551,67 +4163,55 @@ } }, { - "name": "edgex-redis", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59986", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "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", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.5-alpine", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.2.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -4624,59 +4224,56 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" - }, - { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "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/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "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-proxy-setup" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-support-scheduler" } }, "spec": { @@ -4685,23 +4282,26 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.3.0", - "envFrom": [ + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.2.0", + "ports": [ + { + "name": "tcp-59861", + "containerPort": 59861, + "protocol": "TCP" + } + ], + "envFrom": [ { "configMapRef": { "name": "common-variables" @@ -4710,47 +4310,16 @@ ], "env": [ { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "name": "SERVICE_HOST", "value": "edgex-support-scheduler" }, { - "name": "ROUTES_CORE_DATA_HOST", + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", "value": "edgex-core-data" }, { - "name": "ADD_PROXY_ROUTE" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -4759,74 +4328,83 @@ "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-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "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.3.0", + "name": "edgex-kong-db", + "image": "postgres:13.5-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -4839,103 +4417,111 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "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/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": {} } }, { - "name": "edgex-core-consul", - "service": { - "ports": [ - { - "name": "tcp-8500", - "protocol": "TCP", - "port": 8500, - "targetPort": 8500 - } - ], - "selector": { - "app": "edgex-core-consul" - } - }, + "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", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.13.2", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.2.0", "envFrom": [ { "configMapRef": { @@ -4945,93 +4531,95 @@ ], "env": [ { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { "name": "EDGEX_USER", "value": "2002" }, - { - "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" - }, { "name": "EDGEX_GROUP", "value": "2001" + }, + { + "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": {} } }, { - "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": { @@ -5043,24 +4631,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", + "path": "/tmp/edgex/secrets/sys-mgmt-agent", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.3.0", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.2.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -5073,12 +4656,16 @@ ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-sys-mgmt-agent" } ], "resources": {}, @@ -5089,68 +4676,80 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-8500", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "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/device-virtual", + "path": "/tmp/edgex/secrets/edgex-consul", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.3.0", + "name": "edgex-core-consul", + "image": "consul:1.10.10", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -5163,56 +4762,95 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" } ], "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/device-virtual" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-vault", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-8000", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "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-vault" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-kong" } }, "spec": { @@ -5221,27 +4859,48 @@ "name": "tmpfs-volume1", "emptyDir": {} }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-proxy-setup", + "type": "DirectoryOrCreate" + } + }, + { + "name": "postgres-config", "emptyDir": {} }, { - "name": "vault-logs", + "name": "kong", "emptyDir": {} } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.11.4", + "name": "edgex-kong", + "image": "kong:2.6.1", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -5254,158 +4913,120 @@ ], "env": [ { - "name": "VAULT_UI", - "value": "true" + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" }, { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "name": "KONG_DNS_VALID_TTL", + "value": "1" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/vault/config" + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59720", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-kuiper" } }, "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": "DirectoryOrCreate" - } - } - ], - "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": {} - } - }, - { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-59720", - "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-kuiper" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-kuiper" + "app": "edgex-kuiper" } }, "spec": { @@ -5430,7 +5051,7 @@ "containers": [ { "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.7.1-alpine", + "image": "lfedge/ekuiper:1.4.4-alpine", "ports": [ { "name": "tcp-59720", @@ -5447,37 +5068,37 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", "value": "redis" }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, { "name": "KUIPER__BASIC__CONSOLELOG", "value": "true" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { "name": "KUIPER__BASIC__RESTPORT", "value": "59720" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, { "name": "EDGEX__DEFAULT__PORT", "value": "6379" }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, { "name": "EDGEX__DEFAULT__TYPE", "value": "redis" @@ -5487,8 +5108,8 @@ "value": "6379" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" } ], "resources": {}, @@ -5520,30 +5141,35 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-core-metadata", + "service": { + "ports": [ + { + "name": "tcp-59881", + "protocol": "TCP", + "port": 59881, + "targetPort": 59881 + } + ], + "selector": { + "app": "edgex-core-metadata" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -5551,31 +5177,22 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } - }, - { - "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", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.2.0", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -5585,95 +5202,60 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" - }, - { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], "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/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "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": { @@ -5685,19 +5267,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.3.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.2.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -5709,13 +5291,21 @@ } ], "env": [ + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-app-rules-engine" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, @@ -5726,68 +5316,55 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-4000", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.3.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:2.2.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -5798,78 +5375,42 @@ } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - } - ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "name": "edgex-kong", + "name": "edgex-redis", "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-6379", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-redis" } }, "spec": { @@ -5879,47 +5420,33 @@ "emptyDir": {} }, { - "name": "tmpfs-volume2", + "name": "db-data", "emptyDir": {} }, { "name": "edgex-init", "emptyDir": {} }, + { + "name": "redis-config", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", "type": "DirectoryOrCreate" } - }, - { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "kong", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.8.1", + "name": "edgex-redis", + "image": "redis:6.2.6-alpine", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -5932,56 +5459,12 @@ ], "env": [ { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "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": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" }, { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" } ], "resources": {}, @@ -5991,48 +5474,44 @@ "mountPath": "/run" }, { - "name": "tmpfs-volume2", - "mountPath": "/tmp" + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - }, - { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrapper", + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -6040,12 +5519,23 @@ { "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-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.3.0", + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.2.0", "envFrom": [ { "configMapRef": { @@ -6055,12 +5545,47 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" } ], "resources": {}, @@ -6068,73 +5593,51 @@ { "name": "edgex-init", "mountPath": "/edgex-init" - } - ], - "imagePullPolicy": "IfNotPresent" + }, + { + "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-bootstrapper" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } - } - ] - }, - { - "versionName": "minnesota", - "configMaps": [ - { - "metadata": { - "name": "common-variables", - "creationTimestamp": null - }, - "data": { - "EDGEX_SECURITY_SECRET_STORE": "true", - "PROXY_SETUP_HOST": "edgex-security-proxy-setup", - "SECRETSTORE_HOST": "edgex-vault", - "STAGEGATE_BOOTSTRAPPER_HOST": "edgex-security-bootstrapper", - "STAGEGATE_BOOTSTRAPPER_STARTPORT": "54321", - "STAGEGATE_DATABASE_HOST": "edgex-redis", - "STAGEGATE_DATABASE_PORT": "6379", - "STAGEGATE_DATABASE_READYPORT": "6379", - "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-kuiper", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-59900", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-device-virtual" } }, "spec": { @@ -6144,30 +5647,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/device-virtual", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.9.2-alpine", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.2.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -6180,48 +5674,8 @@ ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], "resources": {}, @@ -6231,57 +5685,51 @@ "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/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "name": "edgex-proxy-auth", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59842", + "name": "tcp-5563", "protocol": "TCP", - "port": 59842, - "targetPort": 59842 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-proxy-auth" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy-auth" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy-auth" + "app": "edgex-core-data" } }, "spec": { @@ -6293,19 +5741,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-auth", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-proxy-auth", - "image": "edgexfoundry/security-proxy-auth:3.0.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.2.0", "ports": [ { - "name": "tcp-59842", - "containerPort": 59842, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -6317,9 +5770,13 @@ } ], "env": [ + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + }, { "name": "SERVICE_HOST", - "value": "edgex-proxy-auth" + "value": "edgex-core-data" } ], "resources": {}, @@ -6330,80 +5787,68 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-auth" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy-auth" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59860", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-support-notifications" } }, "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", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "hashicorp/consul:1.15.2", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.2.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -6416,34 +5861,557 @@ ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" - }, - { - "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" - }, - { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-notifications" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-notifications" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-vault" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-vault" + } + }, + "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-vault", + "image": "vault:1.8.9", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_UI", + "value": "true" + } + ], + "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" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-vault" + } + }, + "strategy": {} + } + } + ] + }, + { + "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", + "service": { + "ports": [ + { + "name": "tcp-8000", + "protocol": "TCP", + "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-kong" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-kong" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-kong" + } + }, + "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", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-kong", + "image": "kong:2.5.1", + "ports": [ + { + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" + }, + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" + }, + { + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + }, + { + "name": "KONG_DNS_VALID_TTL", + "value": "1" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + } + ], + "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" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kong" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-metadata", + "service": { + "ports": [ + { + "name": "tcp-59881", + "protocol": "TCP", + "port": 59881, + "targetPort": 59881 + } + ], + "selector": { + "app": "edgex-core-metadata" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-metadata" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-metadata" + } + }, + "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", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, + { + "name": "SERVICE_HOST", + "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" + } + }, + "strategy": {} + } + }, + { + "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-core-consul" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "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/edgex-consul", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-core-consul", + "image": "consul:1.10.3", + "ports": [ + { + "name": "tcp-8500", + "containerPort": 8500, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "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" + }, + { + "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", @@ -6459,44 +6427,1883 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "mountPath": "/tmp/edgex/secrets/edgex-consul" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-consul" + } + }, + "strategy": {} + } + }, + { + "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": "DirectoryOrCreate" + } + }, + { + "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", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "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": "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" + }, + { + "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": {} + } + }, + { + "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-app-rules-engine" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-app-rules-engine" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.1.2", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "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-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/app-rules-engine" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-app-rules-engine" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-sys-mgmt-agent", + "service": { + "ports": [ + { + "name": "tcp-58890", + "protocol": "TCP", + "port": 58890, + "targetPort": 58890 + } + ], + "selector": { + "app": "edgex-sys-mgmt-agent" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-sys-mgmt-agent" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-sys-mgmt-agent" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.1.1", + "ports": [ + { + "name": "tcp-58890", + "containerPort": 58890, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-sys-mgmt-agent" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-ui-go", + "service": { + "ports": [ + { + "name": "tcp-4000", + "protocol": "TCP", + "port": 4000, + "targetPort": 4000 + } + ], + "selector": { + "app": "edgex-ui-go" + } + }, + "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": {} + } + }, + { + "name": "edgex-kuiper", + "service": { + "ports": [ + { + "name": "tcp-59720", + "protocol": "TCP", + "port": 59720, + "targetPort": 59720 + } + ], + "selector": { + "app": "edgex-kuiper" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-kuiper" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-kuiper" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.4.4-alpine", + "ports": [ + { + "name": "tcp-59720", + "containerPort": 59720, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kuiper" + } + }, + "strategy": {} + } + }, + { + "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": "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.1.1", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-core-command" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-command" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-command" + } + }, + "strategy": {} + } + }, + { + "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.1.1", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "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_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + } + ], + "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": {} + } + }, + { + "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-support-notifications" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-support-notifications" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-notifications", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.1.1", + "ports": [ + { + "name": "tcp-59860", + "containerPort": 59860, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-notifications" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-notifications" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-data", + "service": { + "ports": [ + { + "name": "tcp-5563", + "protocol": "TCP", + "port": 5563, + "targetPort": 5563 + }, + { + "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": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-data", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.1.1", + "ports": [ + { + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-core-data" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-data" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-core-data" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-redis" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "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": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-redis", + "image": "redis:6.2.6-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" + }, + { + "name": "DATABASECONFIG_PATH", + "value": "/run/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-redis" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-vault" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-vault" + } + }, + "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-vault", + "image": "vault:1.8.4", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "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": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-vault" + } + }, + "strategy": {} + } + }, + { + "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": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.1.1", + "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": {} + } + }, + { + "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-device-virtual" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/device-virtual", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.1.1", + "ports": [ + { + "name": "tcp-59900", + "containerPort": 59900, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/device-virtual" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-device-virtual" + } + }, + "strategy": {} + } + }, + { + "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.1.1", + "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": {} + } + }, + { + "name": "edgex-kong-db", + "service": { + "ports": [ + { + "name": "tcp-5432", + "protocol": "TCP", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "app": "edgex-kong-db" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-kong-db" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-kong-db" + } + }, + "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": {} + } + ], + "containers": [ + { + "name": "edgex-kong-db", + "image": "postgres:13.4-alpine", + "ports": [ + { + "name": "tcp-5432", + "containerPort": 5432, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "POSTGRES_DB", + "value": "kong" + }, + { + "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": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kong-db" + } + }, + "strategy": {} + } + }, + { + "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-support-scheduler" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-support-scheduler" + } + }, + "spec": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-scheduler", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.1.1", + "ports": [ + { + "name": "tcp-59861", + "containerPort": 59861, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-scheduler" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-support-scheduler" + } + }, + "strategy": {} + } + } + ] + }, + { + "versionName": "levski", + "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", + "SPIFFE_ENDPOINTSOCKET": "/tmp/edgex/secrets/spiffe/public/api.sock", + "SPIFFE_TRUSTBUNDLE_PATH": "/tmp/edgex/secrets/spiffe/trust/bundle", + "SPIFFE_TRUSTDOMAIN": "edgexfoundry.org", + "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-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-vault" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-vault" + } + }, + "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} + } + ], + "containers": [ + { + "name": "edgex-vault", + "image": "vault:1.11.4", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_UI", + "value": "true" + } + ], + "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" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-vault" + } + }, + "strategy": {} + } + }, + { + "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_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + } + ], + "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-core-consul" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59880", + "name": "tcp-59701", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -6508,19 +8315,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:3.0.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], @@ -6534,7 +8341,19 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, @@ -6545,31 +8364,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrapper", + "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-bootstrapper" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-core-command" } }, "spec": { @@ -6577,12 +8409,26 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-command", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:3.0.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.3.0", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -6592,12 +8438,16 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "MESSAGEQUEUE_EXTERNAL_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-core-command" + }, + { + "name": "MESSAGEQUEUE_INTERNAL_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -6605,43 +8455,47 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59900", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59900, + "targetPort": 59900 } ], "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": { @@ -6653,19 +8507,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", + "path": "/tmp/edgex/secrets/device-virtual", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:3.0.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.3.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -6679,7 +8533,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -6690,68 +8544,81 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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:3.0.0", + "name": "edgex-kong-db", + "image": "postgres:13.8-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], @@ -6764,55 +8631,79 @@ ], "env": [ { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" } ], "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": {} } }, { - "name": "edgex-core-common-config-bootstrapper", + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -6820,15 +8711,31 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } + }, + { + "name": "kong", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "edgexfoundry/core-common-config-bootstrapper:3.0.0", + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.3.0", "envFrom": [ { "configMapRef": { @@ -6838,96 +8745,106 @@ ], "env": [ { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" }, { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" + "name": "EDGEX_GROUP", + "value": "2001" } ], "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/core-common-config-bootstrapper" + "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-core-common-config-bootstrapper" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-4000", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-ui-go" } }, "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" - } - } - ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:3.0.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:2.3.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], @@ -6939,85 +8856,83 @@ } ], "env": [ - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "value": "edgex-ui-go" } ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "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": {} + }, { "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/edgex-consul", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:3.0.0", + "name": "edgex-core-consul", + "image": "consul:1.13.2", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -7030,85 +8945,116 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" } ], "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-metadata" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-vault", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59720", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59720, + "targetPort": 59720 } ], "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", + "name": "edgex-init", "emptyDir": {} }, { - "name": "edgex-init", + "name": "kuiper-data", "emptyDir": {} }, { - "name": "vault-file", + "name": "kuiper-connections", "emptyDir": {} }, { - "name": "vault-logs", + "name": "kuiper-sources", "emptyDir": {} } ], "containers": [ { - "name": "edgex-vault", - "image": "hashicorp/vault:1.13.2", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.7.1-alpine", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -7121,83 +9067,128 @@ ], "env": [ { - "name": "VAULT_UI", + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", "value": "true" }, { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "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": { + "volumes": [ + { + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/support-notifications", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-ui-go", - "image": "edgexfoundry/edgex-ui:3.0.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.3.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -7211,45 +9202,61 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-ui-go" + "value": "edgex-support-notifications" } ], "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/support-notifications" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "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": { @@ -7261,19 +9268,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:3.0.0", + "name": "edgex-core-data", + "image": "edgexfoundry/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" } ], @@ -7285,9 +9297,13 @@ } ], "env": [ + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-data" } ], "resources": {}, @@ -7298,44 +9314,44 @@ }, { "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": {} } }, { - "name": "edgex-core-command", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59861", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59861, + "targetPort": 59861 } ], "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": { @@ -7347,19 +9363,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/tmp/edgex/secrets/support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:3.0.0", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.3.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -7372,12 +9388,16 @@ ], "env": [ { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -7388,88 +9408,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-nginx", - "service": { - "ports": [ - { - "name": "tcp-8443", - "protocol": "TCP", - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "app": "edgex-nginx" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-nginx" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-nginx" + "app": "edgex-security-bootstrapper" } }, "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": {} } ], "containers": [ { - "name": "edgex-nginx", - "image": "nginx:1.24.0-alpine-slim", - "ports": [ - { - "name": "tcp-8443", - "containerPort": 8443, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.3.0", "envFrom": [ { "configMapRef": { @@ -7477,59 +9453,70 @@ } } ], - "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/etc/nginx/conf.d" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/var/cache/nginx" - }, + "env": [ { - "name": "tmpfs-volume3", - "mountPath": "/var/log/nginx" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "tmpfs-volume4", - "mountPath": "/var/run" - }, + "name": "EDGEX_USER", + "value": "2002" + } + ], + "resources": {}, + "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" - }, - { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-nginx" + "hostname": "edgex-security-bootstrapper" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-kong", + "service": { + "ports": [ + { + "name": "tcp-8000", + "protocol": "TCP", + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", + "protocol": "TCP", + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } - }, - "strategy": {} - } - }, - { - "name": "edgex-security-secretstore-setup", + ], + "selector": { + "app": "edgex-kong" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-kong" } }, "spec": { @@ -7549,27 +9536,40 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } }, { - "name": "kuiper-sources", - "emptyDir": {} - }, - { - "name": "kuiper-connections", + "name": "postgres-config", "emptyDir": {} }, { - "name": "vault-config", + "name": "kong", "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:3.0.0", + "name": "edgex-kong", + "image": "kong:2.8.1", + "ports": [ + { + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -7579,23 +9579,56 @@ ], "env": [ { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" }, { - "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": "KONG_NGINX_WORKER_PROCESSES", + "value": "1" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "KONG_DATABASE", + "value": "postgres" }, { - "name": "EDGEX_ADD_SECRETSTORE_TOKENS" + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "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" + }, + { + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" + }, + { + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" } ], "resources": {}, @@ -7606,7 +9639,7 @@ }, { "name": "tmpfs-volume2", - "mountPath": "/vault" + "mountPath": "/tmp" }, { "name": "edgex-init", @@ -7614,43 +9647,52 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" - }, - { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" }, { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-sys-mgmt-agent", + "service": { + "ports": [ + { + "name": "tcp-58890", + "protocol": "TCP", + "port": 58890, + "targetPort": 58890 + } + ], + "selector": { + "app": "edgex-sys-mgmt-agent" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-sys-mgmt-agent" } }, "spec": { @@ -7659,34 +9701,25 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "vault-config", - "emptyDir": {} - }, - { - "name": "nginx-templates", - "emptyDir": {} - }, - { - "name": "nginx-tls", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/sys-mgmt-agent", "type": "DirectoryOrCreate" } - }, - { - "name": "consul-acl-token", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:3.0.0", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.3.0", + "ports": [ + { + "name": "tcp-58890", + "containerPort": 58890, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -7696,107 +9729,178 @@ ], "env": [ { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, + "name": "METRICSMECHANISM", + "value": "executor" + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-sys-mgmt-agent" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-redis" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "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": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-redis", + "image": "redis:7.0.5-alpine", + "ports": [ { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], + "envFrom": [ { - "name": "EDGEX_ADD_PROXY_ROUTE" - }, + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" }, { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" } ], "resources": {}, "volumeMounts": [ { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "db-data", + "mountPath": "/data" }, { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" - }, - { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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": { @@ -7808,19 +9912,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:3.0.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.3.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -7832,9 +9936,13 @@ } ], "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-metadata" } ], "resources": {}, @@ -7845,80 +9953,68 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59986", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-rest" } }, "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", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.11-alpine", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.3.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -7931,41 +10027,25 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" - }, - { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "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/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-device-rest" } }, "strategy": {} @@ -8016,31 +10096,31 @@ ], "components": [ { - "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": { @@ -8052,19 +10132,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/sys-mgmt-agent", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.0.1", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], @@ -8077,20 +10157,16 @@ ], "env": [ { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, @@ -8101,44 +10177,31 @@ }, { "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": {} } }, { - "name": "edgex-core-command", - "service": { - "ports": [ - { - "name": "tcp-59882", - "protocol": "TCP", - "port": 59882, - "targetPort": 59882 - } - ], - "selector": { - "app": "edgex-core-command" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-security-bootstrapper" } }, "spec": { @@ -8146,26 +10209,12 @@ { "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.0.0", - "ports": [ - { - "name": "tcp-59882", - "containerPort": 59882, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.0.0", "envFrom": [ { "configMapRef": { @@ -8175,8 +10224,12 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -8184,58 +10237,83 @@ { "name": "edgex-init", "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-kong-db", + "service": { + "ports": [ + { + "name": "tcp-5432", + "protocol": "TCP", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "app": "edgex-kong-db" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-kong-db" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "consul-acl-token", + "name": "postgres-config", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", - "type": "DirectoryOrCreate" - } + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.0.0", + "name": "edgex-kong-db", + "image": "postgres:12.3-alpine", + "ports": [ + { + "name": "tcp-5432", + "containerPort": 5432, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -8245,135 +10323,104 @@ ], "env": [ { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, + "name": "POSTGRES_USER", + "value": "kong" + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" + "name": "tmpfs-volume1", + "mountPath": "/var/run" }, { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" + "name": "tmpfs-volume3", + "mountPath": "/run" }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - } - ], - "resources": {}, - "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-kong-db" } }, "strategy": {} } }, { - "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", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.9.5", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.0.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], @@ -8386,111 +10433,87 @@ ], "env": [ { - "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": "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": {} } }, { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-59720", - "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "kuiper-data", + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets", + "type": "DirectoryOrCreate" + } + }, + { + "name": "kong", "emptyDir": {} }, { "name": "kuiper-config", "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.3.0-alpine", - "ports": [ - { - "name": "tcp-59720", - "containerPort": 59720, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.0.0", "envFrom": [ { "configMapRef": { @@ -8500,84 +10523,91 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "ADD_SECRETSTORE_TOKENS" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets" + }, + { + "name": "kong", + "mountPath": "/tmp/kong" }, { "name": "kuiper-config", - "mountPath": "/kuiper/etc/sources" + "mountPath": "/tmp/kuiper" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59900", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-device-virtual" } }, "spec": { @@ -8589,19 +10619,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "path": "/tmp/edgex/secrets/device-virtual", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.0.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.0.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], @@ -8613,17 +10643,9 @@ } ], "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -8634,50 +10656,31 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "name": "edgex-core-data", - "service": { - "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", - "protocol": "TCP", - "port": 59880, - "targetPort": 59880 - } - ], - "selector": { - "app": "edgex-core-data" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -8686,30 +10689,22 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.0.0", - "ports": [ - { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.0.0", "envFrom": [ { "configMapRef": { @@ -8719,12 +10714,47 @@ ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" }, { - "name": "SERVICE_HOST", + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" + }, + { + "name": "ROUTES_CORE_DATA_HOST", "value": "edgex-core-data" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, + { + "name": "ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "KONGURL_SERVER", + "value": "edgex-kong" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, @@ -8733,75 +10763,74 @@ "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-data" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "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": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.7.2", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.0.0", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], @@ -8814,96 +10843,60 @@ ], "env": [ { - "name": "VAULT_UI", - "value": "true" - }, - { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - }, - { - "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": {} } }, { - "name": "edgex-kong", + "name": "edgex-support-scheduler", "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-59861", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-kong" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong" + "app": "edgex-support-scheduler" } - }, - "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, + }, + "spec": { + "volumes": [ { "name": "edgex-init", "emptyDir": {} @@ -8911,37 +10904,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/support-scheduler", "type": "DirectoryOrCreate" } - }, - { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "kong", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.4.1-alpine", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.0.0", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8100", - "containerPort": 8100, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], @@ -8954,149 +10929,89 @@ ], "env": [ { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "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/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-kong-db", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59720", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", + "name": "kuiper-data", "emptyDir": {} }, { - "name": "postgres-data", + "name": "kuiper-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:12.3-alpine", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.3.0-alpine", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], @@ -9109,104 +11024,120 @@ ], "env": [ { - "name": "POSTGRES_DB", - "value": "kong" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "POSTGRES_USER", - "value": "kong" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, { - "name": "tmpfs-volume1", - "mountPath": "/var/run" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "tmpfs-volume2", - "mountPath": "/tmp" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "tmpfs-volume3", - "mountPath": "/run" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + } + ], + "resources": {}, + "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kuiper-data", + "mountPath": "/kuiper/data" }, { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "kuiper-config", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "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": {} + }, { "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/edgex-consul", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.0.0", + "name": "edgex-core-consul", + "image": "consul:1.9.5", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -9219,60 +11150,95 @@ ], "env": [ { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" } ], "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-metadata" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-8000", + "protocol": "TCP", + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-kong" } }, "spec": { @@ -9282,33 +11248,47 @@ "emptyDir": {} }, { - "name": "db-data", + "name": "tmpfs-volume2", "emptyDir": {} }, { "name": "edgex-init", "emptyDir": {} }, - { - "name": "redis-config", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.4-alpine", + "name": "edgex-kong", + "image": "kong:2.4.1-alpine", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], @@ -9321,12 +11301,48 @@ ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" + }, + { + "name": "KONG_ADMIN_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_DNS_ORDER", + "value": "LAST,A,CNAME" + }, + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" } ], "resources": {}, @@ -9336,57 +11352,67 @@ "mountPath": "/run" }, { - "name": "db-data", - "mountPath": "/data" + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-5563", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "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": { @@ -9398,19 +11424,24 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.0.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], @@ -9422,17 +11453,13 @@ } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-core-data" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -9443,43 +11470,48 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "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": {} @@ -9487,27 +11519,22 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } - }, - { - "name": "kong", - "emptyDir": {} - }, - { - "name": "kuiper-config", - "emptyDir": {} - }, - { - "name": "vault-config", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.0.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.0.1", + "ports": [ + { + "name": "tcp-59701", + "containerPort": 59701, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -9517,91 +11544,68 @@ ], "env": [ { - "name": "ADD_SECRETSTORE_TOKENS" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" } ], "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-config", - "mountPath": "/tmp/kuiper" - }, - { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "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": { @@ -9613,19 +11617,19 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.0.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.0.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], @@ -9639,7 +11643,7 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-support-notifications" } ], "resources": {}, @@ -9650,68 +11654,73 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-8200", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.0.0", + "name": "edgex-vault", + "image": "vault:1.7.2", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -9724,43 +11733,72 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "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-rest" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrapper", + "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-bootstrapper" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-core-command" } }, "spec": { @@ -9768,12 +11806,26 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-command", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.0.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.0.0", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -9783,12 +11835,8 @@ ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, @@ -9796,67 +11844,83 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-6379", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "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/support-notifications", + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.0.0", + "name": "edgex-redis", + "image": "redis:6.2.4-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], @@ -9869,25 +11933,41 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" + }, + { + "name": "DATABASECONFIG_PATH", + "value": "/run/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/support-notifications" + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-redis" } }, "strategy": {} @@ -9925,37 +12005,31 @@ ], "components": [ { - "name": "edgex-core-data", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-48080", + "name": "tcp-48081", "protocol": "TCP", - "port": 48080, - "targetPort": 48080 + "port": 48081, + "targetPort": 48081 } ], "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": { @@ -9970,24 +12044,19 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-core-data", + "path": "/tmp/edgex/secrets/edgex-core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/docker-core-data-go:1.3.1", + "name": "edgex-core-metadata", + "image": "edgexfoundry/docker-core-metadata-go:1.3.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-48080", - "containerPort": 48080, + "name": "tcp-48081", + "containerPort": 48081, "protocol": "TCP" } ], @@ -10000,12 +12069,16 @@ ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-data/secrets-token.json" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-core-metadata" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" } ], "resources": {}, @@ -10016,44 +12089,31 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-data" + "mountPath": "/tmp/edgex/secrets/edgex-core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-vault", - "service": { - "ports": [ - { - "name": "tcp-8200", - "protocol": "TCP", - "port": 8200, - "targetPort": 8200 - } - ], - "selector": { - "app": "edgex-vault" - } - }, + "name": "edgex-security-bootstrap-database", "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-security-bootstrap-database" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-security-bootstrap-database" } }, "spec": { @@ -10062,37 +12122,29 @@ "name": "tmpfs-volume1", "emptyDir": {} }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-vault", + "path": "/tmp/edgex/secrets/ca", "type": "DirectoryOrCreate" } }, { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-init", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.5.3", - "ports": [ - { - "name": "tcp-8200", - "containerPort": 8200, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrap-database", + "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -10102,103 +12154,79 @@ ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" - }, - { - "name": "VAULT_UI", - "value": "true" + "name": "SERVICE_HOST", + "value": "edgex-security-bootstrap-database" }, { - "name": "VAULT_ADDR", - "value": "https://edgex-vault:8200" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-vault" + "mountPath": "/run" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "tmpfs-volume2", + "mountPath": "/vault" }, { - "name": "vault-init", - "mountPath": "/vault/init" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-security-bootstrap-database" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-48082", + "name": "tcp-48100", "protocol": "TCP", - "port": 48082, - "targetPort": 48082 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-app-service-configurable-rules" } }, "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-app-service-configurable-rules", + "image": "edgexfoundry/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], @@ -10212,70 +12240,99 @@ "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-app-service-configurable-rules" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "SERVICE_PORT", + "value": "48100" + }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-command" + "name": "BINDING_PUBLISHTOPIC", + "value": "events" + }, + { + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-core-data" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": {} } }, { - "name": "edgex-app-service-configurable-rules", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-48100", + "name": "tcp-5563", "protocol": "TCP", - "port": 48100, - "targetPort": 48100 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-48080", + "protocol": "TCP", + "port": 48080, + "targetPort": 48080 } ], "selector": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-data" } }, "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-core-data", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-app-service-configurable-rules", - "image": "edgexfoundry/docker-app-service-configurable:1.3.1", + "name": "edgex-core-data", + "image": "edgexfoundry/docker-core-data-go:1.3.1", "ports": [ { - "name": "tcp-48100", - "containerPort": 48100, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-48080", + "containerPort": 48080, "protocol": "TCP" } ], @@ -10288,49 +12345,60 @@ ], "env": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-core-data/secrets-token.json" }, { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "name": "SERVICE_HOST", "value": "edgex-core-data" - }, - { - "name": "SERVICE_PORT", - "value": "48100" - }, + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-service-configurable-rules" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "BINDING_PUBLISHTOPIC", - "value": "events" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-core-data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrap-database", + "name": "kong-db", + "service": { + "ports": [ + { + "name": "tcp-5432", + "protocol": "TCP", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "app": "kong-db" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrap-database" + "app": "kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrap-database" + "app": "kong-db" } }, "spec": { @@ -10344,24 +12412,25 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" - } + "name": "tmpfs-volume3", + "emptyDir": {} }, { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", - "type": "DirectoryOrCreate" - } + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-bootstrap-database", - "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", + "name": "kong-db", + "image": "postgres:12.3-alpine", + "ports": [ + { + "name": "tcp-5432", + "containerPort": 5432, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -10371,37 +12440,41 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-security-bootstrap-database" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" + "name": "POSTGRES_DB", + "value": "kong" + }, + { + "name": "POSTGRES_PASSWORD", + "value": "kong" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" + "mountPath": "/var/run" }, { "name": "tmpfs-volume2", - "mountPath": "/vault" + "mountPath": "/tmp" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "name": "tmpfs-volume3", + "mountPath": "/run" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrap-database" + "hostname": "kong-db" } }, "strategy": {} @@ -10477,35 +12550,47 @@ } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-48060", + "name": "tcp-8500", "protocol": "TCP", - "port": 48060, - "targetPort": 48060 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + }, + { + "name": "consul-scripts", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { @@ -10516,19 +12601,33 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-support-notifications", + "path": "/tmp/edgex/secrets/edgex-consul", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume3", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-kong", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume4", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-vault", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/docker-support-notifications-go:1.3.1", + "name": "edgex-core-consul", + "image": "edgexfoundry/docker-edgex-consul:1.3.0", "ports": [ { - "name": "tcp-48060", - "containerPort": 48060, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], @@ -10541,89 +12640,95 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "SECRETSTORE_SETUP_DONE_FLAG", + "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" + "name": "EDGEX_DB", + "value": "redis" + }, + { + "name": "EDGEX_SECURE", + "value": "true" } ], "resources": {}, "volumeMounts": [ + { + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets/ca" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" + "mountPath": "/tmp/edgex/secrets/edgex-consul" + }, + { + "name": "anonymous-volume3", + "mountPath": "/tmp/edgex/secrets/edgex-kong" + }, + { + "name": "anonymous-volume4", + "mountPath": "/tmp/edgex/secrets/edgex-vault" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "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" } ], @@ -10636,91 +12741,71 @@ ], "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": {} } }, { - "name": "edgex-secrets-setup", + "name": "edgex-kuiper", + "service": { + "ports": [ + { + "name": "tcp-20498", + "protocol": "TCP", + "port": 20498, + "targetPort": 20498 + }, + { + "name": "tcp-48075", + "protocol": "TCP", + "port": 48075, + "targetPort": 48075 + } + ], + "selector": { + "app": "edgex-kuiper" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-secrets-setup" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-secrets-setup" + "app": "edgex-kuiper" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "secrets-setup-cache", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "vault-init", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-secrets-setup", - "image": "edgexfoundry/docker-security-secrets-setup-go:1.3.1", + "name": "edgex-kuiper", + "image": "emqx/kuiper:1.1.1-alpine", + "ports": [ + { + "name": "tcp-20498", + "containerPort": 20498, + "protocol": "TCP" + }, + { + "name": "tcp-48075", + "containerPort": 48075, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -10728,33 +12813,41 @@ } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "tmpfs-volume1", - "mountPath": "/tmp" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "tmpfs-volume2", - "mountPath": "/run" + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" }, { - "name": "secrets-setup-cache", - "mountPath": "/etc/edgex/pki" + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" }, { - "name": "vault-init", - "mountPath": "/vault/init" + "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" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-secrets-setup" + "hostname": "edgex-kuiper" } }, "strategy": {} @@ -10859,6 +12952,18 @@ } ], "env": [ + { + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" + }, + { + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + }, { "name": "KONG_ADMIN_LISTEN", "value": "0.0.0.0:8001, 0.0.0.0:8444 ssl" @@ -10878,18 +12983,6 @@ { "name": "KONG_PROXY_ACCESS_LOG", "value": "/dev/stdout" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" } ], "resources": {}, @@ -10921,31 +13014,94 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-48085", + "name": "tcp-49986", "protocol": "TCP", - "port": 48085, - "targetPort": 48085 + "port": 49986, + "targetPort": 49986 } ], "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-device-rest", + "image": "edgexfoundry/docker-device-rest-go:1.2.1", + "ports": [ + { + "name": "tcp-49986", + "containerPort": 49986, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-device-rest" + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-device-rest" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-command", + "service": { + "ports": [ + { + "name": "tcp-48082", + "protocol": "TCP", + "port": 48082, + "targetPort": 48082 + } + ], + "selector": { + "app": "edgex-core-command" + } + }, + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-core-command" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-core-command" } }, "spec": { @@ -10960,19 +13116,19 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-support-scheduler", + "path": "/tmp/edgex/secrets/edgex-core-command", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/docker-support-scheduler-go:1.3.1", + "name": "edgex-core-command", + "image": "edgexfoundry/docker-core-command-go:1.3.1", "ports": [ { - "name": "tcp-48085", - "containerPort": 48085, + "name": "tcp-48082", + "containerPort": 48082, "protocol": "TCP" } ], @@ -10984,21 +13140,13 @@ } ], "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, { "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json" - }, - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, @@ -11009,55 +13157,71 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-support-scheduler" + "mountPath": "/tmp/edgex/secrets/edgex-core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-48090", + "name": "tcp-48060", "protocol": "TCP", - "port": 48090, - "targetPort": 48090 + "port": 48060, + "targetPort": 48060 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-support-notifications" } }, "spec": { + "volumes": [ + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-support-notifications", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", + "name": "edgex-support-notifications", + "image": "edgexfoundry/docker-support-notifications-go:1.3.1", "ports": [ { - "name": "tcp-48090", - "containerPort": 48090, + "name": "tcp-48060", + "containerPort": 48060, "protocol": "TCP" } ], @@ -11070,107 +13234,96 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-8200", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, - "labels": { - "app": "edgex-core-consul" - } - }, - "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - }, + "labels": { + "app": "edgex-vault" + } + }, + "spec": { + "volumes": [ { - "name": "consul-scripts", + "name": "tmpfs-volume1", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/ca", + "path": "/tmp/edgex/secrets/edgex-vault", "type": "DirectoryOrCreate" } }, { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} }, { - "name": "anonymous-volume3", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-kong", - "type": "DirectoryOrCreate" - } + "name": "vault-init", + "emptyDir": {} }, { - "name": "anonymous-volume4", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-vault", - "type": "DirectoryOrCreate" - } + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "edgexfoundry/docker-edgex-consul:1.3.0", + "name": "edgex-vault", + "image": "vault:1.5.3", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], @@ -11183,88 +13336,90 @@ ], "env": [ { - "name": "SECRETSTORE_SETUP_DONE_FLAG", - "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + "name": "VAULT_ADDR", + "value": "https://edgex-vault:8200" }, { - "name": "EDGEX_DB", - "value": "redis" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "EDGEX_SECURE", + "name": "VAULT_UI", "value": "true" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" - }, - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "tmpfs-volume1", + "mountPath": "/vault/config" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "mountPath": "/tmp/edgex/secrets/edgex-vault" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "name": "vault-file", + "mountPath": "/vault/file" }, { - "name": "anonymous-volume3", - "mountPath": "/tmp/edgex/secrets/edgex-kong" + "name": "vault-init", + "mountPath": "/vault/init" }, { - "name": "anonymous-volume4", - "mountPath": "/tmp/edgex/secrets/edgex-vault" + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "name": "", + "name": "edgex-sys-mgmt-agent", + "service": { + "ports": [ + { + "name": "tcp-48090", + "protocol": "TCP", + "port": 48090, + "targetPort": 48090 + } + ], + "selector": { + "app": "edgex-sys-mgmt-agent" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "" + "app": "edgex-sys-mgmt-agent" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "consul-scripts", - "emptyDir": {} - } - ], "containers": [ { - "name": "", - "image": "kong:2.0.5", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", + "ports": [ + { + "name": "tcp-48090", + "containerPort": 48090, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -11274,32 +13429,23 @@ ], "env": [ { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "KONG_PG_HOST", - "value": "kong-db" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "KONG_PG_PASSWORD", - "value": "kong" + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/tmp" - }, - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" - } - ], "imagePullPolicy": "IfNotPresent" } - ] + ], + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} @@ -11396,119 +13542,45 @@ } }, { - "name": "edgex-device-virtual", - "service": { - "ports": [ - { - "name": "tcp-49990", - "protocol": "TCP", - "port": 49990, - "targetPort": 49990 - } - ], - "selector": { - "app": "edgex-device-virtual" - } - }, + "name": "edgex-proxy", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-proxy" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-proxy" } }, "spec": { - "containers": [ + "volumes": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/docker-device-virtual-go:1.3.1", - "ports": [ - { - "name": "tcp-49990", - "containerPort": 49990, - "protocol": "TCP" - } - ], - "envFrom": [ - { - "configMapRef": { - "name": "common-variables" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-device-virtual" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-20498", - "protocol": "TCP", - "port": 20498, - "targetPort": 20498 - }, - { - "name": "tcp-48075", - "protocol": "TCP", - "port": 48075, - "targetPort": 48075 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-kuiper" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-kuiper" - } - }, - "spec": { - "containers": [ + "name": "consul-scripts", + "emptyDir": {} + }, { - "name": "edgex-kuiper", - "image": "emqx/kuiper:1.1.1-alpine", - "ports": [ - { - "name": "tcp-20498", - "containerPort": 20498, - "protocol": "TCP" - }, - { - "name": "tcp-48075", - "containerPort": 48075, - "protocol": "TCP" - } - ], + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-security-proxy-setup", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ + { + "name": "edgex-proxy", + "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -11518,100 +13590,95 @@ ], "env": [ { - "name": "EDGEX__DEFAULT__SERVICESERVER", - "value": "http://edgex-core-data:48080" + "name": "SECRETSERVICE_SERVER", + "value": "edgex-vault" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "events" + "name": "SECRETSERVICE_CACERTPATH", + "value": "/tmp/edgex/secrets/ca/ca.pem" }, { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "KONGURL_SERVER", + "value": "kong" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "48075" + "name": "SECRETSERVICE_SNIS", + "value": "edgex-kong" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "5566" + "name": "SECRETSERVICE_TOKENPATH", + "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-security-proxy-setup" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-proxy" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", - "service": { - "ports": [ - { - "name": "tcp-48081", - "protocol": "TCP", - "port": 48081, - "targetPort": 48081 - } - ], - "selector": { - "app": "edgex-core-metadata" - } - }, + "name": "edgex-secrets-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-secrets-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "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/ca", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } }, { - "name": "anonymous-volume2", - "hostPath": { - "path": "/tmp/edgex/secrets/edgex-core-metadata", - "type": "DirectoryOrCreate" - } + "name": "vault-init", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/docker-core-metadata-go:1.3.1", - "ports": [ - { - "name": "tcp-48081", - "containerPort": 48081, - "protocol": "TCP" - } - ], + "name": "edgex-secrets-setup", + "image": "edgexfoundry/docker-security-secrets-setup-go:1.3.1", "envFrom": [ { "configMapRef": { @@ -11619,80 +13686,68 @@ } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "name": "tmpfs-volume1", + "mountPath": "/tmp" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "tmpfs-volume2", + "mountPath": "/run" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "secrets-setup-cache", + "mountPath": "/etc/edgex/pki" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "mountPath": "/tmp/edgex/secrets" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-metadata" + "name": "vault-init", + "mountPath": "/vault/init" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-secrets-setup" } }, "strategy": {} } }, { - "name": "edgex-device-rest", - "service": { - "ports": [ - { - "name": "tcp-49986", - "protocol": "TCP", - "port": 49986, - "targetPort": 49986 - } - ], - "selector": { - "app": "edgex-device-rest" - } - }, + "name": "", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "" } }, "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "consul-scripts", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/docker-device-rest-go:1.2.1", - "ports": [ - { - "name": "tcp-49986", - "containerPort": 49986, - "protocol": "TCP" - } - ], + "name": "", + "image": "kong:2.0.5", "envFrom": [ { "configMapRef": { @@ -11702,41 +13757,67 @@ ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "name": "KONG_PG_PASSWORD", + "value": "kong" + }, + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_PG_HOST", + "value": "kong-db" } ], "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/tmp" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + } + ], "imagePullPolicy": "IfNotPresent" } - ], - "hostname": "edgex-device-rest" + ] } }, "strategy": {} } }, { - "name": "edgex-proxy", + "name": "edgex-support-scheduler", + "service": { + "ports": [ + { + "name": "tcp-48085", + "protocol": "TCP", + "port": 48085, + "targetPort": 48085 + } + ], + "selector": { + "app": "edgex-support-scheduler" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy" + "app": "edgex-support-scheduler" } }, "spec": { "volumes": [ - { - "name": "consul-scripts", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { @@ -11747,15 +13828,22 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-security-proxy-setup", + "path": "/tmp/edgex/secrets/edgex-support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-proxy", - "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/docker-support-scheduler-go:1.3.1", + "ports": [ + { + "name": "tcp-48085", + "containerPort": 48085, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { @@ -11765,45 +13853,37 @@ ], "env": [ { - "name": "SECRETSERVICE_SNIS", - "value": "edgex-kong" - }, - { - "name": "SECRETSERVICE_SERVER", - "value": "edgex-vault" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "SECRETSERVICE_CACERTPATH", - "value": "/tmp/edgex/secrets/ca/ca.pem" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json" }, { - "name": "SECRETSERVICE_TOKENPATH", - "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "KONGURL_SERVER", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "volumeMounts": [ - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" - }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets/ca" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/edgex-support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy" + "hostname": "edgex-support-scheduler" } }, "strategy": {} diff --git a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/manifest.yaml b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/manifest.yaml index cf5bf7c3acb..2cb46115376 100644 --- a/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/manifest.yaml +++ b/pkg/yurtmanager/controller/platformadmin/config/EdgeXConfig/manifest.yaml @@ -1,7 +1,14 @@ updated: false -count: 6 -latestVersion: minnesota +count: 7 +latestVersion: napa versions: +- name: napa + requiredComponents: + - edgex-core-command + - edgex-core-consul + - edgex-core-metadata + - edgex-redis + - edgex-core-common-config-bootstrapper - name: kamakura requiredComponents: - edgex-core-command @@ -38,4 +45,4 @@ versions: - edgex-core-command - edgex-core-consul - edgex-core-metadata - - edgex-redis + - edgex-redis \ No newline at end of file diff --git a/test/e2e/yurt/iot.go b/test/e2e/yurt/iot.go index 7dbd4e83349..1dbdf110b3b 100644 --- a/test/e2e/yurt/iot.go +++ b/test/e2e/yurt/iot.go @@ -34,7 +34,7 @@ import ( ) func generateTestVersions() []string { - return []string{"levski", "jakarta", "kamakura", "ireland", "minnesota"} + return []string{"levski", "jakarta", "kamakura", "ireland", "minnesota", "napa"} } var _ = Describe("OpenYurt IoT Test", Ordered, func() {