diff --git a/pkg/controller/platformadmin/config/EdgeXConfig/config-nosecty.json b/pkg/controller/platformadmin/config/EdgeXConfig/config-nosecty.json index 30b3908cec3..99ff66567ae 100644 --- a/pkg/controller/platformadmin/config/EdgeXConfig/config-nosecty.json +++ b/pkg/controller/platformadmin/config/EdgeXConfig/config-nosecty.json @@ -5,7 +5,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-kamakura", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -23,141 +23,126 @@ ], "components": [ { - "name": "edgex-app-rules-engine", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59986", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.2.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.2.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "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:2.2.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.2.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", "value": "edgex-core-data" } ], @@ -165,70 +150,64 @@ "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-4000", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-ui-go" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.2.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.2.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" - } - ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-ui-go" } }, "strategy": {} @@ -277,22 +256,22 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "METRICSMECHANISM", + "value": "executor" }, { "name": "SERVICE_HOST", "value": "edgex-sys-mgmt-agent" }, { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, @@ -348,7 +327,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], @@ -369,71 +348,63 @@ } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59900", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.2.0", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.2.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-device-virtual" } }, "strategy": {} @@ -482,7 +453,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], @@ -507,444 +478,473 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-5563", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "spec": { - "volumes": [ - { - "name": "kuiper-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.4.4-alpine", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.2.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "SERVICE_HOST", + "value": "edgex-core-data" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-8500", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "db-data", + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:6.2.6-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.10", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-6379", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "spec": { "volumes": [ { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", + "name": "db-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.10", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.6-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" - }, - { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "db-data", + "mountPath": "/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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.2.0", + "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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59720", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-kuiper" } }, "spec": { + "volumes": [ + { + "name": "kuiper-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.2.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "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": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.2.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.2.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" + } + ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-notifications" } }, "strategy": {} @@ -957,7 +957,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-jakarta", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -975,63 +975,63 @@ ], "components": [ { - "name": "edgex-device-virtual", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59882", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.1.1", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.1.1", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -1080,7 +1080,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], @@ -1095,349 +1095,386 @@ } }, { - "name": "edgex-core-command", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59860", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.1.1", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:2.1.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-support-notifications" } }, "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.1.1", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, + { + "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" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59861", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-support-scheduler" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.10.3", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.1.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-5563", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.1.2", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.1.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "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" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-data" } }, "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": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.1.1", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.1.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-device-virtual" } }, "strategy": {} @@ -1492,7 +1529,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], @@ -1513,390 +1550,353 @@ } }, { - "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": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.1.1", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.1.1", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "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-support-notifications", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59881", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.1.1", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.1.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-metadata" + }, + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-58890", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:2.1.1", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.1.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "METRICSMECHANISM", + "value": "executor" }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "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": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.1.1", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.1.2", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-app-rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-app-rules-engine" } }, "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": "consul-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.4.4-alpine", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.10.3", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], - "env": [ - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - } - ], "resources": {}, "volumeMounts": [ { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "name": "consul-config", + "mountPath": "/consul/config" + }, + { + "name": "consul-data", + "mountPath": "/consul/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-consul" } }, "strategy": {} @@ -1909,7 +1909,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-levski", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -1969,7 +1969,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], @@ -1990,211 +1990,197 @@ } }, { - "name": "edgex-ui-go", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-4000", + "name": "tcp-59861", "protocol": "TCP", - "port": 4000, - "targetPort": 4000 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:2.3.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.3.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "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-ui-go" + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59900", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.13.2", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.3.0", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], - "resources": {}, - "volumeMounts": [ - { - "name": "consul-config", - "mountPath": "/consul/config" - }, + "env": [ { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-device-virtual" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:2.3.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:2.3.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "value": "edgex-ui-go" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-ui-go" } }, "strategy": {} @@ -2243,7 +2229,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], @@ -2268,209 +2254,294 @@ } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-59701", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-app-rules-engine" } }, "spec": { "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.3.0", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "value": "edgex-app-rules-engine" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "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.3.1", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.13.2", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_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-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": { + "containers": [ + { + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.3.0", + "ports": [ + { + "name": "tcp-58890", + "containerPort": 58890, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "METRICSMECHANISM", + "value": "executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59882", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.3.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.3.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ + { + "name": "MESSAGEQUEUE_EXTERNAL_URL", + "value": "tcp://edgex-mqtt-broker:1883" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-core-command" + }, + { + "name": "MESSAGEQUEUE_INTERNAL_HOST", + "value": "edgex-redis" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -2525,45 +2596,37 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, { "name": "EDGEX__DEFAULT__SERVER", "value": "edgex-redis" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { - "name": "EDGEX__DEFAULT__TYPE", + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", "value": "redis" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { "name": "KUIPER__BASIC__CONSOLELOG", "value": "true" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", "value": "redis" }, { @@ -2571,8 +2634,16 @@ "value": "edgex-redis" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" } ], "resources": {}, @@ -2592,769 +2663,750 @@ } }, { - "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.5-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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], - "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-core-command", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-5563", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.3.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.3.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ - { - "name": "MESSAGEQUEUE_EXTERNAL_URL", - "value": "tcp://edgex-mqtt-broker:1883" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-command" - }, - { - "name": "MESSAGEQUEUE_INTERNAL_HOST", - "value": "edgex-redis" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "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.3.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.5-alpine", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], - "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": {} } - }, + } + ] + }, + { + "versionName": "minnesota", + "configMaps": [ { - "name": "edgex-core-data", + "metadata": { + "name": "common-variables", + "creationTimestamp": null + }, + "data": { + "EDGEX_SECURITY_SECRET_STORE": "false" + } + } + ], + "components": [ + { + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.3.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:3.0.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": {} } - } - ] - }, - { - "versionName": "minnesota", - "configMaps": [ - { - "metadata": { - "name": "common-variable-minnesota", - "creationTimestamp": null - } - } - ], - "components": [ + }, { - "name": "edgex-core-common-config-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-core-common-config-bootstrapper" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "openyurt/core-common-config-bootstrapper:3.0.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:3.0.0", + "ports": [ + { + "name": "tcp-59882", + "containerPort": 59882, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "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": "SERVICE_HOST", + "value": "edgex-core-command" }, { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-common-config-bootstrapper" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59880", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:3.0.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:3.0.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "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": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/support-scheduler:3.0.0", + "name": "edgex-ui-go", + "image": "openyurt/edgex-ui:3.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "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-support-scheduler" + "value": "edgex-ui-go" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-ui-go" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-8500", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:3.0.0", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.15.2", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], - "env": [ - { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" - }, + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "consul-data", + "mountPath": "/consul/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59880", + "name": "tcp-59881", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-core-metadata" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:3.0.0", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:3.0.0", "ports": [ { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-6379", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-core-metadata", - "image": "openyurt/core-metadata:3.0.0", + "name": "edgex-redis", + "image": "openyurt/redis:7.0.11-alpine", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, + "resources": {}, + "volumeMounts": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59900", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-device-virtual" } }, "spec": { - "volumes": [ - { - "name": "db-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-redis", - "image": "openyurt/redis:7.0.11-alpine", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:3.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], - "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": {} @@ -3403,15 +3455,11 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" - }, { "name": "SERVICE_HOST", "value": "edgex-app-rules-engine" @@ -3484,7 +3532,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], @@ -3494,19 +3542,7 @@ "value": "edgex-redis" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, { @@ -3514,13 +3550,17 @@ "value": "edgex/rules-events" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "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" @@ -3530,15 +3570,23 @@ "value": "6379" }, { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" + "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": "kuiper-log", @@ -3555,278 +3603,193 @@ } }, { - "name": "edgex-ui-go", - "service": { - "ports": [ - { - "name": "tcp-4000", - "protocol": "TCP", - "port": 4000, - "targetPort": 4000 - } - ], - "selector": { - "app": "edgex-ui-go" - } - }, + "name": "edgex-core-common-config-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-ui-go" + "app": "edgex-core-common-config-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-ui-go" + "app": "edgex-core-common-config-bootstrapper" } }, "spec": { "containers": [ { - "name": "edgex-ui-go", - "image": "openyurt/edgex-ui:3.0.0", - "ports": [ - { - "name": "tcp-4000", - "containerPort": 4000, - "protocol": "TCP" - } - ], + "name": "edgex-core-common-config-bootstrapper", + "image": "openyurt/core-common-config-bootstrapper:3.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" }, { - "name": "SERVICE_HOST", - "value": "edgex-ui-go" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-ui-go" - } - }, - "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": [ + "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, { - "configMapRef": { - "name": "common-variable-minnesota" - } - } - ], - "resources": {}, - "volumeMounts": [ + "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-core-common-config-bootstrapper" } }, "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:3.0.0", + "name": "edgex-support-notifications", + "image": "openyurt/support-notifications:3.0.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" - }, - { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59861", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-support-scheduler" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:3.0.0", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:3.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "EDGEX_SECURITY_SECRET_STORE", - "value": "false" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-support-scheduler" } }, "strategy": {} @@ -3839,7 +3802,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-ireland", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -3857,855 +3820,855 @@ ], "components": [ { - "name": "edgex-kuiper", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-59861", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-support-scheduler" } }, "spec": { - "volumes": [ - { - "name": "kuiper-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/ekuiper:1.3.0-alpine", + "name": "edgex-support-scheduler", + "image": "openyurt/support-scheduler:2.0.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" }, { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, - "volumeMounts": [ - { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-59701", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-app-rules-engine" } }, "spec": { - "volumes": [ - { - "name": "consul-config", - "emptyDir": {} - }, - { - "name": "consul-data", - "emptyDir": {} - } - ], "containers": [ { - "name": "edgex-core-consul", - "image": "openyurt/consul:1.9.5", + "name": "edgex-app-rules-engine", + "image": "openyurt/app-service-configurable:2.0.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-58890", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "openyurt/device-rest:2.0.0", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/sys-mgmt-agent:2.0.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-sys-mgmt-agent" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-sys-mgmt-agent" } }, "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.0.0", + "name": "edgex-kuiper", + "image": "openyurt/ekuiper:1.3.0-alpine", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "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" } ], "resources": {}, + "volumeMounts": [ + { + "name": "kuiper-data", + "mountPath": "/kuiper/data" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kuiper" } }, "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.4-alpine", + "name": "edgex-core-metadata", + "image": "openyurt/core-metadata:2.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], - "resources": {}, - "volumeMounts": [ + "env": [ { - "name": "db-data", - "mountPath": "/data" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-59986", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/core-data:2.0.0", + "name": "edgex-device-rest", + "image": "openyurt/device-rest:2.0.0", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-6379", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-device-virtual", - "image": "openyurt/device-virtual:2.0.0", + "name": "edgex-redis", + "image": "openyurt/redis:6.2.4-alpine", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "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": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59900", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-virtual" } }, "spec": { "containers": [ { - "name": "edgex-app-rules-engine", - "image": "openyurt/app-service-configurable:2.0.1", + "name": "edgex-device-virtual", + "image": "openyurt/device-virtual:2.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "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" + "value": "edgex-device-virtual" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-8500", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "openyurt/sys-mgmt-agent:2.0.0", + "name": "edgex-core-consul", + "image": "openyurt/consul:1.9.5", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], - "env": [ - { - "name": "METRICSMECHANISM", - "value": "executor" - }, + "resources": {}, + "volumeMounts": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "name": "consul-data", + "mountPath": "/consul/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-5563", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "spec": { "containers": [ { - "name": "edgex-core-command", - "image": "openyurt/core-command:2.0.0", + "name": "edgex-core-data", + "image": "openyurt/core-data:2.0.0", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59882", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/support-notifications:2.0.0", + "name": "edgex-core-command", + "image": "openyurt/core-command:2.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -4718,7 +4681,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-hanoi", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -4740,338 +4703,344 @@ ], "components": [ { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-48090", + "name": "tcp-48081", "protocol": "TCP", - "port": 48090, - "targetPort": 48090 + "port": 48081, + "targetPort": 48081 } ], "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/docker-sys-mgmt-agent-go:1.3.1", + "name": "edgex-core-metadata", + "image": "openyurt/docker-core-metadata-go:1.3.1", "ports": [ { - "name": "tcp-48090", - "containerPort": 48090, + "name": "tcp-48081", + "containerPort": 48081, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-48080", + "name": "tcp-48060", "protocol": "TCP", - "port": 48080, - "targetPort": 48080 + "port": 48060, + "targetPort": 48060 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-support-notifications" } }, "spec": { "containers": [ { - "name": "edgex-core-data", - "image": "openyurt/docker-core-data-go:1.3.1", + "name": "edgex-support-notifications", + "image": "openyurt/docker-support-notifications-go:1.3.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-48080", - "containerPort": 48080, + "name": "tcp-48060", + "containerPort": 48060, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-support-notifications" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-support-notifications" } }, "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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-48081", + "name": "tcp-5563", "protocol": "TCP", - "port": 48081, - "targetPort": 48081 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-48080", + "protocol": "TCP", + "port": 48080, + "targetPort": 48080 } ], "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/docker-core-metadata-go:1.3.1", + "name": "edgex-core-data", + "image": "openyurt/docker-core-data-go:1.3.1", "ports": [ { - "name": "tcp-48081", - "containerPort": 48081, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-48080", + "containerPort": 48080, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "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-core-command", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-48082", + "name": "tcp-6379", "protocol": "TCP", - "port": 48082, - "targetPort": 48082 + "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/docker-core-command-go:1.3.1", + "name": "edgex-redis", + "image": "openyurt/redis:6.0.9-alpine", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], - "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": {} @@ -5120,7 +5089,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], @@ -5141,475 +5110,469 @@ } }, { - "name": "edgex-kuiper", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-20498", - "protocol": "TCP", - "port": 20498, - "targetPort": 20498 - }, - { - "name": "tcp-48075", + "name": "tcp-49986", "protocol": "TCP", - "port": 48075, - "targetPort": 48075 + "port": 49986, + "targetPort": 49986 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-device-rest" } }, "spec": { "containers": [ { - "name": "edgex-kuiper", - "image": "openyurt/kuiper:1.1.1-alpine", + "name": "edgex-device-rest", + "image": "openyurt/docker-device-rest-go:1.2.1", "ports": [ { - "name": "tcp-20498", - "containerPort": 20498, - "protocol": "TCP" - }, - { - "name": "tcp-48075", - "containerPort": 48075, + "name": "tcp-49986", + "containerPort": 49986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" - }, - { - "name": "EDGEX__DEFAULT__SERVICESERVER", - "value": "http://edgex-core-data:48080" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "events" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "48075" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "5566" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" + "name": "SERVICE_HOST", + "value": "edgex-device-rest" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-app-service-configurable-rules", + "name": "edgex-core-consul", "service": { "ports": [ { - "name": "tcp-48100", + "name": "tcp-8500", "protocol": "TCP", - "port": 48100, - "targetPort": 48100 + "port": 8500, + "targetPort": 8500 } ], "selector": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-consul" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-core-consul" } }, "spec": { + "volumes": [ + { + "name": "consul-config", + "emptyDir": {} + }, + { + "name": "consul-data", + "emptyDir": {} + }, + { + "name": "consul-scripts", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-app-service-configurable-rules", - "image": "openyurt/docker-app-service-configurable:1.3.1", + "name": "edgex-core-consul", + "image": "openyurt/docker-edgex-consul:1.3.0", "ports": [ { - "name": "tcp-48100", - "containerPort": 48100, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-core-data" + "name": "EDGEX_DB", + "value": "redis" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, + "name": "EDGEX_SECURE", + "value": "false" + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "BINDING_PUBLISHTOPIC", - "value": "events" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "SERVICE_PORT", - "value": "48100" + "name": "consul-data", + "mountPath": "/consul/data" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-service-configurable-rules" + "name": "consul-scripts", + "mountPath": "/consul/scripts" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-48085", + "name": "tcp-20498", "protocol": "TCP", - "port": 48085, - "targetPort": 48085 + "port": 20498, + "targetPort": 20498 + }, + { + "name": "tcp-48075", + "protocol": "TCP", + "port": 48075, + "targetPort": 48075 } ], "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": { "containers": [ { - "name": "edgex-support-scheduler", - "image": "openyurt/docker-support-scheduler-go:1.3.1", + "name": "edgex-kuiper", + "image": "openyurt/kuiper:1.1.1-alpine", "ports": [ { - "name": "tcp-48085", - "containerPort": 48085, + "name": "tcp-20498", + "containerPort": 20498, + "protocol": "TCP" + }, + { + "name": "tcp-48075", + "containerPort": 48075, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__SERVICESERVER", + "value": "http://edgex-core-data:48080" }, { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "events" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-app-service-configurable-rules" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-48060", + "name": "tcp-48082", "protocol": "TCP", - "port": 48060, - "targetPort": 48060 + "port": 48082, + "targetPort": 48082 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-command" } }, "spec": { "containers": [ { - "name": "edgex-support-notifications", - "image": "openyurt/docker-support-notifications-go:1.3.1", + "name": "edgex-core-command", + "image": "openyurt/docker-core-command-go:1.3.1", "ports": [ { - "name": "tcp-48060", - "containerPort": 48060, + "name": "tcp-48082", + "containerPort": 48082, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-command" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-48090", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 48090, + "targetPort": 48090 } ], "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.0.9-alpine", + "name": "edgex-sys-mgmt-agent", + "image": "openyurt/docker-sys-mgmt-agent-go:1.3.1", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-48090", + "containerPort": 48090, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], - "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-core-consul", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-48100", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-app-service-configurable-rules" } }, "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-app-service-configurable-rules", + "image": "openyurt/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_DB", - "value": "redis" + "name": "BINDING_PUBLISHTOPIC", + "value": "events" }, { - "name": "EDGEX_SECURE", - "value": "false" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "SERVICE_HOST", + "value": "edgex-app-service-configurable-rules" + }, { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-core-data" }, { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "SERVICE_PORT", + "value": "48100" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": {} diff --git a/pkg/controller/platformadmin/config/EdgeXConfig/config.json b/pkg/controller/platformadmin/config/EdgeXConfig/config.json index 55c5b79d57a..dc0ccf99e6f 100644 --- a/pkg/controller/platformadmin/config/EdgeXConfig/config.json +++ b/pkg/controller/platformadmin/config/EdgeXConfig/config.json @@ -5,7 +5,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-kamakura", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -46,18 +46,31 @@ ], "components": [ { - "name": "edgex-security-bootstrapper", + "name": "edgex-app-rules-engine", + "service": { + "ports": [ + { + "name": "tcp-59701", + "protocol": "TCP", + "port": 59701, + "targetPort": 59701 + } + ], + "selector": { + "app": "edgex-app-rules-engine" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -65,27 +78,49 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.2.0", + "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-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" } ], "resources": {}, @@ -93,268 +128,295 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-kuiper", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-5432", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-kong-db" } }, "spec": { "volumes": [ { - "name": "edgex-init", + "name": "tmpfs-volume1", "emptyDir": {} }, { - "name": "kuiper-data", + "name": "tmpfs-volume2", "emptyDir": {} }, { - "name": "kuiper-connections", + "name": "tmpfs-volume3", "emptyDir": {} }, { - "name": "kuiper-sources", + "name": "edgex-init", + "emptyDir": {} + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "postgres-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", + "name": "edgex-kong-db", + "image": "postgres:13.5-alpine", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, + "name": "POSTGRES_DB", + "value": "kong" + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "tmpfs-volume1", + "mountPath": "/var/run" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "tmpfs-volume3", + "mountPath": "/run" }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - } - ], - "resources": {}, - "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "kuiper-data", - "mountPath": "/kuiper/data" - }, - { - "name": "kuiper-connections", - "mountPath": "/kuiper/etc/connections" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" }, { - "name": "kuiper-sources", - "mountPath": "/kuiper/etc/sources" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-kong-db" } }, "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.2.0", + "name": "edgex-core-consul", + "image": "consul:1.10.10", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "EDGEX_USER", + "value": "2002" } ], "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-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": { @@ -366,41 +428,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "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:2.2.0", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" - }, { "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" + "value": "edgex-device-rest" } ], "resources": {}, @@ -411,68 +465,105 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-kong", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8100", + "name": "tcp-4000", "protocol": "TCP", - "port": 8100, - "targetPort": 8100 + "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": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "resources": {}, + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-ui-go" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-support-scheduler", + "service": { + "ports": [ { - "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": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -480,362 +571,238 @@ { "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.6.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.2.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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "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_DATABASE", - "value": "postgres" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "INTERVALACTIONS_SCRUBPUSHED_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-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-58890", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "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/sys-mgmt-agent", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.5-alpine", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.2.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - } + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" + } ], "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/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-vault", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59882", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-core-command" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-file", - "emptyDir": {} - }, - { - "name": "vault-logs", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-command", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.8.9", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.2.0", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "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-core-command" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" - }, - { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -909,18 +876,18 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" - }, { "name": "DATABASECONFIG_NAME", "value": "redis.conf" + }, + { + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" } ], "resources": {}, @@ -1022,18 +989,18 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" - }, { "name": "SERVICE_HOST", "value": "edgex-core-data" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -1057,31 +1024,31 @@ } }, { - "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": { @@ -1093,33 +1060,33 @@ { "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.2.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.2.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -1130,48 +1097,68 @@ }, { "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": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-8000", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "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-support-notifications" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -1179,68 +1166,163 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.2.0", + "name": "edgex-kong", + "image": "kong:2.6.1", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "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-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "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" } ], "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/support-notifications" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-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-proxy-setup" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-metadata" } }, "spec": { @@ -1249,72 +1331,40 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.2.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.2.0", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", + "name": "NOTIFICATIONS_SENDER", "value": "edgex-core-metadata" }, { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "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": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], "resources": {}, @@ -1323,168 +1373,158 @@ "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/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-ui-go", - "service": { - "ports": [ - { - "name": "tcp-4000", - "protocol": "TCP", - "port": 4000, - "targetPort": 4000 - } - ], - "selector": { - "app": "edgex-ui-go" - } - }, + "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.2.0", - "ports": [ - { - "name": "tcp-4000", - "containerPort": 4000, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.2.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], + "env": [ + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + } + ], "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + } + ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-ui-go" + "hostname": "edgex-security-bootstrapper" } }, "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.10.10", - "ports": [ - { - "name": "tcp-8500", - "containerPort": 8500, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.2.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ - { - "name": "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": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "ADD_SECRETSTORE_TOKENS" + }, + { + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { "name": "EDGEX_GROUP", @@ -1494,61 +1534,60 @@ "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-command", - "service": { - "ports": [ - { - "name": "tcp-59882", - "protocol": "TCP", - "port": 59882, - "targetPort": 59882 - } - ], - "selector": { - "app": "edgex-core-command" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -1557,36 +1596,72 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.2.0", - "ports": [ - { - "name": "tcp-59882", - "containerPort": 59882, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.2.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", + "name": "ROUTES_SUPPORT_NOTIFICATIONS_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": {}, @@ -1595,46 +1670,50 @@ "name": "edgex-init", "mountPath": "/edgex-init" }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59720", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59720, + "targetPort": 59720 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-kuiper" } }, "spec": { @@ -1644,47 +1723,80 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", - "type": "DirectoryOrCreate" - } + "name": "kuiper-data", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "kuiper-sources", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.2.0", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "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": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__SERVER", "value": "edgex-redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" } ], "resources": {}, @@ -1694,139 +1806,160 @@ "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "name": "kuiper-data", + "mountPath": "/kuiper/data" + }, + { + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-8200", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.2.0", + "name": "edgex-vault", + "image": "vault:1.8.9", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" }, { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" + "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/support-scheduler" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-vault" } }, "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": { @@ -1838,37 +1971,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.2.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.2.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "value": "edgex-support-notifications" } ], "resources": {}, @@ -1879,18 +2008,62 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-notifications" } }, "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-security-secretstore-setup", "deployment": { @@ -1947,33 +2120,33 @@ "containers": [ { "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:2.2.0", + "image": "edgexfoundry/security-secretstore-setup:2.1.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-kamakura" + "name": "common-variables" } } ], "env": [ { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { "name": "EDGEX_USER", "value": "2002" }, - { - "name": "EDGEX_GROUP", - "value": "2001" - }, { "name": "SECUREMESSAGEBUS_TYPE", "value": "redis" + }, + { + "name": "ADD_SECRETSTORE_TOKENS" } ], "resources": {}, @@ -2019,184 +2192,178 @@ }, "strategy": {} } - } - ] - }, - { - "versionName": "jakarta", - "configMaps": [ - { - "metadata": { - "name": "common-variable-jakarta", - "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-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": "vault:1.8.4", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.4.4-alpine", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "VAULT_UI", + "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": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" } ], "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": "vault-logs", - "mountPath": "/vault/logs" + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-core-command", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-5563", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-core-data" } }, "spec": { @@ -2208,33 +2375,42 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.1.1", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.1.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-core-data" + }, + { + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" } ], "resources": {}, @@ -2245,24 +2421,147 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-8500", + "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_DB", + "value": "kong" + }, + { + "name": "POSTGRES_USER", + "value": "kong" + }, + { + "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": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-kong-db" + } + }, + "strategy": {} + } + }, + { + "name": "edgex-core-consul", + "service": { + "ports": [ + { + "name": "tcp-8500", "protocol": "TCP", "port": 8500, "targetPort": 8500 @@ -2325,29 +2624,29 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "EDGEX_GROUP", + "value": "2001" }, { "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", "value": "/consul/config/consul_acl_done" }, { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "ADD_REGISTRY_ACL_ROLES" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -2383,129 +2682,59 @@ } }, { - "name": "edgex-security-secretstore-setup", + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-security-bootstrapper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-security-bootstrapper" } }, "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", + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:2.1.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "EDGEX_GROUP", + "value": "2001" }, { "name": "EDGEX_USER", "value": "2002" - }, - { - "name": "ADD_SECRETSTORE_TOKENS" - }, - { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" - }, - { - "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" - }, - { - "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" + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} @@ -2579,18 +2808,18 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ - { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" - }, { "name": "DATABASECONFIG_PATH", "value": "/run/redis/conf" + }, + { + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, @@ -2626,18 +2855,31 @@ } }, { - "name": "edgex-security-proxy-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-proxy-setup" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-metadata" } }, "spec": { @@ -2646,72 +2888,40 @@ "name": "edgex-init", "emptyDir": {} }, - { - "name": "consul-acl-token", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.1.1", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.1.1", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", + "name": "SERVICE_HOST", "value": "edgex-core-metadata" }, { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ADD_PROXY_ROUTE" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, @@ -2720,50 +2930,46 @@ "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/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-core-metadata" } }, "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": { @@ -2773,79 +2979,46 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/app-rules-engine", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.4.4-alpine", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.1.2", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", "value": "edgex-redis" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" + "name": "SERVICE_HOST", + "value": "edgex-app-rules-engine" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", "value": "edgex-redis" } ], @@ -2856,176 +3029,139 @@ "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": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-kong-db", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-58890", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 58890, + "targetPort": 58890 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-sys-mgmt-agent" } }, "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/sys-mgmt-agent", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.4-alpine", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.1.1", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-58890", + "containerPort": 58890, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "POSTGRES_DB", - "value": "kong" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "POSTGRES_USER", - "value": "kong" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" } ], "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/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-59882", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-core-command" } }, "spec": { @@ -3037,242 +3173,50 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/core-command", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.1.1", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.1.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "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-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-variable-jakarta" - } - } - ], - "env": [ - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_SSL_CIPHER_SUITE", - "value": "modern" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" - }, - { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" - }, - { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" + "value": "edgex-core-command" } ], "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/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-core-command" } }, "strategy": {} @@ -3334,7 +3278,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], @@ -3407,7 +3351,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], @@ -3422,31 +3366,31 @@ } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59986", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-device-rest" } }, "spec": { @@ -3458,45 +3402,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.1.2", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.1.1", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "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" + "value": "edgex-device-rest" } ], "resources": {}, @@ -3507,130 +3439,151 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-8200", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.1.1", + "name": "edgex-vault", + "image": "vault:1.8.4", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "name": "VAULT_UI", + "value": "true" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/vault/config" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "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": { @@ -3642,33 +3595,41 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", + "path": "/tmp/edgex/secrets/support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.1.1", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.1.1", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-scheduler" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -3679,54 +3640,68 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-5563", + "name": "tcp-8000", "protocol": "TCP", - "port": 5563, - "targetPort": 5563 + "port": 8000, + "targetPort": 8000 }, { - "name": "tcp-59880", + "name": "tcp-8100", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -3734,90 +3709,150 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-data", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.1.1", + "name": "edgex-kong", + "image": "kong:2.5.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, + "name": "tcp-8000", + "containerPort": 8000, "protocol": "TCP" }, { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-8100", + "containerPort": 8100, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-data" + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "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": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" + }, + { + "name": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_PG_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", - "service": { - "ports": [ - { - "name": "tcp-58890", - "protocol": "TCP", - "port": 58890, - "targetPort": 58890 - } - ], - "selector": { - "app": "edgex-sys-mgmt-agent" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -3826,107 +3861,72 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.1.1", - "ports": [ - { - "name": "tcp-58890", - "containerPort": 58890, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.1.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "env": [ { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" + }, { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "ADD_PROXY_ROUTE" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/sys-mgmt-agent" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-sys-mgmt-agent" - } - }, - "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": [ + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, { - "configMapRef": { - "name": "common-variable-jakarta" - } - } - ], - "env": [ + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "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" } ], "resources": {}, @@ -3934,43 +3934,51 @@ { "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-bootstrapper" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59860", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59860, + "targetPort": 59860 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-support-notifications" } }, "spec": { @@ -3982,41 +3990,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.1.1", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.1.1", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-jakarta" + "name": "common-variables" } } ], "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-support-notifications" } ], "resources": {}, @@ -4027,13 +4027,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-support-notifications" } }, "strategy": {} @@ -4046,7 +4046,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-levski", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -4087,226 +4087,192 @@ ], "components": [ { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-58890", + "name": "tcp-5432", "protocol": "TCP", - "port": 58890, - "targetPort": 58890 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "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/sys-mgmt-agent", - "type": "DirectoryOrCreate" - } + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.3.0", + "name": "edgex-kong-db", + "image": "postgres:13.8-alpine", "ports": [ { - "name": "tcp-58890", - "containerPort": 58890, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "POSTGRES_USER", + "value": "kong" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" + "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/sys-mgmt-agent" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-kong-db" } }, "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:2.3.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" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-ui-go" - } - ], - "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": { - "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-variable-levski" - } - } - ], - "env": [ - { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-support-notifications" } ], "resources": {}, @@ -4317,50 +4283,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-app-rules-engine", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "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": { @@ -4372,42 +4332,45 @@ { "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:2.3.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.3.1", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-data" + "value": "edgex-app-rules-engine" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" } ], "resources": {}, @@ -4418,99 +4381,76 @@ }, { "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-support-notifications", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-4000", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-ui-go" } }, "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.3.0", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:2.3.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-ui-go" } ], "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" - }, - { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-ui-go" } }, "strategy": {} @@ -4572,11 +4512,15 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-core-command" + }, { "name": "MESSAGEQUEUE_EXTERNAL_URL", "value": "tcp://edgex-mqtt-broker:1883" @@ -4584,10 +4528,6 @@ { "name": "MESSAGEQUEUE_INTERNAL_HOST", "value": "edgex-redis" - }, - { - "name": "SERVICE_HOST", - "value": "edgex-core-command" } ], "resources": {}, @@ -4611,41 +4551,41 @@ } }, { - "name": "edgex-core-consul", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-6379", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-redis" } }, "spec": { "volumes": [ { - "name": "consul-config", + "name": "tmpfs-volume1", "emptyDir": {} }, { - "name": "consul-data", + "name": "db-data", "emptyDir": {} }, { @@ -4653,118 +4593,90 @@ "emptyDir": {} }, { - "name": "consul-acl-token", + "name": "redis-config", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-consul", + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.13.2", + "name": "edgex-redis", + "image": "redis:7.0.5-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "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": "ADD_REGISTRY_ACL_ROLES" - }, - { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", - "service": { - "ports": [ - { - "name": "tcp-59900", - "protocol": "TCP", - "port": 59900, - "targetPort": 59900 - } - ], - "selector": { - "app": "edgex-device-virtual" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -4773,36 +4685,72 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:2.3.0", - "ports": [ - { - "name": "tcp-59900", - "containerPort": 59900, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.3.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "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", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ADD_PROXY_ROUTE" } ], "resources": {}, @@ -4811,258 +4759,279 @@ "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/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-virtual" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59861", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "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/support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.5-alpine", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.3.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "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/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-support-scheduler" } }, "strategy": {} } }, { - "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": {} + }, { "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/edgex-consul", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.3.1", + "name": "edgex-core-consul", + "image": "consul:1.13.2", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "ADD_REGISTRY_ACL_ROLES" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "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" } ], "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/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-kuiper", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59720", + "name": "tcp-5563", "protocol": "TCP", - "port": 59720, - "targetPort": 59720 + "port": 5563, + "targetPort": 5563 + }, + { + "name": "tcp-59880", + "protocol": "TCP", + "port": 59880, + "targetPort": 59880 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "spec": { @@ -5072,80 +5041,44 @@ "emptyDir": {} }, { - "name": "kuiper-data", - "emptyDir": {} - }, + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-data", + "type": "DirectoryOrCreate" + } + } + ], + "containers": [ { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - } - ], - "containers": [ - { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.7.1-alpine", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:2.3.0", "ports": [ { - "name": "tcp-59720", - "containerPort": 59720, + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" + }, + { + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", - "value": "redis" - }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", - "value": "6379" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" }, { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" + "name": "SERVICE_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -5155,53 +5088,45 @@ "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": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59900", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "spec": { @@ -5213,41 +5138,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", + "path": "/tmp/edgex/secrets/device-virtual", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.3.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.3.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -5258,90 +5175,151 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrapper", + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:2.3.0", + "name": "edgex-vault", + "image": "vault:1.11.4", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_USER", - "value": "2002" + "name": "VAULT_UI", + "value": "true" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" } ], "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-security-bootstrapper" + "hostname": "edgex-vault" } }, "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": { @@ -5350,243 +5328,210 @@ "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.3.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.3.0", + "ports": [ + { + "name": "tcp-59986", + "containerPort": 59986, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "KONGURL_SERVER", - "value": "edgex-kong" - }, + "name": "SERVICE_HOST", + "value": "edgex-device-rest" + } + ], + "resources": {}, + "volumeMounts": [ { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "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": "edgex-init", + "mountPath": "/edgex-init" }, { "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-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": "vault:1.11.4", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.7.1-alpine", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59720", + "containerPort": 59720, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" }, { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "VAULT_UI", - "value": "true" + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", + "value": "redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" + }, + { + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, + { + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" + }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" } ], "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": "vault-logs", - "mountPath": "/vault/logs" + "name": "kuiper-connections", + "mountPath": "/kuiper/etc/connections" + }, + { + "name": "kuiper-sources", + "mountPath": "/kuiper/etc/sources" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-kuiper" } }, "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": { @@ -5606,99 +5551,57 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } }, { - "name": "postgres-config", + "name": "kong", "emptyDir": {} }, { - "name": "kong", + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", "emptyDir": {} } ], "containers": [ { - "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" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:2.3.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" - }, - { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" - }, - { - "name": "KONG_NGINX_WORKER_PROCESSES", - "value": "1" - }, - { - "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_DATABASE", - "value": "postgres" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" }, { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, @@ -5709,7 +5612,7 @@ }, { "name": "tmpfs-volume2", - "mountPath": "/tmp" + "mountPath": "/vault" }, { "name": "edgex-init", @@ -5717,174 +5620,154 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kong", + "mountPath": "/tmp/kong" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "kuiper-sources", + "mountPath": "/tmp/kuiper" + }, + { + "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-kong-db", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-59881", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-core-metadata" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", - "emptyDir": {} - }, - { - "name": "postgres-data", - "emptyDir": {} + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:13.8-alpine", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.3.0", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" - }, - { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" - }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" - }, - { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-security-secretstore-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-secretstore-setup" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -5892,133 +5775,113 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", + "path": "/tmp/edgex/secrets/sys-mgmt-agent", "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-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.3.0", + "ports": [ + { + "name": "tcp-58890", + "containerPort": 58890, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" - }, - { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "METRICSMECHANISM", + "value": "executor" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "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/sys-mgmt-agent" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-sys-mgmt-agent" } }, "strategy": {} } }, { - "name": "edgex-core-metadata", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-59881", + "name": "tcp-8000", "protocol": "TCP", - "port": 59881, - "targetPort": 59881 + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", + "protocol": "TCP", + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-metadata" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-metadata" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-metadata" + "app": "edgex-kong" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -6026,54 +5889,191 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.3.0", + "name": "edgex-kong", + "image": "kong:2.8.1", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "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-variable-levski" + "name": "common-variables" } } ], "env": [ { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "KONG_SSL_CIPHER_SUITE", + "value": "modern" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - } - ], - "resources": {}, - "volumeMounts": [ + "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": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-kong" + } + }, + "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.3.0", + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_USER", + "value": "2002" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "edgex-init", + "mountPath": "/edgex-init" + } + ], + "imagePullPolicy": "IfNotPresent" + } + ], + "hostname": "edgex-security-bootstrapper" } }, "strategy": {} @@ -6086,7 +6086,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-minnesota", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -6110,190 +6110,118 @@ ], "components": [ { - "name": "edgex-security-secretstore-setup", + "name": "edgex-kuiper", + "service": { + "ports": [ + { + "name": "tcp-59720", + "protocol": "TCP", + "port": 59720, + "targetPort": 59720 + } + ], + "selector": { + "app": "edgex-kuiper" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-kuiper" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", + "name": "edgex-init", "emptyDir": {} }, { - "name": "tmpfs-volume2", + "name": "kuiper-data", "emptyDir": {} }, { - "name": "edgex-init", + "name": "kuiper-connections", "emptyDir": {} }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, { "name": "kuiper-sources", "emptyDir": {} }, { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "vault-config", + "name": "kuiper-log", "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-secretstore-setup", - "image": "edgexfoundry/security-secretstore-setup:3.0.0", + "name": "edgex-kuiper", + "image": "lfedge/ekuiper:1.9.2-alpine", + "ports": [ + { + "name": "tcp-59720", + "containerPort": 59720, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "SECUREMESSAGEBUS_TYPE", + "name": "CONNECTION__EDGEX__REDISMSGBUS__TYPE", "value": "redis" }, { - "name": "EDGEX_ADD_SECRETSTORE_TOKENS" - }, - { - "name": "EDGEX_ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" - }, - { - "name": "EDGEX_USER", - "value": "2002" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PORT", + "value": "6379" }, { - "name": "EDGEX_GROUP", - "value": "2001" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" + "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", + "value": "edgex-redis" }, { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" }, { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "edgex/rules-events" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" }, { - "name": "kuiper-sources", - "mountPath": "/tmp/kuiper" + "name": "EDGEX__DEFAULT__PORT", + "value": "6379" }, { - "name": "kuiper-connections", - "mountPath": "/tmp/kuiper-connections" + "name": "CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL", + "value": "redis" }, { - "name": "vault-config", - "mountPath": "/vault/config" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-security-secretstore-setup" - } - }, - "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": { - "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:3.0.0", - "ports": [ - { - "name": "tcp-59880", - "containerPort": 59880, - "protocol": "TCP" - } - ], - "envFrom": [ + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, { - "configMapRef": { - "name": "common-variable-minnesota" - } - } - ], - "env": [ + "name": "EDGEX__DEFAULT__TYPE", + "value": "redis" + }, { - "name": "SERVICE_HOST", - "value": "edgex-core-data" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "redis" } ], "resources": {}, @@ -6303,45 +6231,57 @@ "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "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-data" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-proxy-auth", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59842", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59842, + "targetPort": 59842 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-proxy-auth" } }, "spec": { @@ -6353,41 +6293,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", + "path": "/tmp/edgex/secrets/security-proxy-auth", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:3.0.0", + "name": "edgex-proxy-auth", + "image": "edgexfoundry/security-proxy-auth:3.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59842", + "containerPort": 59842, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "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-proxy-auth" } ], "resources": {}, @@ -6398,177 +6330,173 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/security-proxy-auth" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-proxy-auth" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-core-consul", + "service": { + "ports": [ + { + "name": "tcp-8500", + "protocol": "TCP", + "port": 8500, + "targetPort": 8500 + } + ], + "selector": { + "app": "edgex-core-consul" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-consul" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-core-consul" } }, "spec": { "volumes": [ { - "name": "edgex-init", + "name": "consul-config", "emptyDir": {} }, { - "name": "vault-config", + "name": "consul-data", "emptyDir": {} }, { - "name": "nginx-templates", + "name": "edgex-init", "emptyDir": {} }, { - "name": "nginx-tls", + "name": "consul-acl-token", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/edgex-consul", "type": "DirectoryOrCreate" } - }, - { - "name": "consul-acl-token", - "emptyDir": {} } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:3.0.0", + "name": "edgex-core-consul", + "image": "hashicorp/consul:1.15.2", + "ports": [ + { + "name": "tcp-8500", + "containerPort": 8500, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" }, { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" + "name": "EDGEX_ADD_REGISTRY_ACL_ROLES" }, { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" }, { - "name": "EDGEX_ADD_PROXY_ROUTE" + "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" } ], "resources": {}, "volumeMounts": [ { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "consul-config", + "mountPath": "/consul/config" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "consul-data", + "mountPath": "/consul/data" }, { - "name": "nginx-templates", - "mountPath": "/etc/nginx/templates" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" }, { "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/edgex-consul" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-device-rest", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-59986", + "name": "tcp-59880", "protocol": "TCP", - "port": 59986, - "targetPort": 59986 + "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": { @@ -6580,33 +6508,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", + "path": "/tmp/edgex/secrets/core-data", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:3.0.0", + "name": "edgex-core-data", + "image": "edgexfoundry/core-data:3.0.0", "ports": [ { - "name": "tcp-59986", - "containerPort": 59986, + "name": "tcp-59880", + "containerPort": 59880, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-core-data" } ], "resources": {}, @@ -6617,131 +6545,59 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-kuiper", - "service": { - "ports": [ - { - "name": "tcp-59720", - "protocol": "TCP", - "port": 59720, - "targetPort": 59720 - } - ], - "selector": { - "app": "edgex-kuiper" - } - }, + "name": "edgex-security-bootstrapper", "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-security-bootstrapper" } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-kuiper" - } - }, - "spec": { - "volumes": [ - { - "name": "edgex-init", - "emptyDir": {} - }, - { - "name": "kuiper-data", - "emptyDir": {} - }, - { - "name": "kuiper-connections", - "emptyDir": {} - }, - { - "name": "kuiper-sources", - "emptyDir": {} - }, + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-security-bootstrapper" + } + }, + "spec": { + "volumes": [ { - "name": "kuiper-log", + "name": "edgex-init", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kuiper", - "image": "lfedge/ekuiper:1.9.2-alpine", - "ports": [ - { - "name": "tcp-59720", - "containerPort": 59720, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrapper", + "image": "edgexfoundry/security-bootstrapper:3.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX__DEFAULT__TYPE", - "value": "redis" - }, - { - "name": "EDGEX__DEFAULT__PORT", - "value": "6379" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" - }, - { - "name": "CONNECTION__EDGEX__REDISMSGBUS__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "edgex/rules-events" - }, - { - "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_USER", + "value": "2002" }, { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "redis" + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, @@ -6749,358 +6605,305 @@ { "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": "kuiper-log", - "mountPath": "/kuiper/log" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kuiper" + "hostname": "edgex-security-bootstrapper" } }, "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:3.0.0", "ports": [ { - "name": "tcp-4000", - "containerPort": 4000, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "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-vault", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-59861", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-support-scheduler" } }, "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/support-scheduler", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "hashicorp/vault:1.13.2", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:3.0.0", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "VAULT_UI", - "value": "true" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" } ], "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/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "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" - } - }, + "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": "hashicorp/consul:1.15.2", - "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": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/mgmt_token.json" + "name": "ALL_SERVICES_MESSAGEBUS_HOST", + "value": "edgex-redis" }, { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "ALL_SERVICES_DATABASE_HOST", + "value": "edgex-redis" }, - { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + { + "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": "EDGEX_ADD_REGISTRY_ACL_ROLES" + "name": "ALL_SERVICES_REGISTRY_HOST", + "value": "edgex-core-consul" } ], "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-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": { @@ -7112,33 +6915,37 @@ { "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:3.0.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:3.0.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-app-rules-engine" } ], "resources": {}, @@ -7149,31 +6956,44 @@ }, { "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-security-bootstrapper", + "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-bootstrapper" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrapper" + "app": "edgex-core-metadata" } }, "spec": { @@ -7181,27 +7001,37 @@ { "name": "edgex-init", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/core-metadata", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-security-bootstrapper", - "image": "edgexfoundry/security-bootstrapper:3.0.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:3.0.0", + "ports": [ + { + "name": "tcp-59881", + "containerPort": 59881, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_GROUP", - "value": "2001" - }, - { - "name": "EDGEX_USER", - "value": "2002" + "name": "SERVICE_HOST", + "value": "edgex-core-metadata" } ], "resources": {}, @@ -7209,246 +7039,217 @@ { "name": "edgex-init", "mountPath": "/edgex-init" + }, + { + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-proxy-auth", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-59842", + "name": "tcp-8200", "protocol": "TCP", - "port": 59842, - "targetPort": 59842 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-proxy-auth" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy-auth" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy-auth" + "app": "edgex-vault" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-auth", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-proxy-auth", - "image": "edgexfoundry/security-proxy-auth:3.0.0", + "name": "edgex-vault", + "image": "hashicorp/vault:1.13.2", "ports": [ { - "name": "tcp-59842", - "containerPort": 59842, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-proxy-auth" + "name": "VAULT_UI", + "value": "true" + }, + { + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" + }, + { + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/vault/config" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-auth" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy-auth" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "name": "edgex-nginx", + "name": "edgex-ui-go", "service": { "ports": [ { - "name": "tcp-8443", + "name": "tcp-4000", "protocol": "TCP", - "port": 8443, - "targetPort": 8443 + "port": 4000, + "targetPort": 4000 } ], "selector": { - "app": "edgex-nginx" + "app": "edgex-ui-go" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-nginx" + "app": "edgex-ui-go" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-nginx" + "app": "edgex-ui-go" } }, "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", + "name": "edgex-ui-go", + "image": "edgexfoundry/edgex-ui:3.0.0", "ports": [ { - "name": "tcp-8443", - "containerPort": 8443, + "name": "tcp-4000", + "containerPort": 4000, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], - "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": "nginx-templates", - "mountPath": "/etc/nginx/templates" - }, - { - "name": "nginx-tls", - "mountPath": "/etc/ssl/nginx" + "env": [ + { + "name": "SERVICE_HOST", + "value": "edgex-ui-go" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-nginx" + "hostname": "edgex-ui-go" } }, "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": { @@ -7460,33 +7261,33 @@ { "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:3.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -7497,44 +7298,44 @@ }, { "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-app-rules-engine", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59882", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "spec": { @@ -7546,37 +7347,37 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/core-command", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:3.0.0", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:3.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" + "name": "EXTERNALMQTT_URL", + "value": "tcp://edgex-mqtt-broker:1883" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "SERVICE_HOST", + "value": "edgex-core-command" } ], "resources": {}, @@ -7587,130 +7388,160 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-core-common-config-bootstrapper", + "name": "edgex-nginx", + "service": { + "ports": [ + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "app": "edgex-nginx" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-nginx" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-common-config-bootstrapper" + "app": "edgex-nginx" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, + { + "name": "tmpfs-volume4", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-common-config-bootstrapper", - "type": "DirectoryOrCreate" - } + "name": "nginx-templates", + "emptyDir": {} + }, + { + "name": "nginx-tls", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-common-config-bootstrapper", - "image": "edgexfoundry/core-common-config-bootstrapper:3.0.0", + "name": "edgex-nginx", + "image": "nginx:1.24.0-alpine-slim", + "ports": [ + { + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "APP_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "tmpfs-volume1", + "mountPath": "/etc/nginx/conf.d" }, { - "name": "ALL_SERVICES_MESSAGEBUS_HOST", - "value": "edgex-redis" + "name": "tmpfs-volume2", + "mountPath": "/var/cache/nginx" }, { - "name": "ALL_SERVICES_DATABASE_HOST", - "value": "edgex-redis" + "name": "tmpfs-volume3", + "mountPath": "/var/log/nginx" }, { - "name": "DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST", - "value": "edgex-core-metadata" + "name": "tmpfs-volume4", + "mountPath": "/var/run" }, - { - "name": "ALL_SERVICES_REGISTRY_HOST", - "value": "edgex-core-consul" - } - ], - "resources": {}, - "volumeMounts": [ { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-common-config-bootstrapper" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" + }, + { + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-common-config-bootstrapper" + "hostname": "edgex-nginx" } }, "strategy": {} } }, { - "name": "edgex-core-command", - "service": { - "ports": [ - { - "name": "tcp-59882", - "protocol": "TCP", - "port": 59882, - "targetPort": 59882 - } - ], - "selector": { - "app": "edgex-core-command" - } - }, + "name": "edgex-security-secretstore-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-security-secretstore-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-security-secretstore-setup" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} @@ -7718,199 +7549,254 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } + }, + { + "name": "kuiper-sources", + "emptyDir": {} + }, + { + "name": "kuiper-connections", + "emptyDir": {} + }, + { + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:3.0.0", - "ports": [ - { - "name": "tcp-59882", - "containerPort": 59882, - "protocol": "TCP" - } - ], + "name": "edgex-security-secretstore-setup", + "image": "edgexfoundry/security-secretstore-setup:3.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "EXTERNALMQTT_URL", - "value": "tcp://edgex-mqtt-broker:1883" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "name": "EDGEX_ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual]" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "EDGEX_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/core-command" + "name": "anonymous-volume1", + "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-command" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-redis", - "service": { - "ports": [ - { - "name": "tcp-6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "app": "edgex-redis" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-security-proxy-setup" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", + "name": "edgex-init", "emptyDir": {} }, { - "name": "db-data", + "name": "vault-config", "emptyDir": {} }, { - "name": "edgex-init", + "name": "nginx-templates", "emptyDir": {} }, { - "name": "redis-config", + "name": "nginx-tls", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "consul-acl-token", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:7.0.11-alpine", - "ports": [ - { - "name": "tcp-6379", - "containerPort": 6379, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:3.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" }, { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" + "name": "ROUTES_CORE_METADATA_HOST", + "value": "edgex-core-metadata" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_CORE_COMMAND_HOST", + "value": "edgex-core-command" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" + }, + { + "name": "EDGEX_ADD_PROXY_ROUTE" + }, + { + "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_CORE_CONSUL_HOST", + "value": "edgex-core-consul" } ], "resources": {}, "volumeMounts": [ { - "name": "tmpfs-volume1", - "mountPath": "/run" + "name": "edgex-init", + "mountPath": "/edgex-init" }, { - "name": "db-data", - "mountPath": "/data" + "name": "vault-config", + "mountPath": "/vault/config" }, { - "name": "edgex-init", - "mountPath": "/edgex-init" + "name": "nginx-templates", + "mountPath": "/etc/nginx/templates" }, { - "name": "redis-config", - "mountPath": "/run/redis/conf" + "name": "nginx-tls", + "mountPath": "/etc/ssl/nginx" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "name": "edgex-device-virtual", + "name": "edgex-device-rest", "service": { "ports": [ { - "name": "tcp-59900", + "name": "tcp-59986", "protocol": "TCP", - "port": 59900, - "targetPort": 59900 + "port": 59986, + "targetPort": 59986 } ], "selector": { - "app": "edgex-device-virtual" + "app": "edgex-device-rest" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-virtual" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-virtual" + "app": "edgex-device-rest" } }, "spec": { @@ -7922,33 +7808,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-virtual", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-virtual", - "image": "edgexfoundry/device-virtual:3.0.0", + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:3.0.0", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-59986", + "containerPort": 59986, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-minnesota" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "value": "edgex-device-rest" } ], "resources": {}, @@ -7959,147 +7845,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-virtual" - } - ], - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-device-virtual" - } - }, - "strategy": {} - } - } - ] - }, - { - "versionName": "ireland", - "configMaps": [ - { - "metadata": { - "name": "common-variable-ireland", - "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-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.0.0", - "envFrom": [ - { - "configMapRef": { - "name": "common-variable-ireland" - } - } - ], - "env": [ - { - "name": "EDGEX_USER", - "value": "2002" - }, - { - "name": "EDGEX_GROUP", - "value": "2001" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "edgex-init", - "mountPath": "/edgex-init" + "mountPath": "/tmp/edgex/secrets/device-rest" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrapper" + "hostname": "edgex-device-rest" } }, "strategy": {} } }, { - "name": "edgex-vault", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-6379", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-redis" } }, "spec": { @@ -8109,104 +7892,155 @@ "emptyDir": {} }, { - "name": "edgex-init", + "name": "db-data", "emptyDir": {} }, { - "name": "vault-file", + "name": "edgex-init", "emptyDir": {} }, { - "name": "vault-logs", + "name": "redis-config", "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.7.2", + "name": "edgex-redis", + "image": "redis:7.0.11-alpine", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "VAULT_ADDR", - "value": "http://edgex-vault:8200" - }, - { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "VAULT_UI", - "value": "true" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/vault/config" + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "vault-file", - "mountPath": "/vault/file" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-redis" } }, "strategy": {} } - }, + } + ] + }, + { + "versionName": "ireland", + "configMaps": [ { - "name": "edgex-core-command", + "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-app-rules-engine", "service": { "ports": [ { - "name": "tcp-59882", + "name": "tcp-59701", "protocol": "TCP", - "port": 59882, - "targetPort": 59882 + "port": 59701, + "targetPort": 59701 } ], "selector": { - "app": "edgex-core-command" + "app": "edgex-app-rules-engine" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-command" + "app": "edgex-app-rules-engine" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-command" + "app": "edgex-app-rules-engine" } }, "spec": { @@ -8218,33 +8052,45 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-command", + "path": "/tmp/edgex/secrets/app-rules-engine", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-command", - "image": "edgexfoundry/core-command:2.0.0", + "name": "edgex-app-rules-engine", + "image": "edgexfoundry/app-service-configurable:2.0.1", "ports": [ { - "name": "tcp-59882", - "containerPort": 59882, + "name": "tcp-59701", + "containerPort": 59701, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ + { + "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-redis" + }, + { + "name": "EDGEX_PROFILE", + "value": "rules-engine" + }, { "name": "SERVICE_HOST", - "value": "edgex-core-command" + "value": "edgex-app-rules-engine" } ], "resources": {}, @@ -8255,44 +8101,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-command" + "mountPath": "/tmp/edgex/secrets/app-rules-engine" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-command" + "hostname": "edgex-app-rules-engine" } }, "strategy": {} } }, { - "name": "edgex-app-rules-engine", + "name": "edgex-core-command", "service": { "ports": [ { - "name": "tcp-59701", + "name": "tcp-59882", "protocol": "TCP", - "port": 59701, - "targetPort": 59701 + "port": 59882, + "targetPort": 59882 } ], "selector": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-rules-engine" + "app": "edgex-core-command" } }, "spec": { @@ -8304,45 +8150,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/app-rules-engine", + "path": "/tmp/edgex/secrets/core-command", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-app-rules-engine", - "image": "edgexfoundry/app-service-configurable:2.0.1", + "name": "edgex-core-command", + "image": "edgexfoundry/core-command:2.0.0", "ports": [ { - "name": "tcp-59701", - "containerPort": 59701, + "name": "tcp-59882", + "containerPort": 59882, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ - { - "name": "EDGEX_PROFILE", - "value": "rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST", - "value": "edgex-redis" - }, { "name": "SERVICE_HOST", - "value": "edgex-app-rules-engine" - }, - { - "name": "TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-redis" + "value": "edgex-core-command" } ], "resources": {}, @@ -8353,44 +8187,31 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/app-rules-engine" + "mountPath": "/tmp/edgex/secrets/core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-rules-engine" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "edgex-device-rest", - "service": { - "ports": [ - { - "name": "tcp-59986", - "protocol": "TCP", - "port": 59986, - "targetPort": 59986 - } - ], - "selector": { - "app": "edgex-device-rest" - } - }, + "name": "edgex-security-proxy-setup", "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-security-proxy-setup" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-security-proxy-setup" } }, "spec": { @@ -8399,36 +8220,72 @@ "name": "edgex-init", "emptyDir": {} }, + { + "name": "consul-acl-token", + "emptyDir": {} + }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/device-rest", + "path": "/tmp/edgex/secrets/security-proxy-setup", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/device-rest:2.0.0", - "ports": [ - { - "name": "tcp-59986", - "containerPort": 59986, - "protocol": "TCP" - } - ], + "name": "edgex-security-proxy-setup", + "image": "edgexfoundry/security-proxy-setup:2.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "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": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", + "value": "edgex-support-notifications" + }, + { + "name": "ROUTES_SYS_MGMT_AGENT_HOST", + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "ROUTES_RULES_ENGINE_HOST", + "value": "edgex-kuiper" + }, + { + "name": "ROUTES_DEVICE_VIRTUAL_HOST", + "value": "device-virtual" + }, + { + "name": "ROUTES_SUPPORT_SCHEDULER_HOST", + "value": "edgex-support-scheduler" + }, + { + "name": "ROUTES_CORE_DATA_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -8437,101 +8294,144 @@ "name": "edgex-init", "mountPath": "/edgex-init" }, + { + "name": "consul-acl-token", + "mountPath": "/tmp/edgex/secrets/consul-acl-token" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/device-rest" + "mountPath": "/tmp/edgex/secrets/security-proxy-setup" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-security-proxy-setup" } }, "strategy": {} } }, { - "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.0.0", + "name": "edgex-core-consul", + "image": "consul:1.9.5", "ports": [ { - "name": "tcp-59900", - "containerPort": 59900, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-device-virtual" + "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", + "value": "/consul/config/consul_acl_done" + }, + { + "name": "EDGEX_GROUP", + "value": "2001" + }, + { + "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", + "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + }, + { + "name": "EDGEX_USER", + "value": "2002" + }, + { + "name": "ADD_REGISTRY_ACL_ROLES" } ], "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": {} @@ -8594,38 +8494,38 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-redis" - }, { "name": "EDGEX__DEFAULT__PORT", "value": "6379" }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "rules-events" - }, { "name": "EDGEX__DEFAULT__PROTOCOL", "value": "redis" }, - { - "name": "KUIPER__BASIC__RESTPORT", - "value": "59720" - }, { "name": "EDGEX__DEFAULT__TYPE", "value": "redis" }, + { + "name": "EDGEX__DEFAULT__TOPIC", + "value": "rules-events" + }, { "name": "KUIPER__BASIC__CONSOLELOG", "value": "true" + }, + { + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-redis" + }, + { + "name": "KUIPER__BASIC__RESTPORT", + "value": "59720" } ], "resources": {}, @@ -8653,30 +8553,35 @@ } }, { - "name": "edgex-security-secretstore-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-secretstore-setup" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-secretstore-setup" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} @@ -8684,121 +8589,190 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets", + "path": "/tmp/edgex/secrets/sys-mgmt-agent", "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-sys-mgmt-agent", + "image": "edgexfoundry/sys-mgmt-agent:2.0.0", + "ports": [ + { + "name": "tcp-58890", + "containerPort": 58890, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "ADD_KNOWN_SECRETS", - "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "SERVICE_HOST", + "value": "edgex-sys-mgmt-agent" + } + ], + "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-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.0.0", + "ports": [ + { + "name": "tcp-5563", + "containerPort": 5563, + "protocol": "TCP" }, { - "name": "EDGEX_GROUP", - "value": "2001" - }, + "name": "tcp-59880", + "containerPort": 59880, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "common-variables" + } + } + ], + "env": [ { - "name": "ADD_SECRETSTORE_TOKENS" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/core-data/secrets-token.json" }, { - "name": "SECUREMESSAGEBUS_TYPE", - "value": "redis" + "name": "SERVICE_HOST", + "value": "edgex-core-data" } ], "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" + "mountPath": "/tmp/edgex/secrets/core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-secretstore-setup" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-kong-db", + "name": "edgex-vault", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-8200", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 8200, + "targetPort": 8200 } ], "selector": { - "app": "edgex-kong-db" + "app": "edgex-vault" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kong-db" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kong-db" + "app": "edgex-vault" } }, "spec": { @@ -8807,347 +8781,408 @@ "name": "tmpfs-volume1", "emptyDir": {} }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "tmpfs-volume3", - "emptyDir": {} - }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "postgres-config", + "name": "vault-file", "emptyDir": {} }, { - "name": "postgres-data", + "name": "vault-logs", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong-db", - "image": "postgres:12.3-alpine", + "name": "edgex-vault", + "image": "vault:1.7.2", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-8200", + "containerPort": 8200, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" + "name": "VAULT_UI", + "value": "true" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "POSTGRES_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" + "name": "VAULT_ADDR", + "value": "http://edgex-vault:8200" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/var/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume3", - "mountPath": "/run" + "mountPath": "/vault/config" }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "vault-file", + "mountPath": "/vault/file" }, { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong-db" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "name": "edgex-core-consul", + "name": "edgex-kong", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-8000", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8100", + "protocol": "TCP", + "port": 8100, + "targetPort": 8100 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 } ], "selector": { - "app": "edgex-core-consul" + "app": "edgex-kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "edgex-kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "edgex-kong" } }, "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/security-proxy-setup", "type": "DirectoryOrCreate" } + }, + { + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "consul:1.9.5", + "name": "edgex-kong", + "image": "kong:2.4.1-alpine", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "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-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH", - "value": "/consul/config/consul_acl_done" + "name": "KONG_PG_HOST", + "value": "edgex-kong-db" }, { - "name": "ADD_REGISTRY_ACL_ROLES" + "name": "KONG_DNS_ORDER", + "value": "LAST,A,CNAME" }, { - "name": "STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH", - "value": "/tmp/edgex/secrets/consul-acl-token/bootstrap_token.json" + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "EDGEX_USER", - "value": "2002" + "name": "KONG_DNS_VALID_TTL", + "value": "1" }, { - "name": "EDGEX_GROUP", - "value": "2001" + "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": "KONG_STATUS_LISTEN", + "value": "0.0.0.0:8100" + }, + { + "name": "KONG_ADMIN_LISTEN", + "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" } ], "resources": {}, "volumeMounts": [ { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { "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" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "edgex-kong" } }, "strategy": {} } }, { - "name": "edgex-core-data", + "name": "edgex-kong-db", "service": { "ports": [ { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-59880", + "name": "tcp-5432", "protocol": "TCP", - "port": 59880, - "targetPort": 59880 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "app": "edgex-core-data" + "app": "edgex-kong-db" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-kong-db" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "tmpfs-volume3", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/core-data", - "type": "DirectoryOrCreate" - } + "name": "postgres-config", + "emptyDir": {} + }, + { + "name": "postgres-data", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/core-data:2.0.0", + "name": "edgex-kong-db", + "image": "postgres:12.3-alpine", "ports": [ { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-59880", - "containerPort": 59880, + "name": "tcp-5432", + "containerPort": 5432, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-data" + "name": "POSTGRES_DB", + "value": "kong" }, { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/core-data/secrets-token.json" + "name": "POSTGRES_PASSWORD_FILE", + "value": "/tmp/postgres-config/.pgpassword" + }, + { + "name": "POSTGRES_USER", + "value": "kong" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/var/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" + }, + { + "name": "tmpfs-volume3", + "mountPath": "/run" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-data" + "name": "postgres-config", + "mountPath": "/tmp/postgres-config" + }, + { + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-kong-db" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-59860", + "name": "tcp-59881", "protocol": "TCP", - "port": 59860, - "targetPort": 59860 + "port": 59881, + "targetPort": 59881 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "spec": { @@ -9159,33 +9194,37 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-notifications", + "path": "/tmp/edgex/secrets/core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/support-notifications:2.0.0", + "name": "edgex-core-metadata", + "image": "edgexfoundry/core-metadata:2.0.0", "ports": [ { - "name": "tcp-59860", - "containerPort": 59860, + "name": "tcp-59881", + "containerPort": 59881, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" + }, { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-metadata" } ], "resources": {}, @@ -9196,283 +9235,239 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-notifications" + "mountPath": "/tmp/edgex/secrets/core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "edgex-security-proxy-setup", + "name": "edgex-redis", + "service": { + "ports": [ + { + "name": "tcp-6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "app": "edgex-redis" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-proxy-setup" + "app": "edgex-redis" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "db-data", + "emptyDir": {} + }, { "name": "edgex-init", "emptyDir": {} }, { - "name": "consul-acl-token", + "name": "redis-config", "emptyDir": {} }, { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets/security-bootstrapper-redis", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-proxy-setup", - "image": "edgexfoundry/security-proxy-setup:2.0.0", + "name": "edgex-redis", + "image": "redis:6.2.4-alpine", + "ports": [ + { + "name": "tcp-6379", + "containerPort": 6379, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "ROUTES_CORE_CONSUL_HOST", - "value": "edgex-core-consul" - }, - { - "name": "ROUTES_RULES_ENGINE_HOST", - "value": "edgex-kuiper" - }, - { - "name": "ROUTES_DEVICE_VIRTUAL_HOST", - "value": "device-virtual" - }, - { - "name": "ROUTES_CORE_METADATA_HOST", - "value": "edgex-core-metadata" - }, - { - "name": "ROUTES_SUPPORT_SCHEDULER_HOST", - "value": "edgex-support-scheduler" - }, - { - "name": "ADD_PROXY_ROUTE" - }, - { - "name": "ROUTES_SUPPORT_NOTIFICATIONS_HOST", - "value": "edgex-support-notifications" - }, - { - "name": "ROUTES_CORE_DATA_HOST", - "value": "edgex-core-data" - }, - { - "name": "ROUTES_SYS_MGMT_AGENT_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "ROUTES_CORE_COMMAND_HOST", - "value": "edgex-core-command" + "name": "DATABASECONFIG_PATH", + "value": "/run/redis/conf" }, { - "name": "KONGURL_SERVER", - "value": "edgex-kong" + "name": "DATABASECONFIG_NAME", + "value": "redis.conf" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "db-data", + "mountPath": "/data" + }, { "name": "edgex-init", "mountPath": "/edgex-init" }, { - "name": "consul-acl-token", - "mountPath": "/tmp/edgex/secrets/consul-acl-token" + "name": "redis-config", + "mountPath": "/run/redis/conf" }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets/security-bootstrapper-redis" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-proxy-setup" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-redis", + "name": "edgex-support-scheduler", "service": { "ports": [ { - "name": "tcp-6379", + "name": "tcp-59861", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 59861, + "targetPort": 59861 } ], "selector": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "edgex-support-scheduler" } }, "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/support-scheduler", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.2.4-alpine", + "name": "edgex-support-scheduler", + "image": "edgexfoundry/support-scheduler:2.0.0", "ports": [ { - "name": "tcp-6379", - "containerPort": 6379, + "name": "tcp-59861", + "containerPort": 59861, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "DATABASECONFIG_PATH", - "value": "/run/redis/conf" - }, - { - "name": "DATABASECONFIG_NAME", - "value": "redis.conf" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" }, { - "name": "db-data", - "mountPath": "/data" + "name": "SERVICE_HOST", + "value": "edgex-support-scheduler" }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + } + ], + "resources": {}, + "volumeMounts": [ { "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/support-scheduler" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-redis" + "hostname": "edgex-support-scheduler" } }, "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": { @@ -9492,91 +9487,53 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/security-proxy-setup", + "path": "/tmp/edgex/secrets", "type": "DirectoryOrCreate" } }, { - "name": "postgres-config", + "name": "kong", "emptyDir": {} }, { - "name": "kong", + "name": "kuiper-config", + "emptyDir": {} + }, + { + "name": "vault-config", "emptyDir": {} } ], "containers": [ { - "name": "edgex-kong", - "image": "kong:2.4.1-alpine", - "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:2.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "KONG_DNS_ORDER", - "value": "LAST,A,CNAME" - }, - { - "name": "KONG_PG_PASSWORD_FILE", - "value": "/tmp/postgres-config/.pgpassword" - }, - { - "name": "KONG_ADMIN_LISTEN", - "value": "127.0.0.1:8001, 127.0.0.1:8444 ssl" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" - }, - { - "name": "KONG_STATUS_LISTEN", - "value": "0.0.0.0:8100" - }, - { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_DNS_VALID_TTL", - "value": "1" + "name": "ADD_SECRETSTORE_TOKENS" }, { - "name": "KONG_PG_HOST", - "value": "edgex-kong-db" + "name": "ADD_KNOWN_SECRETS", + "value": "redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual]" }, { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" + "name": "EDGEX_GROUP", + "value": "2001" }, { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "SECUREMESSAGEBUS_TYPE", + "value": "redis" }, { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" + "name": "EDGEX_USER", + "value": "2002" } ], "resources": {}, @@ -9587,7 +9544,7 @@ }, { "name": "tmpfs-volume2", - "mountPath": "/tmp" + "mountPath": "/vault" }, { "name": "edgex-init", @@ -9595,52 +9552,56 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/security-proxy-setup" + "mountPath": "/tmp/edgex/secrets" }, { - "name": "postgres-config", - "mountPath": "/tmp/postgres-config" + "name": "kong", + "mountPath": "/tmp/kong" }, { - "name": "kong", - "mountPath": "/usr/local/kong" + "name": "kuiper-config", + "mountPath": "/tmp/kuiper" + }, + { + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-kong" + "hostname": "edgex-security-secretstore-setup" } }, "strategy": {} } }, { - "name": "edgex-support-scheduler", + "name": "edgex-device-virtual", "service": { "ports": [ { - "name": "tcp-59861", + "name": "tcp-59900", "protocol": "TCP", - "port": 59861, - "targetPort": 59861 + "port": 59900, + "targetPort": 59900 } ], "selector": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-scheduler" + "app": "edgex-device-virtual" } }, "spec": { @@ -9652,41 +9613,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/support-scheduler", + "path": "/tmp/edgex/secrets/device-virtual", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-scheduler", - "image": "edgexfoundry/support-scheduler:2.0.0", + "name": "edgex-device-virtual", + "image": "edgexfoundry/device-virtual:2.0.0", "ports": [ { - "name": "tcp-59861", - "containerPort": 59861, + "name": "tcp-59900", + "containerPort": 59900, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", - "value": "edgex-support-scheduler" + "value": "edgex-device-virtual" } ], "resources": {}, @@ -9697,44 +9650,44 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/support-scheduler" + "mountPath": "/tmp/edgex/secrets/device-virtual" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-scheduler" + "hostname": "edgex-device-virtual" } }, "strategy": {} } }, { - "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": { @@ -9746,41 +9699,96 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/sys-mgmt-agent", + "path": "/tmp/edgex/secrets/device-rest", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/sys-mgmt-agent:2.0.0", - "ports": [ - { - "name": "tcp-58890", - "containerPort": 58890, - "protocol": "TCP" - } - ], + "name": "edgex-device-rest", + "image": "edgexfoundry/device-rest:2.0.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-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.0.0", "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, - { - "name": "METRICSMECHANISM", - "value": "executor" + "name": "EDGEX_USER", + "value": "2002" }, { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "EDGEX_GROUP", + "value": "2001" } ], "resources": {}, @@ -9788,47 +9796,43 @@ { "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-security-bootstrapper" } }, "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": { @@ -9840,37 +9844,33 @@ { "name": "anonymous-volume1", "hostPath": { - "path": "/tmp/edgex/secrets/core-metadata", + "path": "/tmp/edgex/secrets/support-notifications", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-core-metadata", - "image": "edgexfoundry/core-metadata:2.0.0", + "name": "edgex-support-notifications", + "image": "edgexfoundry/support-notifications:2.0.0", "ports": [ { - "name": "tcp-59881", - "containerPort": 59881, + "name": "tcp-59860", + "containerPort": 59860, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-ireland" + "name": "common-variables" } } ], "env": [ - { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" - }, { "name": "SERVICE_HOST", - "value": "edgex-core-metadata" + "value": "edgex-support-notifications" } ], "resources": {}, @@ -9881,13 +9881,13 @@ }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/core-metadata" + "mountPath": "/tmp/edgex/secrets/support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-metadata" + "hostname": "edgex-support-notifications" } }, "strategy": {} @@ -9900,7 +9900,7 @@ "configMaps": [ { "metadata": { - "name": "common-variable-hanoi", + "name": "common-variables", "creationTimestamp": null }, "data": { @@ -9925,305 +9925,257 @@ ], "components": [ { - "name": "edgex-kuiper", + "name": "edgex-core-data", "service": { "ports": [ { - "name": "tcp-20498", + "name": "tcp-5563", "protocol": "TCP", - "port": 20498, - "targetPort": 20498 + "port": 5563, + "targetPort": 5563 }, { - "name": "tcp-48075", + "name": "tcp-48080", "protocol": "TCP", - "port": 48075, - "targetPort": 48075 + "port": 48080, + "targetPort": 48080 } ], "selector": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-kuiper" + "app": "edgex-core-data" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-kuiper" + "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-kuiper", - "image": "emqx/kuiper:1.1.1-alpine", + "name": "edgex-core-data", + "image": "edgexfoundry/docker-core-data-go:1.3.1", "ports": [ { - "name": "tcp-20498", - "containerPort": 20498, + "name": "tcp-5563", + "containerPort": 5563, "protocol": "TCP" }, { - "name": "tcp-48075", - "containerPort": 48075, + "name": "tcp-48080", + "containerPort": 48080, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX__DEFAULT__PORT", - "value": "5566" - }, - { - "name": "EDGEX__DEFAULT__PROTOCOL", - "value": "tcp" - }, - { - "name": "EDGEX__DEFAULT__SERVER", - "value": "edgex-app-service-configurable-rules" - }, - { - "name": "EDGEX__DEFAULT__SERVICESERVER", - "value": "http://edgex-core-data:48080" - }, - { - "name": "EDGEX__DEFAULT__TOPIC", - "value": "events" - }, - { - "name": "KUIPER__BASIC__CONSOLELOG", - "value": "true" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-core-data/secrets-token.json" }, { - "name": "KUIPER__BASIC__RESTPORT", - "value": "48075" - } - ], - "resources": {}, - "imagePullPolicy": "IfNotPresent" - } - ], - "hostname": "edgex-kuiper" - } - }, - "strategy": {} - } - }, - { - "name": "edgex-secrets-setup", - "deployment": { - "selector": { - "matchLabels": { - "app": "edgex-secrets-setup" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "app": "edgex-secrets-setup" - } - }, - "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "secrets-setup-cache", - "emptyDir": {} - }, - { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "vault-init", - "emptyDir": {} - } - ], - "containers": [ - { - "name": "edgex-secrets-setup", - "image": "edgexfoundry/docker-security-secrets-setup-go:1.3.1", - "envFrom": [ - { - "configMapRef": { - "name": "common-variable-hanoi" - } + "name": "SERVICE_HOST", + "value": "edgex-core-data" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/tmp" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/run" - }, - { - "name": "secrets-setup-cache", - "mountPath": "/etc/edgex/pki" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "vault-init", - "mountPath": "/vault/init" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-core-data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-secrets-setup" + "hostname": "edgex-core-data" } }, "strategy": {} } }, { - "name": "edgex-proxy", + "name": "edgex-vault", + "service": { + "ports": [ + { + "name": "tcp-8200", + "protocol": "TCP", + "port": 8200, + "targetPort": 8200 + } + ], + "selector": { + "app": "edgex-vault" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-proxy" + "app": "edgex-vault" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-proxy" + "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-security-proxy-setup", - "type": "DirectoryOrCreate" - } + "name": "vault-file", + "emptyDir": {} + }, + { + "name": "vault-init", + "emptyDir": {} + }, + { + "name": "vault-logs", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-proxy", - "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", + "name": "edgex-vault", + "image": "vault:1.5.3", + "ports": [ + { + "name": "tcp-8200", + "containerPort": 8200, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SECRETSERVICE_SNIS", - "value": "edgex-kong" - }, - { - "name": "SECRETSERVICE_TOKENPATH", - "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" - }, - { - "name": "KONGURL_SERVER", - "value": "kong" + "name": "VAULT_CONFIG_DIR", + "value": "/vault/config" }, { - "name": "SECRETSERVICE_CACERTPATH", - "value": "/tmp/edgex/secrets/ca/ca.pem" + "name": "VAULT_UI", + "value": "true" }, { - "name": "SECRETSERVICE_SERVER", - "value": "edgex-vault" + "name": "VAULT_ADDR", + "value": "https://edgex-vault:8200" } ], "resources": {}, "volumeMounts": [ { - "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-security-proxy-setup" + "name": "vault-file", + "mountPath": "/vault/file" + }, + { + "name": "vault-init", + "mountPath": "/vault/init" + }, + { + "name": "vault-logs", + "mountPath": "/vault/logs" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-proxy" + "hostname": "edgex-vault" } }, "strategy": {} } }, { - "name": "edgex-security-bootstrap-database", + "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-security-bootstrap-database" + "app": "edgex-core-command" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-security-bootstrap-database" + "app": "edgex-core-command" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, { "name": "anonymous-volume1", "hostPath": { @@ -10234,501 +10186,415 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", + "path": "/tmp/edgex/secrets/edgex-core-command", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-security-bootstrap-database", - "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", + "name": "edgex-core-command", + "image": "edgexfoundry/docker-core-command-go:1.3.1", + "ports": [ + { + "name": "tcp-48082", + "containerPort": 48082, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" + "name": "SERVICE_HOST", + "value": "edgex-core-command" }, { - "name": "SERVICE_HOST", - "value": "edgex-security-bootstrap-database" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" - }, { "name": "anonymous-volume1", "mountPath": "/tmp/edgex/secrets/ca" }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" + "mountPath": "/tmp/edgex/secrets/edgex-core-command" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-security-bootstrap-database" + "hostname": "edgex-core-command" } }, "strategy": {} } }, { - "name": "kong", + "name": "edgex-app-service-configurable-rules", "service": { "ports": [ { - "name": "tcp-8000", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000 - }, - { - "name": "tcp-8001", - "protocol": "TCP", - "port": 8001, - "targetPort": 8001 - }, - { - "name": "tcp-8443", - "protocol": "TCP", - "port": 8443, - "targetPort": 8443 - }, - { - "name": "tcp-8444", + "name": "tcp-48100", "protocol": "TCP", - "port": 8444, - "targetPort": 8444 + "port": 48100, + "targetPort": 48100 } ], "selector": { - "app": "kong" + "app": "edgex-app-service-configurable-rules" } }, "deployment": { "selector": { "matchLabels": { - "app": "kong" + "app": "edgex-app-service-configurable-rules" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "kong" + "app": "edgex-app-service-configurable-rules" } }, "spec": { - "volumes": [ - { - "name": "tmpfs-volume1", - "emptyDir": {} - }, - { - "name": "tmpfs-volume2", - "emptyDir": {} - }, - { - "name": "consul-scripts", - "emptyDir": {} - }, - { - "name": "kong", - "emptyDir": {} - } - ], "containers": [ { - "name": "kong", - "image": "kong:2.0.5", + "name": "edgex-app-service-configurable-rules", + "image": "edgexfoundry/docker-app-service-configurable:1.3.1", "ports": [ { - "name": "tcp-8000", - "containerPort": 8000, - "protocol": "TCP" - }, - { - "name": "tcp-8001", - "containerPort": 8001, - "protocol": "TCP" - }, - { - "name": "tcp-8443", - "containerPort": 8443, - "protocol": "TCP" - }, - { - "name": "tcp-8444", - "containerPort": 8444, + "name": "tcp-48100", + "containerPort": 48100, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "KONG_DATABASE", - "value": "postgres" - }, - { - "name": "KONG_PG_HOST", - "value": "kong-db" - }, - { - "name": "KONG_PG_PASSWORD", - "value": "kong" - }, - { - "name": "KONG_PROXY_ACCESS_LOG", - "value": "/dev/stdout" + "name": "EDGEX_PROFILE", + "value": "rules-engine" }, { - "name": "KONG_PROXY_ERROR_LOG", - "value": "/dev/stderr" + "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", + "value": "edgex-core-data" }, { - "name": "KONG_ADMIN_ACCESS_LOG", - "value": "/dev/stdout" + "name": "SERVICE_PORT", + "value": "48100" }, { - "name": "KONG_ADMIN_ERROR_LOG", - "value": "/dev/stderr" + "name": "SERVICE_HOST", + "value": "edgex-app-service-configurable-rules" }, { - "name": "KONG_ADMIN_LISTEN", - "value": "0.0.0.0:8001, 0.0.0.0:8444 ssl" + "name": "BINDING_PUBLISHTOPIC", + "value": "events" } ], "resources": {}, - "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/tmp" - }, - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" - }, - { - "name": "kong", - "mountPath": "/usr/local/kong" - } - ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "kong" + "hostname": "edgex-app-service-configurable-rules" } }, "strategy": {} - } - }, - { - "name": "edgex-app-service-configurable-rules", - "service": { - "ports": [ - { - "name": "tcp-48100", - "protocol": "TCP", - "port": 48100, - "targetPort": 48100 - } - ], - "selector": { - "app": "edgex-app-service-configurable-rules" - } - }, + } + }, + { + "name": "edgex-security-bootstrap-database", "deployment": { "selector": { "matchLabels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-security-bootstrap-database" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-app-service-configurable-rules" + "app": "edgex-security-bootstrap-database" } }, "spec": { + "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "anonymous-volume1", + "hostPath": { + "path": "/tmp/edgex/secrets/ca", + "type": "DirectoryOrCreate" + } + }, + { + "name": "anonymous-volume2", + "hostPath": { + "path": "/tmp/edgex/secrets/edgex-security-bootstrap-redis", + "type": "DirectoryOrCreate" + } + } + ], "containers": [ { - "name": "edgex-app-service-configurable-rules", - "image": "edgexfoundry/docker-app-service-configurable:1.3.1", - "ports": [ - { - "name": "tcp-48100", - "containerPort": 48100, - "protocol": "TCP" - } - ], + "name": "edgex-security-bootstrap-database", + "image": "edgexfoundry/docker-security-bootstrap-redis-go:1.3.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "BINDING_PUBLISHTOPIC", - "value": "events" + "name": "SERVICE_HOST", + "value": "edgex-security-bootstrap-database" }, { - "name": "SERVICE_HOST", - "value": "edgex-app-service-configurable-rules" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "EDGEX_PROFILE", - "value": "rules-engine" + "name": "tmpfs-volume2", + "mountPath": "/vault" }, { - "name": "SERVICE_PORT", - "value": "48100" + "name": "anonymous-volume1", + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "MESSAGEBUS_SUBSCRIBEHOST_HOST", - "value": "edgex-core-data" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-security-bootstrap-redis" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-app-service-configurable-rules" + "hostname": "edgex-security-bootstrap-database" } }, "strategy": {} } }, { - "name": "edgex-sys-mgmt-agent", + "name": "edgex-redis", "service": { "ports": [ { - "name": "tcp-48090", + "name": "tcp-6379", "protocol": "TCP", - "port": 48090, - "targetPort": 48090 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-sys-mgmt-agent" + "app": "edgex-redis" } }, "spec": { + "volumes": [ + { + "name": "db-data", + "emptyDir": {} + } + ], "containers": [ { - "name": "edgex-sys-mgmt-agent", - "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", + "name": "edgex-redis", + "image": "redis:6.0.9-alpine", "ports": [ { - "name": "tcp-48090", - "containerPort": 48090, + "name": "tcp-6379", + "containerPort": 6379, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], - "env": [ - { - "name": "METRICSMECHANISM", - "value": "executor" - }, - { - "name": "SERVICE_HOST", - "value": "edgex-sys-mgmt-agent" - }, + "resources": {}, + "volumeMounts": [ { - "name": "EXECUTORPATH", - "value": "/sys-mgmt-executor" + "name": "db-data", + "mountPath": "/data" } ], - "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-sys-mgmt-agent" + "hostname": "edgex-redis" } }, "strategy": {} } }, { - "name": "edgex-vault", + "name": "edgex-support-notifications", "service": { "ports": [ { - "name": "tcp-8200", + "name": "tcp-48060", "protocol": "TCP", - "port": 8200, - "targetPort": 8200 + "port": 48060, + "targetPort": 48060 } ], "selector": { - "app": "edgex-vault" + "app": "edgex-support-notifications" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault" + "app": "edgex-support-notifications" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault" + "app": "edgex-support-notifications" } }, "spec": { "volumes": [ - { - "name": "tmpfs-volume1", - "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-support-notifications", + "type": "DirectoryOrCreate" + } } ], "containers": [ { - "name": "edgex-vault", - "image": "vault:1.5.3", + "name": "edgex-support-notifications", + "image": "edgexfoundry/docker-support-notifications-go:1.3.1", "ports": [ { - "name": "tcp-8200", - "containerPort": 8200, + "name": "tcp-48060", + "containerPort": 48060, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "VAULT_UI", - "value": "true" - }, - { - "name": "VAULT_ADDR", - "value": "https://edgex-vault:8200" + "name": "SERVICE_HOST", + "value": "edgex-support-notifications" }, { - "name": "VAULT_CONFIG_DIR", - "value": "/vault/config" + "name": "SECRETSTORE_TOKENFILE", + "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/vault/config" - }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/edgex-vault" - }, - { - "name": "vault-file", - "mountPath": "/vault/file" - }, - { - "name": "vault-init", - "mountPath": "/vault/init" + "mountPath": "/tmp/edgex/secrets/ca" }, { - "name": "vault-logs", - "mountPath": "/vault/logs" + "name": "anonymous-volume2", + "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault" + "hostname": "edgex-support-notifications" } }, "strategy": {} } }, { - "name": "edgex-vault-worker", + "name": "kong-db", + "service": { + "ports": [ + { + "name": "tcp-5432", + "protocol": "TCP", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "app": "kong-db" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-vault-worker" + "app": "kong-db" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-vault-worker" + "app": "kong-db" } }, "spec": { @@ -10742,203 +10608,212 @@ "emptyDir": {} }, { - "name": "consul-scripts", + "name": "tmpfs-volume3", "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets", - "type": "DirectoryOrCreate" - } - }, - { - "name": "vault-config", + "name": "postgres-data", "emptyDir": {} } ], "containers": [ { - "name": "edgex-vault-worker", - "image": "edgexfoundry/docker-security-secretstore-setup-go:1.3.1", + "name": "kong-db", + "image": "postgres:12.3-alpine", + "ports": [ + { + "name": "tcp-5432", + "containerPort": 5432, + "protocol": "TCP" + } + ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SECRETSTORE_SETUP_DONE_FLAG", - "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + "name": "POSTGRES_USER", + "value": "kong" + }, + { + "name": "POSTGRES_DB", + "value": "kong" + }, + { + "name": "POSTGRES_PASSWORD", + "value": "kong" } ], "resources": {}, "volumeMounts": [ { "name": "tmpfs-volume1", - "mountPath": "/run" - }, - { - "name": "tmpfs-volume2", - "mountPath": "/vault" + "mountPath": "/var/run" }, - { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + { + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets" + "name": "tmpfs-volume3", + "mountPath": "/run" }, { - "name": "vault-config", - "mountPath": "/vault/config" + "name": "postgres-data", + "mountPath": "/var/lib/postgresql/data" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-vault-worker" + "hostname": "kong-db" } }, "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": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], - "env": [ + "resources": {}, + "volumeMounts": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" + "name": "tmpfs-volume1", + "mountPath": "/tmp" }, { - "name": "NOTIFICATIONS_SENDER", - "value": "edgex-core-metadata" + "name": "tmpfs-volume2", + "mountPath": "/run" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-metadata" - } - ], - "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-core-consul", + "name": "kong", "service": { "ports": [ { - "name": "tcp-8500", + "name": "tcp-8000", "protocol": "TCP", - "port": 8500, - "targetPort": 8500 + "port": 8000, + "targetPort": 8000 + }, + { + "name": "tcp-8001", + "protocol": "TCP", + "port": 8001, + "targetPort": 8001 + }, + { + "name": "tcp-8443", + "protocol": "TCP", + "port": 8443, + "targetPort": 8443 + }, + { + "name": "tcp-8444", + "protocol": "TCP", + "port": 8444, + "targetPort": 8444 } ], "selector": { - "app": "edgex-core-consul" + "app": "kong" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-consul" + "app": "kong" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-consul" + "app": "kong" } }, "spec": { "volumes": [ { - "name": "consul-config", + "name": "tmpfs-volume1", "emptyDir": {} }, { - "name": "consul-data", + "name": "tmpfs-volume2", "emptyDir": {} }, { @@ -10946,101 +10821,100 @@ "emptyDir": {} }, { - "name": "anonymous-volume1", - "hostPath": { - "path": "/tmp/edgex/secrets/ca", - "type": "DirectoryOrCreate" - } - }, - { - "name": "anonymous-volume2", - "hostPath": { - "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" - } + "name": "kong", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-consul", - "image": "edgexfoundry/docker-edgex-consul:1.3.0", + "name": "kong", + "image": "kong:2.0.5", "ports": [ { - "name": "tcp-8500", - "containerPort": 8500, + "name": "tcp-8000", + "containerPort": 8000, + "protocol": "TCP" + }, + { + "name": "tcp-8001", + "containerPort": 8001, + "protocol": "TCP" + }, + { + "name": "tcp-8443", + "containerPort": 8443, + "protocol": "TCP" + }, + { + "name": "tcp-8444", + "containerPort": 8444, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "EDGEX_SECURE", - "value": "true" + "name": "KONG_ADMIN_LISTEN", + "value": "0.0.0.0:8001, 0.0.0.0:8444 ssl" }, { - "name": "SECRETSTORE_SETUP_DONE_FLAG", - "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" + "name": "KONG_DATABASE", + "value": "postgres" }, { - "name": "EDGEX_DB", - "value": "redis" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "KONG_PG_HOST", + "value": "kong-db" + }, { - "name": "consul-config", - "mountPath": "/consul/config" + "name": "KONG_PG_PASSWORD", + "value": "kong" }, { - "name": "consul-data", - "mountPath": "/consul/data" + "name": "KONG_PROXY_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "consul-scripts", - "mountPath": "/consul/scripts" + "name": "KONG_PROXY_ERROR_LOG", + "value": "/dev/stderr" }, { - "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "name": "KONG_ADMIN_ACCESS_LOG", + "value": "/dev/stdout" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-consul" + "name": "KONG_ADMIN_ERROR_LOG", + "value": "/dev/stderr" + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" }, { - "name": "anonymous-volume3", - "mountPath": "/tmp/edgex/secrets/edgex-kong" + "name": "tmpfs-volume2", + "mountPath": "/tmp" }, { - "name": "anonymous-volume4", - "mountPath": "/tmp/edgex/secrets/edgex-vault" + "name": "consul-scripts", + "mountPath": "/consul/scripts" + }, + { + "name": "kong", + "mountPath": "/usr/local/kong" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-consul" + "hostname": "kong" } }, "strategy": {} @@ -11105,19 +10979,11 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ - { - "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", - "value": "edgex-core-data" - }, - { - "name": "INTERVALACTIONS_SCRUBAGED_HOST", - "value": "edgex-core-data" - }, { "name": "SERVICE_HOST", "value": "edgex-support-scheduler" @@ -11125,6 +10991,14 @@ { "name": "SECRETSTORE_TOKENFILE", "value": "/tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json" + }, + { + "name": "INTERVALACTIONS_SCRUBPUSHED_HOST", + "value": "edgex-core-data" + }, + { + "name": "INTERVALACTIONS_SCRUBAGED_HOST", + "value": "edgex-core-data" } ], "resources": {}, @@ -11148,98 +11022,118 @@ } }, { - "name": "edgex-device-rest", + "name": "edgex-sys-mgmt-agent", "service": { "ports": [ { - "name": "tcp-49986", + "name": "tcp-48090", "protocol": "TCP", - "port": 49986, - "targetPort": 49986 + "port": 48090, + "targetPort": 48090 } ], "selector": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-device-rest" + "app": "edgex-sys-mgmt-agent" } }, "spec": { "containers": [ { - "name": "edgex-device-rest", - "image": "edgexfoundry/docker-device-rest-go:1.2.1", + "name": "edgex-sys-mgmt-agent", + "image": "edgexfoundry/docker-sys-mgmt-agent-go:1.3.1", "ports": [ { - "name": "tcp-49986", - "containerPort": 49986, + "name": "tcp-48090", + "containerPort": 48090, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-device-rest" + "value": "edgex-sys-mgmt-agent" + }, + { + "name": "METRICSMECHANISM", + "value": "executor" + }, + { + "name": "EXECUTORPATH", + "value": "/sys-mgmt-executor" } ], "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-device-rest" + "hostname": "edgex-sys-mgmt-agent" } }, "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": {} + }, { "name": "anonymous-volume1", "hostPath": { @@ -11250,227 +11144,252 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-core-command", + "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-core-command", - "image": "edgexfoundry/docker-core-command-go:1.3.1", + "name": "edgex-core-consul", + "image": "edgexfoundry/docker-edgex-consul:1.3.0", "ports": [ { - "name": "tcp-48082", - "containerPort": 48082, + "name": "tcp-8500", + "containerPort": 8500, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-command/secrets-token.json" + "name": "SECRETSTORE_SETUP_DONE_FLAG", + "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" }, { - "name": "SERVICE_HOST", - "value": "edgex-core-command" + "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-core-command" + "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-core-command" + "hostname": "edgex-core-consul" } }, "strategy": {} } }, { - "name": "edgex-redis", - "service": { - "ports": [ - { - "name": "tcp-6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "app": "edgex-redis" - } - }, + "name": "", "deployment": { "selector": { "matchLabels": { - "app": "edgex-redis" + "app": "" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-redis" + "app": "" } }, "spec": { "volumes": [ { - "name": "db-data", + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "consul-scripts", "emptyDir": {} } ], "containers": [ { - "name": "edgex-redis", - "image": "redis:6.0.9-alpine", - "ports": [ - { - "name": "tcp-6379", - "containerPort": 6379, - "protocol": "TCP" - } - ], + "name": "", + "image": "kong:2.0.5", "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], + "env": [ + { + "name": "KONG_DATABASE", + "value": "postgres" + }, + { + "name": "KONG_PG_HOST", + "value": "kong-db" + }, + { + "name": "KONG_PG_PASSWORD", + "value": "kong" + } + ], "resources": {}, "volumeMounts": [ { - "name": "db-data", - "mountPath": "/data" + "name": "tmpfs-volume1", + "mountPath": "/tmp" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" } ], "imagePullPolicy": "IfNotPresent" } - ], - "hostname": "edgex-redis" + ] } }, "strategy": {} } }, { - "name": "edgex-core-data", - "service": { - "ports": [ - { - "name": "tcp-5563", - "protocol": "TCP", - "port": 5563, - "targetPort": 5563 - }, - { - "name": "tcp-48080", - "protocol": "TCP", - "port": 48080, - "targetPort": 48080 - } - ], - "selector": { - "app": "edgex-core-data" - } - }, + "name": "edgex-vault-worker", "deployment": { "selector": { "matchLabels": { - "app": "edgex-core-data" + "app": "edgex-vault-worker" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-core-data" + "app": "edgex-vault-worker" } }, "spec": { "volumes": [ + { + "name": "tmpfs-volume1", + "emptyDir": {} + }, + { + "name": "tmpfs-volume2", + "emptyDir": {} + }, + { + "name": "consul-scripts", + "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-data", - "type": "DirectoryOrCreate" - } + "name": "vault-config", + "emptyDir": {} } ], "containers": [ { - "name": "edgex-core-data", - "image": "edgexfoundry/docker-core-data-go:1.3.1", - "ports": [ - { - "name": "tcp-5563", - "containerPort": 5563, - "protocol": "TCP" - }, - { - "name": "tcp-48080", - "containerPort": 48080, - "protocol": "TCP" - } - ], + "name": "edgex-vault-worker", + "image": "edgexfoundry/docker-security-secretstore-setup-go:1.3.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "SERVICE_HOST", - "value": "edgex-core-data" - }, - { - "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-core-data/secrets-token.json" + "name": "SECRETSTORE_SETUP_DONE_FLAG", + "value": "/tmp/edgex/secrets/edgex-consul/.secretstore-setup-done" } ], "resources": {}, "volumeMounts": [ + { + "name": "tmpfs-volume1", + "mountPath": "/run" + }, + { + "name": "tmpfs-volume2", + "mountPath": "/vault" + }, + { + "name": "consul-scripts", + "mountPath": "/consul/scripts" + }, { "name": "anonymous-volume1", - "mountPath": "/tmp/edgex/secrets/ca" + "mountPath": "/tmp/edgex/secrets" }, { - "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-core-data" + "name": "vault-config", + "mountPath": "/vault/config" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-core-data" + "hostname": "edgex-vault-worker" } }, "strategy": {} @@ -11519,7 +11438,7 @@ "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], @@ -11540,138 +11459,129 @@ } }, { - "name": "kong-db", + "name": "edgex-kuiper", "service": { "ports": [ { - "name": "tcp-5432", + "name": "tcp-20498", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 20498, + "targetPort": 20498 + }, + { + "name": "tcp-48075", + "protocol": "TCP", + "port": 48075, + "targetPort": 48075 } ], "selector": { - "app": "kong-db" + "app": "edgex-kuiper" } }, "deployment": { "selector": { "matchLabels": { - "app": "kong-db" + "app": "edgex-kuiper" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "kong-db" + "app": "edgex-kuiper" } }, "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-kuiper", + "image": "emqx/kuiper:1.1.1-alpine", "ports": [ { - "name": "tcp-5432", - "containerPort": 5432, + "name": "tcp-20498", + "containerPort": 20498, + "protocol": "TCP" + }, + { + "name": "tcp-48075", + "containerPort": 48075, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "POSTGRES_USER", - "value": "kong" + "name": "EDGEX__DEFAULT__SERVICESERVER", + "value": "http://edgex-core-data:48080" }, { - "name": "POSTGRES_DB", - "value": "kong" + "name": "EDGEX__DEFAULT__TOPIC", + "value": "events" }, { - "name": "POSTGRES_PASSWORD", - "value": "kong" - } - ], - "resources": {}, - "volumeMounts": [ + "name": "KUIPER__BASIC__CONSOLELOG", + "value": "true" + }, { - "name": "tmpfs-volume1", - "mountPath": "/var/run" + "name": "KUIPER__BASIC__RESTPORT", + "value": "48075" }, { - "name": "tmpfs-volume2", - "mountPath": "/tmp" + "name": "EDGEX__DEFAULT__PORT", + "value": "5566" }, { - "name": "tmpfs-volume3", - "mountPath": "/run" + "name": "EDGEX__DEFAULT__PROTOCOL", + "value": "tcp" }, { - "name": "postgres-data", - "mountPath": "/var/lib/postgresql/data" + "name": "EDGEX__DEFAULT__SERVER", + "value": "edgex-app-service-configurable-rules" } ], + "resources": {}, "imagePullPolicy": "IfNotPresent" } ], - "hostname": "kong-db" + "hostname": "edgex-kuiper" } }, "strategy": {} } }, { - "name": "edgex-support-notifications", + "name": "edgex-core-metadata", "service": { "ports": [ { - "name": "tcp-48060", + "name": "tcp-48081", "protocol": "TCP", - "port": 48060, - "targetPort": 48060 + "port": 48081, + "targetPort": 48081 } ], "selector": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "deployment": { "selector": { "matchLabels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "edgex-support-notifications" + "app": "edgex-core-metadata" } }, "spec": { @@ -11686,37 +11596,41 @@ { "name": "anonymous-volume2", "hostPath": { - "path": "/tmp/edgex/secrets/edgex-support-notifications", + "path": "/tmp/edgex/secrets/edgex-core-metadata", "type": "DirectoryOrCreate" } } ], "containers": [ { - "name": "edgex-support-notifications", - "image": "edgexfoundry/docker-support-notifications-go:1.3.1", + "name": "edgex-core-metadata", + "image": "edgexfoundry/docker-core-metadata-go:1.3.1", "ports": [ { - "name": "tcp-48060", - "containerPort": 48060, + "name": "tcp-48081", + "containerPort": 48081, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { "name": "SERVICE_HOST", - "value": "edgex-support-notifications" + "value": "edgex-core-metadata" + }, + { + "name": "NOTIFICATIONS_SENDER", + "value": "edgex-core-metadata" }, { "name": "SECRETSTORE_TOKENFILE", - "value": "/tmp/edgex/secrets/edgex-support-notifications/secrets-token.json" + "value": "/tmp/edgex/secrets/edgex-core-metadata/secrets-token.json" } ], "resources": {}, @@ -11727,83 +11641,169 @@ }, { "name": "anonymous-volume2", - "mountPath": "/tmp/edgex/secrets/edgex-support-notifications" + "mountPath": "/tmp/edgex/secrets/edgex-core-metadata" } ], "imagePullPolicy": "IfNotPresent" } ], - "hostname": "edgex-support-notifications" + "hostname": "edgex-core-metadata" } }, "strategy": {} } }, { - "name": "", + "name": "edgex-device-rest", + "service": { + "ports": [ + { + "name": "tcp-49986", + "protocol": "TCP", + "port": 49986, + "targetPort": 49986 + } + ], + "selector": { + "app": "edgex-device-rest" + } + }, "deployment": { "selector": { "matchLabels": { - "app": "" + "app": "edgex-device-rest" } }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "app": "" + "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-proxy", + "deployment": { + "selector": { + "matchLabels": { + "app": "edgex-proxy" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "app": "edgex-proxy" } }, "spec": { "volumes": [ { - "name": "tmpfs-volume1", + "name": "consul-scripts", "emptyDir": {} }, { - "name": "consul-scripts", - "emptyDir": {} + "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": "", - "image": "kong:2.0.5", + "name": "edgex-proxy", + "image": "edgexfoundry/docker-security-proxy-setup-go:1.3.1", "envFrom": [ { "configMapRef": { - "name": "common-variable-hanoi" + "name": "common-variables" } } ], "env": [ { - "name": "KONG_DATABASE", - "value": "postgres" + "name": "SECRETSERVICE_SNIS", + "value": "edgex-kong" }, { - "name": "KONG_PG_HOST", - "value": "kong-db" + "name": "SECRETSERVICE_SERVER", + "value": "edgex-vault" }, { - "name": "KONG_PG_PASSWORD", + "name": "SECRETSERVICE_CACERTPATH", + "value": "/tmp/edgex/secrets/ca/ca.pem" + }, + { + "name": "SECRETSERVICE_TOKENPATH", + "value": "/tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json" + }, + { + "name": "KONGURL_SERVER", "value": "kong" } ], "resources": {}, "volumeMounts": [ - { - "name": "tmpfs-volume1", - "mountPath": "/tmp" - }, { "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" } ], "imagePullPolicy": "IfNotPresent" } - ] + ], + "hostname": "edgex-proxy" } }, "strategy": {} diff --git a/pkg/controller/platformadmin/platformadmin_controller.go b/pkg/controller/platformadmin/platformadmin_controller.go index 550f85e48ef..542c147c0f2 100644 --- a/pkg/controller/platformadmin/platformadmin_controller.go +++ b/pkg/controller/platformadmin/platformadmin_controller.go @@ -28,10 +28,12 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + kjson "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/types" kerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" + "k8s.io/kubectl/pkg/scheme" "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -55,6 +57,11 @@ func init() { flag.IntVar(&concurrentReconciles, "platformadmin-workers", concurrentReconciles, "Max concurrent workers for PlatformAdmin controller.") } +func Format(format string, args ...interface{}) string { + s := fmt.Sprintf(format, args...) + return fmt.Sprintf("%s: %s", ControllerName, s) +} + var ( concurrentReconciles = 3 controllerKind = iotv1alpha2.SchemeGroupVersion.WithKind("PlatformAdmin") @@ -66,24 +73,47 @@ const ( LabelConfigmap = "Configmap" LabelService = "Service" LabelDeployment = "Deployment" + LabelFramework = "Framework" AnnotationServiceTopologyKey = "openyurt.io/topologyKeys" AnnotationServiceTopologyValueNodePool = "openyurt.io/nodepool" - ConfigMapName = "common-variables" + ConfigMapName = "common-variables" + FrameworkName = "platformadmin-framework" + FrameworkFinalizer = "kubernetes.io/platformadmin-framework" ) -func Format(format string, args ...interface{}) string { - s := fmt.Sprintf(format, args...) - return fmt.Sprintf("%s: %s", ControllerName, s) +// PlatformAdminFramework is the framework of platformadmin, +// it contains all configs of configmaps, services and yurtappsets. +// PlatformAdmin will customize the configuration based on this structure. +type PlatformAdminFramework struct { + runtime.TypeMeta `json:",inline"` + + name string + security bool + Components []*config.Component `yaml:"components,omitempty" json:"components,omitempty"` + ConfigMaps []corev1.ConfigMap `yaml:"configMaps,omitempty" json:"configMaps,omitempty"` +} + +// A function written to implement the yaml serializer interface, which is not actually useful +func (p *PlatformAdminFramework) DeepCopyObject() runtime.Object { + copy := p.DeepCopy() + return © } -// ReconcilePlatformAdmin reconciles a PlatformAdmin object +// A function written to implement the yaml serializer interface, which is not actually useful +func (p *PlatformAdminFramework) DeepCopy() PlatformAdminFramework { + newObj := *p + return newObj +} + +// ReconcilePlatformAdmin reconciles a PlatformAdmin object. type ReconcilePlatformAdmin struct { client.Client - scheme *runtime.Scheme - recorder record.EventRecorder - Configration config.PlatformAdminControllerConfiguration + scheme *runtime.Scheme + recorder record.EventRecorder + yamlSerializer *kjson.Serializer + Configration config.PlatformAdminControllerConfiguration } var _ reconcile.Reconciler = &ReconcilePlatformAdmin{} @@ -102,10 +132,11 @@ func Add(c *appconfig.CompletedConfig, mgr manager.Manager) error { // newReconciler returns a new reconcile.Reconciler func newReconciler(c *appconfig.CompletedConfig, mgr manager.Manager) reconcile.Reconciler { return &ReconcilePlatformAdmin{ - Client: utilclient.NewClientFromManager(mgr, ControllerName), - scheme: mgr.GetScheme(), - recorder: mgr.GetEventRecorderFor(ControllerName), - Configration: c.ComponentConfig.PlatformAdminController, + Client: utilclient.NewClientFromManager(mgr, ControllerName), + scheme: mgr.GetScheme(), + recorder: mgr.GetEventRecorderFor(ControllerName), + yamlSerializer: kjson.NewSerializerWithOptions(kjson.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, kjson.SerializerOptions{Yaml: true, Pretty: true}), + Configration: c.ComponentConfig.PlatformAdminController, } } @@ -149,9 +180,9 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { return err } - klog.V(4).Info("registering the field indexers of platformadmin controller") + klog.V(4).Infof(Format("registering the field indexers of platformadmin controller")) if err := util.RegisterFieldIndexers(mgr.GetFieldIndexer()); err != nil { - klog.Errorf("failed to register field indexers for platformadmin controller, %v", err) + klog.Errorf(Format("failed to register field indexers for platformadmin controller, %v", err)) return nil } @@ -212,12 +243,12 @@ func (r *ReconcilePlatformAdmin) Reconcile(ctx context.Context, request reconcil func (r *ReconcilePlatformAdmin) reconcileDelete(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin) (reconcile.Result, error) { klog.V(4).Infof(Format("ReconcileDelete PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) yas := &appsv1alpha1.YurtAppSet{} - var desiredComponents []*config.Component - if platformAdmin.Spec.Security { - desiredComponents = r.Configration.SecurityComponents[platformAdmin.Spec.Version] - } else { - desiredComponents = r.Configration.NoSectyComponents[platformAdmin.Spec.Version] + + platformAdminFramework, err := r.syncFramework(ctx, platformAdmin) + if err != nil { + return reconcile.Result{}, errors.Wrapf(err, "unexpected error while synchronizing customize framework for %s", platformAdmin.Namespace+"/"+platformAdmin.Name) } + desiredComponents := platformAdminFramework.Components additionalComponents, err := annotationToComponent(platformAdmin.Annotations) if err != nil { @@ -264,9 +295,19 @@ func (r *ReconcilePlatformAdmin) reconcileNormal(ctx context.Context, platformAd klog.V(4).Infof(Format("ReconcileNormal PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) controllerutil.AddFinalizer(platformAdmin, iotv1alpha2.PlatformAdminFinalizer) - platformAdmin.Status.Initialized = true + platformAdminStatus.Initialized = true + + // Note that this configmap is different from the one below, which is used to customize the edgex framework + // Sync configmap of edgex confiruation during initialization + // This framework pointer is needed to synchronize user-modified edgex configurations + platformAdminFramework, err := r.syncFramework(ctx, platformAdmin) + if err != nil { + return reconcile.Result{}, errors.Wrapf(err, "unexpected error while synchronizing customize framework for %s", platformAdmin.Namespace+"/"+platformAdmin.Name) + } + + // Reconcile configmap of edgex confiruation klog.V(4).Infof(Format("ReconcileConfigmap PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) - if ok, err := r.reconcileConfigmap(ctx, platformAdmin, platformAdminStatus); !ok { + if ok, err := r.reconcileConfigmap(ctx, platformAdmin, platformAdminStatus, platformAdminFramework); !ok { if err != nil { util.SetPlatformAdminCondition(platformAdminStatus, util.NewPlatformAdminCondition(iotv1alpha2.ConfigmapAvailableCondition, corev1.ConditionFalse, iotv1alpha2.ConfigmapProvisioningFailedReason, err.Error())) return reconcile.Result{}, errors.Wrapf(err, @@ -277,8 +318,9 @@ func (r *ReconcilePlatformAdmin) reconcileNormal(ctx context.Context, platformAd } util.SetPlatformAdminCondition(platformAdminStatus, util.NewPlatformAdminCondition(iotv1alpha2.ConfigmapAvailableCondition, corev1.ConditionTrue, "", "")) + // Reconcile component of edgex confiruation klog.V(4).Infof(Format("ReconcileComponent PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) - if ok, err := r.reconcileComponent(ctx, platformAdmin, platformAdminStatus); !ok { + if ok, err := r.reconcileComponent(ctx, platformAdmin, platformAdminStatus, platformAdminFramework); !ok { if err != nil { util.SetPlatformAdminCondition(platformAdminStatus, util.NewPlatformAdminCondition(iotv1alpha2.ComponentAvailableCondition, corev1.ConditionFalse, iotv1alpha2.ComponentProvisioningReason, err.Error())) return reconcile.Result{}, errors.Wrapf(err, @@ -289,6 +331,7 @@ func (r *ReconcilePlatformAdmin) reconcileNormal(ctx context.Context, platformAd } util.SetPlatformAdminCondition(platformAdminStatus, util.NewPlatformAdminCondition(iotv1alpha2.ComponentAvailableCondition, corev1.ConditionTrue, "", "")) + // Update the metadata of PlatformAdmin platformAdminStatus.Ready = true if err := r.Client.Update(ctx, platformAdmin); err != nil { klog.Errorf(Format("Update PlatformAdmin %s error %v", klog.KObj(platformAdmin), err)) @@ -298,22 +341,17 @@ func (r *ReconcilePlatformAdmin) reconcileNormal(ctx context.Context, platformAd return reconcile.Result{}, nil } -func (r *ReconcilePlatformAdmin) reconcileConfigmap(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, _ *iotv1alpha2.PlatformAdminStatus) (bool, error) { +func (r *ReconcilePlatformAdmin) reconcileConfigmap(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, _ *iotv1alpha2.PlatformAdminStatus, platformAdminFramework *PlatformAdminFramework) (bool, error) { var configmaps []corev1.ConfigMap needConfigMaps := make(map[string]struct{}) + configmaps = platformAdminFramework.ConfigMaps - if platformAdmin.Spec.Security { - configmaps = r.Configration.SecurityConfigMaps[platformAdmin.Spec.Version] - } else { - configmaps = r.Configration.NoSectyConfigMaps[platformAdmin.Spec.Version] - } - for _, configmap := range configmaps { - // Supplement runtime information + for i, configmap := range configmaps { configmap.Namespace = platformAdmin.Namespace configmap.Labels = make(map[string]string) configmap.Labels[iotv1alpha2.LabelPlatformAdminGenerate] = LabelConfigmap - _, err := controllerutil.CreateOrUpdate(ctx, r.Client, &configmap, func() error { + configmap.Data = platformAdminFramework.ConfigMaps[i].Data return controllerutil.SetOwnerReference(platformAdmin, &configmap, (r.Scheme())) }) if err != nil { @@ -335,16 +373,12 @@ func (r *ReconcilePlatformAdmin) reconcileConfigmap(ctx context.Context, platfor return true, nil } -func (r *ReconcilePlatformAdmin) reconcileComponent(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, platformAdminStatus *iotv1alpha2.PlatformAdminStatus) (bool, error) { +func (r *ReconcilePlatformAdmin) reconcileComponent(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, platformAdminStatus *iotv1alpha2.PlatformAdminStatus, platformAdminFramework *PlatformAdminFramework) (bool, error) { var desireComponents []*config.Component needComponents := make(map[string]struct{}) var readyComponent int32 = 0 - if platformAdmin.Spec.Security { - desireComponents = r.Configration.SecurityComponents[platformAdmin.Spec.Version] - } else { - desireComponents = r.Configration.NoSectyComponents[platformAdmin.Spec.Version] - } + desireComponents = platformAdminFramework.Components additionalComponents, err := annotationToComponent(platformAdmin.Annotations) if err != nil { @@ -359,7 +393,6 @@ func (r *ReconcilePlatformAdmin) reconcileComponent(ctx context.Context, platfor platformAdminStatus.UnreadyComponentNum = int32(len(desireComponents)) - readyComponent }() -NextC: for _, desireComponent := range desireComponents { readyService := false readyDeployment := false @@ -370,7 +403,13 @@ NextC: } readyService = true - yas := &appsv1alpha1.YurtAppSet{} + yas := &appsv1alpha1.YurtAppSet{ + ObjectMeta: metav1.ObjectMeta{ + Name: desireComponent.Name, + Namespace: platformAdmin.Namespace, + }, + } + err := r.Get( ctx, types.NamespacedName{ @@ -388,6 +427,9 @@ NextC: } else { oldYas := yas.DeepCopy() + // Refresh the YurtAppSet according to the user-defined configuration + yas.Spec.WorkloadTemplate.DeploymentTemplate.Spec = *desireComponent.Deployment + if _, ok := yas.Status.PoolReplicas[platformAdmin.Spec.PoolName]; ok { if yas.Status.ReadyReplicas == yas.Status.Replicas { readyDeployment = true @@ -395,7 +437,6 @@ NextC: readyComponent++ } } - continue NextC } pool := appsv1alpha1.Pool{ Name: platformAdmin.Spec.PoolName, @@ -465,7 +506,6 @@ func (r *ReconcilePlatformAdmin) handleService(ctx context.Context, platformAdmi Name: component.Name, Namespace: platformAdmin.Namespace, }, - Spec: *component.Service, } service.Labels[iotv1alpha2.LabelPlatformAdminGenerate] = LabelService service.Annotations[AnnotationServiceTopologyKey] = AnnotationServiceTopologyValueNodePool @@ -475,10 +515,10 @@ func (r *ReconcilePlatformAdmin) handleService(ctx context.Context, platformAdmi r.Client, service, func() error { + service.Spec = *component.Service return controllerutil.SetOwnerReference(platformAdmin, service, r.Scheme()) }, ) - if err != nil { return nil, err } @@ -486,6 +526,13 @@ func (r *ReconcilePlatformAdmin) handleService(ctx context.Context, platformAdmi } func (r *ReconcilePlatformAdmin) handleYurtAppSet(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, component *config.Component) (*appsv1alpha1.YurtAppSet, error) { + // It is possible that the component does not need deployment. + // Therefore, you need to be careful when calling this function. + // It is still possible for deployment to be nil when there is no error! + if component.Deployment == nil { + return nil, nil + } + yas := &appsv1alpha1.YurtAppSet{ ObjectMeta: metav1.ObjectMeta{ Labels: make(map[string]string), @@ -600,3 +647,116 @@ func annotationToComponent(annotation map[string]string) ([]*config.Component, e return components, nil } + +func (r *ReconcilePlatformAdmin) syncFramework(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin) (*PlatformAdminFramework, error) { + klog.V(6).Infof(Format("Synchronize the customize framework information for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + + // Try to get the configmap that represents the framework + platformAdminFramework := &PlatformAdminFramework{ + // The configmap that represents framework is named with the framework prefix and the version name + name: FrameworkName, + } + + // Check if the configmap that represents framework is found + cm := &corev1.ConfigMap{} + if err := r.Get(ctx, types.NamespacedName{Namespace: platformAdmin.Namespace, Name: platformAdminFramework.name}, cm); err != nil { + if apierrors.IsNotFound(err) { + // If the configmap that represents framework is not found, + // need to create it by standard configuration + err = r.initFramework(ctx, platformAdmin, platformAdminFramework) + if err != nil { + klog.Errorf(Format("Init framework for PlatformAdmin %s/%s error %v", platformAdmin.Namespace, platformAdmin.Name, err)) + return nil, err + } + return platformAdminFramework, nil + } + klog.Errorf(Format("Get framework for PlatformAdmin %s/%s error %v", platformAdmin.Namespace, platformAdmin.Name, err)) + return nil, err + } + + // For better serialization, the serialization method of the Kubernetes runtime library is used + err := runtime.DecodeInto(r.yamlSerializer, []byte(cm.Data["framework"]), platformAdminFramework) + if err != nil { + klog.Errorf(Format("Decode framework for PlatformAdmin %s/%s error %v", platformAdmin.Namespace, platformAdmin.Name, err)) + return nil, err + } + + // If PlatformAdmin is about to be deleted, remove Finalizer from the framework. + // If not deleted, the owner reference is synchronized. + if platformAdmin.DeletionTimestamp != nil { + _, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, func() error { + // During the deletion phase, ensure that data in the framework is read before deletion + // The following code removes the finalizer, allowing the framework to be deleted (since we read out its data above). + controllerutil.RemoveFinalizer(cm, FrameworkFinalizer) + return nil + }) + if err != nil { + klog.Errorf(Format("Failed to remove finalizer of framework configmap for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + return nil, err + } + } else { + hasOwnerReference := false + for _, ref := range cm.ObjectMeta.OwnerReferences { + if ref.Kind == platformAdmin.Kind && ref.Name == platformAdmin.Name { + hasOwnerReference = true + } + } + if !hasOwnerReference { + _, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, func() error { + return controllerutil.SetOwnerReference(platformAdmin, cm, r.scheme) + }) + if err != nil { + klog.Errorf(Format("Failed to add owner reference of framework configmap for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + return nil, err + } + } + } + + return platformAdminFramework, nil +} + +// initFramework initializes the framework information for PlatformAdmin +func (r *ReconcilePlatformAdmin) initFramework(ctx context.Context, platformAdmin *iotv1alpha2.PlatformAdmin, platformAdminFramework *PlatformAdminFramework) error { + klog.V(6).Infof(Format("Initializes the standard framework information for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + + // Use standard configurations to build the framework + platformAdminFramework.security = platformAdmin.Spec.Security + if platformAdminFramework.security { + platformAdminFramework.ConfigMaps = r.Configration.SecurityConfigMaps[platformAdmin.Spec.Version] + platformAdminFramework.Components = r.Configration.SecurityComponents[platformAdmin.Spec.Version] + } else { + platformAdminFramework.ConfigMaps = r.Configration.NoSectyConfigMaps[platformAdmin.Spec.Version] + platformAdminFramework.Components = r.Configration.NoSectyComponents[platformAdmin.Spec.Version] + } + + // For better serialization, the serialization method of the Kubernetes runtime library is used + data, err := runtime.Encode(r.yamlSerializer, platformAdminFramework) + if err != nil { + klog.Errorf(Format("Failed to marshal framework for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + return err + } + + // Create the configmap that represents framework + cm := &corev1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{ + Name: platformAdminFramework.name, + Namespace: platformAdmin.Namespace, + }, + } + cm.Labels = make(map[string]string) + cm.Labels[iotv1alpha2.LabelPlatformAdminGenerate] = LabelFramework + cm.Data = make(map[string]string) + cm.Data["framework"] = string(data) + // Creates configmap on behalf of the framework, which is called only once upon creation + _, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, func() error { + // We need to control the deletion time of the framework, + // because we must ensure that its data is read before deleting it. + controllerutil.AddFinalizer(cm, FrameworkFinalizer) + return controllerutil.SetOwnerReference(platformAdmin, cm, r.Scheme()) + }) + if err != nil { + klog.Errorf(Format("Failed to create or update framework configmap for PlatformAdmin %s/%s", platformAdmin.Namespace, platformAdmin.Name)) + return err + } + return nil +}