From a6b1544acfb60632395b8b9d7914d8ff755a80b3 Mon Sep 17 00:00:00 2001 From: yangbo <55695343+yangbobo6@users.noreply.github.com> Date: Mon, 20 Feb 2023 13:38:05 +0800 Subject: [PATCH 1/3] Periodical collect (#87) * -Change logic, collect useful versions in manifest file -add periodically collect time --- .github/workflows/auto-submit-pr.yaml | 35 +++++++++++++++++++ EdgeXConfig/manifest.yaml | 9 +++++ .../collector/config/multiarch_imagelist.txt | 2 ++ .../collector/config/singlearch_imagelist.txt | 2 +- tools/collector/edgex/collect.go | 26 ++++++++++++++ tools/collector/edgex/component.go | 17 +++++++++ tools/collector/main.go | 33 +++++++++++++++++ 7 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/auto-submit-pr.yaml create mode 100644 EdgeXConfig/manifest.yaml diff --git a/.github/workflows/auto-submit-pr.yaml b/.github/workflows/auto-submit-pr.yaml new file mode 100644 index 0000000..d43457b --- /dev/null +++ b/.github/workflows/auto-submit-pr.yaml @@ -0,0 +1,35 @@ +on: + push: + branches: + - action-dev + schedule: + - cron: '10 * * * *' + +name: auto collect info and create pull request +jobs: + auto-createPR: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: auto collect periodically + run: make collect + - name: Run read-yaml action + id: yaml-data + uses: CumulusDS/get-yaml-paths-action@v1.0.1 + with: + file: ./EdgeXConfig/manifest.yaml + updated: updated + - name: Display read-yaml output + run: | + echo "${{ steps.yaml-data.outputs.updated }}" + + - name: Create Pull Request + if: ${{steps.yaml-data.outputs.updated == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + commit-message: update config file + title: The edgeX has been updated + body: > + This PR is auto-generated by github action,please check and merge the config file in time. + labels: update file, automated pr + branch: auto-generated-branch \ No newline at end of file diff --git a/EdgeXConfig/manifest.yaml b/EdgeXConfig/manifest.yaml new file mode 100644 index 0000000..220cfdd --- /dev/null +++ b/EdgeXConfig/manifest.yaml @@ -0,0 +1,9 @@ +updated: "false" +count: 5 +latestVersion: levski +versions: + - levski + - jakarta + - kamakura + - ireland + - hanoi diff --git a/tools/collector/config/multiarch_imagelist.txt b/tools/collector/config/multiarch_imagelist.txt index 79ca987..1258c43 100644 --- a/tools/collector/config/multiarch_imagelist.txt +++ b/tools/collector/config/multiarch_imagelist.txt @@ -28,3 +28,5 @@ redis:6.0.9-alpine emqx/kuiper:1.1.1-alpine kong:2.0.5 vault:1.5.3 +postgres:12.3-alpine +kong:2.0.5 \ No newline at end of file diff --git a/tools/collector/config/singlearch_imagelist.txt b/tools/collector/config/singlearch_imagelist.txt index 59e5452..a625dd3 100644 --- a/tools/collector/config/singlearch_imagelist.txt +++ b/tools/collector/config/singlearch_imagelist.txt @@ -62,4 +62,4 @@ edgexfoundry/docker-security-proxy-setup-go:1.3.1 edgexfoundry/docker-security- edgexfoundry/docker-security-secrets-setup-go:1.3.1 edgexfoundry/docker-security-secrets-setup-go-arm64:1.3.1 edgexfoundry/docker-core-command-go:1.3.1 edgexfoundry/docker-core-command-go-arm64:1.3.1 edgexfoundry/docker-device-rest-go:1.2.1 edgexfoundry/docker-device-rest-go-arm64:1.2.1 -edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 +edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 \ No newline at end of file diff --git a/tools/collector/edgex/collect.go b/tools/collector/edgex/collect.go index da2e9d0..5e06db0 100644 --- a/tools/collector/edgex/collect.go +++ b/tools/collector/edgex/collect.go @@ -142,3 +142,29 @@ func ModifyImagesName(edgexConfig *EdgeXConfig, repo string) { } } + +func CollectVersionToManifest(versionList []Version, oldManifest *Manifest) *Manifest { + versions := make([]string, 0) + for _, v := range versionList { + versions = append(versions, v.Name) + } + manifest := NewManifest() + + for _, version := range versions { + manifest.Versions = append(manifest.Versions, version) + if !stringIsInArray(version, oldManifest.Versions) { + manifest.LatestVersion = version + } + } + if manifest.LatestVersion == "" { + manifest.LatestVersion = oldManifest.LatestVersion + } + + manifest.Count = len(manifest.Versions) + if oldManifest.Count < len(manifest.Versions) { + manifest.Updated = "true" + } else { + manifest.Updated = "false" + } + return manifest +} diff --git a/tools/collector/edgex/component.go b/tools/collector/edgex/component.go index 99bd4d5..7d281b2 100644 --- a/tools/collector/edgex/component.go +++ b/tools/collector/edgex/component.go @@ -33,6 +33,23 @@ const ( parseIntBaseBitSize = 32 ) +type Manifest struct { + Updated string `yaml:"updated"` + Count int `yaml:"count"` + LatestVersion string `yaml:"latestVersion"` + Versions []string `yaml:"versions"` +} + +func NewManifest() *Manifest { + manifest := &Manifest{ + Updated: "false", + Count: 0, + LatestVersion: "", + Versions: make([]string, 0), + } + return manifest +} + type Component struct { logger *logrus.Entry Name string `yaml:"name"` diff --git a/tools/collector/main.go b/tools/collector/main.go index 24bdf59..141131e 100644 --- a/tools/collector/main.go +++ b/tools/collector/main.go @@ -19,6 +19,7 @@ package main import ( "flag" "io/ioutil" + "os" "github.com/openyurtio/yurt-edgex-manager/tools/collector/edgex" "github.com/sirupsen/logrus" @@ -34,6 +35,7 @@ var ( repo string amdArch = "amd" armArch = "arm" + manifestPath = "../../EdgeXConfig/manifest.yaml" ) func main() { @@ -82,6 +84,21 @@ func Run() error { edgex.ModifyImagesName(edgeXConfigAmd, repo) + var oldManifest edgex.Manifest + + if _, err := os.Stat(manifestPath); err == nil { + //file is exist + manifestFile, err := ioutil.ReadFile(manifestPath) + err = yaml.Unmarshal(manifestFile, &oldManifest) + if err != nil { + return err + } + } else { + oldManifest = *edgex.NewManifest() + } + + manifest := edgex.CollectVersionToManifest(edgeXConfigAmd.Versions, &oldManifest) + data, err := yaml.Marshal(edgeXConfigAmd) if err != nil { logger.Errorln("Fail to parse edgex config to yaml:", err) @@ -104,6 +121,22 @@ func Run() error { edgex.ModifyImagesName(edgeXConfigAmd, repo) + if manifest.Updated == "false" { + manifest = edgex.CollectVersionToManifest(edgeXConfigAmd.Versions, &oldManifest) + } + + //write in the file + manifestData, err := yaml.Marshal(manifest) + if err != nil { + logger.Errorln("Fail to parse manifest config to yaml:", err) + return err + } + err = ioutil.WriteFile(manifestPath, manifestData, 0644) + if err != nil { + logger.Errorln("Fail to write manifest yaml:", err) + return err + } + data, err = yaml.Marshal(edgeXConfigAmd) if err != nil { logger.Errorln("Fail to parse edgex-nosecty config to yaml:", err) From 88c2a892c1204ebb1539a706155842143a443af8 Mon Sep 17 00:00:00 2001 From: yangbo <55695343+yangbobo6@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:09:30 +0800 Subject: [PATCH 2/3] Periodical collect (#88) --- EdgeXConfig/config-nosecty.yaml | 4756 ++--- EdgeXConfig/config.yaml | 14314 ++++++++-------- api/v1alpha1/edgex_conversion.go | 42 +- config/samples/hangzhou.yaml | 8 +- config/samples/jakarta-sak.yaml | 11 +- controllers/edgex_controller.go | 68 + test/e2e/data/beijing.yaml | 2 +- test/e2e/data/hangzhou.yaml | 2 +- .../collector/config/multiarch_imagelist.txt | 25 +- .../collector/config/singlearch_imagelist.txt | 76 +- tools/collector/edgex/collect.go | 2 +- tools/collector/main.go | 5 +- 12 files changed, 9708 insertions(+), 9603 deletions(-) diff --git a/EdgeXConfig/config-nosecty.yaml b/EdgeXConfig/config-nosecty.yaml index 579731b..13901e2 100644 --- a/EdgeXConfig/config-nosecty.yaml +++ b/EdgeXConfig/config-nosecty.yaml @@ -33,20 +33,20 @@ versions: REGISTRY_HOST: edgex-core-consul binarydata: {} components: - - name: edgex-support-scheduler + - name: edgex-support-notifications service: ports: - - name: tcp-59861 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59861 + port: 59860 targetport: type: 0 - intval: 59861 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -68,7 +68,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -83,7 +83,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -92,15 +92,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.3.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59860 hostport: 0 - containerport: 59861 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -111,14 +111,8 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -153,7 +147,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -180,20 +174,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-app-rules-engine service: ports: - - name: tcp-58890 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 58890 + port: 59701 targetport: type: 0 - intval: 58890 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -215,7 +209,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -230,57 +224,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] 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.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59701 hostport: 0 - containerport: 58890 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -292,25 +253,22 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-app-rules-engine valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -339,7 +297,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -366,20 +324,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-device-rest service: ports: - - name: tcp-4000 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 4000 + port: 59986 targetport: type: 0 - intval: 4000 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -401,7 +359,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -416,7 +374,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -425,15 +383,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.3.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59986 hostport: 0 - containerport: 4000 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -445,7 +403,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-ui-go + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -480,7 +438,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -507,29 +465,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-device-virtual service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59880 + port: 59900 targetport: type: 0 - intval: 59880 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -551,7 +500,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -566,7 +515,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -575,20 +524,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.3.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59900 hostport: 0 - containerport: 59880 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -600,7 +544,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -635,7 +579,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -662,20 +606,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-data service: ports: - - name: tcp-6379 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 6379 + port: 5563 targetport: type: 0 - intval: 6379 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -697,7 +650,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -712,57 +665,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:7.0.5-alpine + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-5563 hostport: 0 - containerport: 6379 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -772,18 +697,15 @@ versions: name: common-variable-levski optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-data + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -812,7 +734,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -839,20 +761,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-core-metadata service: ports: - - name: tcp-59720 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59720 + port: 59881 targetport: type: 0 - intval: 59720 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -874,7 +796,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -889,57 +811,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: kuiper-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.7.1-alpine + - name: edgex-core-metadata + image: openyurt/core-metadata:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59881 hostport: 0 - containerport: 59720 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -950,50 +839,17 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -1022,7 +878,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -1049,20 +905,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-command service: ports: - - name: tcp-59986 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59986 + port: 59882 targetport: type: 0 - intval: 59986 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -1084,7 +940,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -1099,7 +955,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -1108,15 +964,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-core-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59882 hostport: 0 - containerport: 59986 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -1127,8 +983,14 @@ versions: optional: null secretref: null env: + - name: MESSAGEQUEUE_INTERNAL_HOST + value: edgex-redis + valuefrom: null + - name: MESSAGEQUEUE_EXTERNAL_URL + value: tcp://edgex-mqtt-broker:1883 + valuefrom: null - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-core-command valuefrom: null resources: limits: {} @@ -1163,7 +1025,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -1190,20 +1052,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-ui-go service: ports: - - name: tcp-59701 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59701 + port: 4000 targetport: type: 0 - intval: 59701 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -1225,7 +1087,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -1240,7 +1102,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] @@ -1249,15 +1111,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.3.0 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-4000 hostport: 0 - containerport: 59701 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -1268,17 +1130,8 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine + value: edgex-ui-go valuefrom: null resources: limits: {} @@ -1313,7 +1166,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -1340,20 +1193,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-core-consul service: ports: - - name: tcp-59882 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59882 + port: 8500 targetport: type: 0 - intval: 59882 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -1375,7 +1228,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -1390,171 +1243,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-core-command - image: openyurt/core-command:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59882 - hostport: 0 - containerport: 59882 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-command - valuefrom: null - - name: MESSAGEQUEUE_INTERNAL_HOST - value: edgex-redis - valuefrom: null - - name: MESSAGEQUEUE_EXTERNAL_URL - value: tcp://edgex-mqtt-broker:1883 - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: [] - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-command - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-support-notifications - service: - ports: - - name: tcp-59860 - protocol: TCP - appprotocol: null - port: 59860 - targetport: - type: 0 - intval: 59860 - strval: "" - nodeport: 0 - selector: - app: edgex-support-notifications - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-support-notifications - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-support-notifications - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.3.0 + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-8500 hostport: 0 - containerport: 59860 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -1564,15 +1336,24 @@ versions: name: common-variable-levski optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-support-notifications - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -1601,7 +1382,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -1628,20 +1409,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-redis service: ports: - - name: tcp-59881 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59881 + port: 6379 targetport: type: 0 - intval: 59881 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -1663,7 +1444,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -1678,24 +1459,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.3.0 + - name: edgex-redis + image: openyurt/redis:7.0.5-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-6379 hostport: 0 - containerport: 59881 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -1705,18 +1519,18 @@ versions: name: common-variable-levski optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -1745,7 +1559,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -1772,20 +1586,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-8500 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 8500 + port: 58890 targetport: type: 0 - intval: 8500 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -1807,7 +1621,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -1822,52 +1636,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1897,15 +1678,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.13.2 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-58890 hostport: 0 - containerport: 8500 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -1915,21 +1696,24 @@ versions: name: common-variable-levski optional: null secretref: null - env: [] + env: + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: METRICSMECHANISM + value: executor + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: anonymous-volume1 readonly: false - mountpath: /consul/data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -1961,7 +1745,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -1988,20 +1772,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-kuiper service: ports: - - name: tcp-59900 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59900 + port: 59720 targetport: type: 0 - intval: 59900 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -2023,7 +1807,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -2038,24 +1822,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: kuiper-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.3.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59720 hostport: 0 - containerport: 59900 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -2066,14 +1883,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -2102,7 +1955,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -2129,54 +1982,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: jakarta - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-jakarta - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - - name: edgex-app-rules-engine + - name: edgex-support-scheduler service: ports: - - name: tcp-59701 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59701 + port: 59861 targetport: type: 0 - intval: 59701 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -2198,7 +2017,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -2213,7 +2032,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -2222,36 +2041,33 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59861 hostport: 0 - containerport: 59701 + containerport: 59861 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-levski optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + value: edgex-support-scheduler valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2286,7 +2102,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -2313,20 +2129,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - versionName: jakarta + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-jakarta + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-device-virtual service: ports: - - name: tcp-8500 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 8500 + port: 59900 targetport: type: 0 - intval: 8500 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -2348,7 +2198,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -2363,90 +2213,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59900 hostport: 0 - containerport: 8500 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -2456,24 +2240,15 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-device-virtual + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data - readonly: false - mountpath: /consul/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -2502,7 +2277,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -2529,20 +2304,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-kuiper service: ports: - - name: tcp-59986 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59986 + port: 59720 targetport: type: 0 - intval: 59986 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -2564,7 +2339,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -2579,24 +2354,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: kuiper-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.1.1 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59720 hostport: 0 - containerport: 59986 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -2607,14 +2415,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -2643,7 +2487,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -2670,20 +2514,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-support-scheduler service: ports: - - name: tcp-59860 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59860 + port: 59861 targetport: type: 0 - intval: 59860 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -2705,7 +2549,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -2720,7 +2564,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -2729,15 +2573,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59861 hostport: 0 - containerport: 59860 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -2748,8 +2592,14 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2784,7 +2634,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -2811,20 +2661,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-command service: ports: - - name: tcp-59881 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59881 + port: 59882 targetport: type: 0 - intval: 59881 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -2846,7 +2696,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -2861,7 +2711,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -2870,15 +2720,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59882 hostport: 0 - containerport: 59881 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -2889,11 +2739,8 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-core-command valuefrom: null resources: limits: {} @@ -2928,7 +2775,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -2955,20 +2802,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-core-metadata service: ports: - - name: tcp-59882 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59882 + port: 59881 targetport: type: 0 - intval: 59882 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -2990,7 +2837,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -3005,7 +2852,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -3014,15 +2861,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.1.1 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59881 hostport: 0 - containerport: 59882 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -3033,8 +2880,11 @@ versions: optional: null secretref: null env: + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata + valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -3069,7 +2919,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -3096,20 +2946,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-core-data service: ports: - - name: tcp-59720 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59720 + port: 5563 targetport: type: 0 - intval: 59720 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -3131,7 +2990,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -3146,57 +3005,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: kuiper-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine + - name: edgex-core-data + image: openyurt/core-data:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-5563 hostport: 0 - containerport: 59720 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -3207,50 +3038,14 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -3279,7 +3074,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -3306,20 +3101,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-device-rest service: ports: - - name: tcp-4000 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 4000 + port: 59986 targetport: type: 0 - intval: 4000 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -3341,7 +3136,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -3356,7 +3151,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -3365,15 +3160,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.1.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59986 hostport: 0 - containerport: 4000 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -3383,7 +3178,10 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-device-rest + valuefrom: null resources: limits: {} requests: {} @@ -3417,7 +3215,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -3444,20 +3242,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-app-rules-engine service: ports: - - name: tcp-6379 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 6379 + port: 59701 targetport: type: 0 - intval: 6379 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -3479,7 +3277,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -3494,57 +3292,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59701 hostport: 0 - containerport: 6379 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -3554,18 +3319,24 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -3594,7 +3365,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -3621,29 +3392,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59880 + port: 58890 targetport: type: 0 - intval: 59880 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -3665,7 +3427,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -3680,29 +3442,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: anonymous-volume1 + volumesource: + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.1.1 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-58890 hostport: 0 - containerport: 59880 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -3714,13 +3504,25 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data + value: edgex-sys-mgmt-agent + valuefrom: null + - name: METRICSMECHANISM + value: executor + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -3749,7 +3551,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -3776,20 +3578,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-core-consul service: ports: - - name: tcp-59900 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59900 + port: 8500 targetport: type: 0 - intval: 59900 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -3811,7 +3613,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -3826,24 +3628,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-core-consul + image: openyurt/consul:1.10.3 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-8500 hostport: 0 - containerport: 59900 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -3853,15 +3721,24 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -3890,7 +3767,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -3917,20 +3794,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-redis service: ports: - - name: tcp-59861 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59861 + port: 6379 targetport: type: 0 - intval: 59861 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -3952,7 +3829,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -3967,24 +3844,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-6379 hostport: 0 - containerport: 59861 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -3994,21 +3904,18 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -4037,7 +3944,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -4064,20 +3971,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-ui-go service: ports: - - name: tcp-58890 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 58890 + port: 4000 targetport: type: 0 - intval: 58890 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -4099,7 +4006,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -4114,87 +4021,39 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.1.1 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.1.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-4000 hostport: 0 - containerport: 58890 + containerport: 4000 protocol: TCP hostip: "" envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-jakarta + optional: null + secretref: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -4223,7 +4082,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -4250,54 +4109,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: kamakura - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-kamakura - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - - name: edgex-support-scheduler + - name: edgex-support-notifications service: ports: - - name: tcp-59861 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59861 + port: 59860 targetport: type: 0 - intval: 59861 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -4319,7 +4144,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -4334,7 +4159,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -4343,33 +4168,27 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59860 hostport: 0 - containerport: 59861 + containerport: 59860 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-jakarta optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -4404,7 +4223,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -4431,20 +4250,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - versionName: kamakura + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-kamakura + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-app-rules-engine service: ports: - - name: tcp-58890 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 58890 + port: 59701 targetport: type: 0 - intval: 58890 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -4466,7 +4319,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -4481,57 +4334,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.2.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59701 hostport: 0 - containerport: 58890 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -4542,26 +4362,23 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-app-rules-engine valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -4590,7 +4407,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -4617,20 +4434,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-command service: ports: - - name: tcp-59860 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59860 + port: 59882 targetport: type: 0 - intval: 59860 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -4652,7 +4469,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -4667,7 +4484,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -4676,15 +4493,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.2.0 + - name: edgex-core-command + image: openyurt/core-command:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59882 hostport: 0 - containerport: 59860 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -4696,7 +4513,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-command valuefrom: null resources: limits: {} @@ -4731,7 +4548,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -4758,20 +4575,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-core-consul service: ports: - - name: tcp-59900 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59900 + port: 8500 targetport: type: 0 - intval: 59900 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -4793,7 +4610,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -4808,24 +4625,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-core-consul + image: openyurt/consul:1.10.10 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-8500 hostport: 0 - containerport: 59900 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -4835,15 +4718,24 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -4872,7 +4764,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -4899,20 +4791,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-device-rest service: ports: - - name: tcp-59720 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59720 + port: 59986 targetport: type: 0 - intval: 59720 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -4934,7 +4826,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -4949,57 +4841,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: kuiper-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59986 hostport: 0 - containerport: 59720 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -5010,50 +4869,14 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis + - name: SERVICE_HOST + value: edgex-device-rest valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -5082,7 +4905,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -5109,29 +4932,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-core-metadata service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59880 + port: 59881 targetport: type: 0 - intval: 59880 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -5153,7 +4967,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -5168,7 +4982,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -5177,20 +4991,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59881 hostport: 0 - containerport: 59880 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -5202,7 +5011,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -5237,7 +5049,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -5264,20 +5076,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-redis service: ports: - - name: tcp-59701 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59701 + port: 6379 targetport: type: 0 - intval: 59701 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -5299,7 +5111,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -5314,24 +5126,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-6379 hostport: 0 - containerport: 59701 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -5341,24 +5186,18 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5387,7 +5226,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -5414,20 +5253,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-kuiper service: ports: - - name: tcp-4000 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 4000 + port: 59720 targetport: type: 0 - intval: 4000 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -5449,7 +5288,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -5464,24 +5303,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: kuiper-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.2.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59720 hostport: 0 - containerport: 4000 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -5491,12 +5363,51 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5525,7 +5436,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -5552,20 +5463,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-ui-go service: ports: - - name: tcp-59881 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59881 + port: 4000 targetport: type: 0 - intval: 59881 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -5587,7 +5498,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -5602,7 +5513,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] @@ -5611,15 +5522,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.2.0 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-4000 hostport: 0 - containerport: 59881 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -5629,13 +5540,7 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null + env: [] resources: limits: {} requests: {} @@ -5669,7 +5574,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -5696,20 +5601,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-8500 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 8500 + port: 58890 targetport: type: 0 - intval: 8500 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -5724,74 +5629,41 @@ versions: sessionaffinityconfig: null ipfamilies: [] ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-core-consul - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-consul - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null + deployment: + replicas: null + selector: + matchlabels: + app: edgex-sys-mgmt-agent + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-sys-mgmt-agent + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -5821,15 +5693,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.10 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-58890 hostport: 0 - containerport: 8500 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -5839,21 +5711,24 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: METRICSMECHANISM + value: executor + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: anonymous-volume1 readonly: false - mountpath: /consul/data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -5885,7 +5760,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -5912,20 +5787,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-device-virtual service: ports: - - name: tcp-59986 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59986 + port: 59900 targetport: type: 0 - intval: 59986 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -5947,7 +5822,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -5962,7 +5837,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -5971,15 +5846,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.2.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59900 hostport: 0 - containerport: 59986 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -5991,7 +5866,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -6026,7 +5901,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -6053,20 +5928,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-support-scheduler service: ports: - - name: tcp-59882 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59882 + port: 59861 targetport: type: 0 - intval: 59882 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -6088,7 +5963,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -6103,7 +5978,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -6112,15 +5987,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.2.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59861 hostport: 0 - containerport: 59882 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -6131,8 +6006,14 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -6167,7 +6048,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -6194,20 +6075,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-data service: ports: - - name: tcp-6379 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 6379 + port: 5563 targetport: type: 0 - intval: 6379 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -6229,7 +6119,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -6244,57 +6134,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-core-data + image: openyurt/core-data:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-5563 hostport: 0 - containerport: 6379 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -6304,18 +6166,15 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-data + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -6344,7 +6203,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -6371,54 +6230,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: ireland - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-ireland - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - - name: edgex-core-metadata + - name: edgex-support-notifications service: ports: - - name: tcp-59881 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59881 + port: 59860 targetport: type: 0 - intval: 59881 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -6440,7 +6265,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -6455,7 +6280,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -6464,30 +6289,27 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.0.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59860 hostport: 0 - containerport: 59881 + containerport: 59860 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -6522,7 +6344,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -6549,20 +6371,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - versionName: ireland + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-ireland + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-device-rest service: ports: - - name: tcp-59861 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59861 + port: 59986 targetport: type: 0 - intval: 59861 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -6584,7 +6440,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -6599,7 +6455,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -6608,15 +6464,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.0.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59986 hostport: 0 - containerport: 59861 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -6627,14 +6483,8 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -6669,7 +6519,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -6696,20 +6546,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-redis service: ports: - - name: tcp-8500 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 8500 + port: 6379 targetport: type: 0 - intval: 8500 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -6731,7 +6581,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -6746,47 +6596,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data + - name: db-data volumesource: hostpath: null emptydir: @@ -6821,15 +6638,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.9.5 + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-6379 hostport: 0 - containerport: 8500 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -6845,15 +6662,9 @@ versions: requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: db-data readonly: false - mountpath: /consul/data + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -6885,7 +6696,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -6912,20 +6723,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-support-scheduler service: ports: - - name: tcp-59860 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59860 + port: 59861 targetport: type: 0 - intval: 59860 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -6947,7 +6758,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -6962,7 +6773,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -6971,15 +6782,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59861 hostport: 0 - containerport: 59860 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -6991,7 +6802,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -7026,7 +6843,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -7053,20 +6870,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-core-command service: ports: - - name: tcp-58890 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 58890 + port: 59882 targetport: type: 0 - intval: 58890 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -7088,7 +6905,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -7103,87 +6920,42 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.0.0 + - name: edgex-core-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59882 hostport: 0 - containerport: 58890 + containerport: 59882 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland - optional: null - secretref: null - env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null + name: common-variable-ireland + optional: null + secretref: null + env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-core-command valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -7212,7 +6984,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -7239,20 +7011,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-core-consul service: ports: - - name: tcp-59701 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59701 + port: 8500 targetport: type: 0 - intval: 59701 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -7274,7 +7046,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -7289,24 +7061,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.0.1 + - name: edgex-core-consul + image: openyurt/consul:1.9.5 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-8500 hostport: 0 - containerport: 59701 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -7316,24 +7154,24 @@ versions: name: common-variable-ireland optional: null secretref: null - env: - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7362,7 +7200,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -7389,20 +7227,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-core-data service: ports: - - name: tcp-59882 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59882 + port: 5563 targetport: type: 0 - intval: 59882 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -7424,7 +7271,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -7439,7 +7286,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -7448,15 +7295,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-core-data + image: openyurt/core-data:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-5563 hostport: 0 - containerport: 59882 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -7468,7 +7320,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-data valuefrom: null resources: limits: {} @@ -7503,7 +7355,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -7530,29 +7382,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59880 + port: 58890 targetport: type: 0 - intval: 59880 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -7574,7 +7417,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -7589,29 +7432,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: anonymous-volume1 + volumesource: + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.0.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-58890 hostport: 0 - containerport: 59880 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -7622,14 +7493,26 @@ versions: optional: null secretref: null env: + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null - name: SERVICE_HOST - value: edgex-core-data + value: edgex-sys-mgmt-agent + valuefrom: null + - name: METRICSMECHANISM + value: executor valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7658,7 +7541,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -7685,20 +7568,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-metadata service: ports: - - name: tcp-6379 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 6379 + port: 59881 targetport: type: 0 - intval: 6379 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -7720,7 +7603,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -7735,57 +7618,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.4-alpine + - name: edgex-core-metadata + image: openyurt/core-metadata:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59881 hostport: 0 - containerport: 6379 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -7795,18 +7645,18 @@ versions: name: common-variable-ireland optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -7835,7 +7685,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -7862,20 +7712,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-kuiper service: ports: - - name: tcp-59900 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59900 + port: 59720 targetport: type: 0 - intval: 59900 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -7897,7 +7747,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -7912,24 +7762,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: kuiper-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.0.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.3.0-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59720 hostport: 0 - containerport: 59900 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -7940,14 +7823,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7976,7 +7883,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -8003,20 +7910,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-device-virtual service: ports: - - name: tcp-59986 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59986 + port: 59900 targetport: type: 0 - intval: 59986 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -8038,7 +7945,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -8053,7 +7960,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -8062,15 +7969,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.0.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59900 hostport: 0 - containerport: 59986 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -8082,7 +7989,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -8117,7 +8024,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -8144,20 +8051,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-support-notifications service: ports: - - name: tcp-59720 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59720 + port: 59860 targetport: type: 0 - intval: 59720 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -8179,7 +8086,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -8189,62 +8096,29 @@ versions: selflink: "" uid: "" resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-kuiper - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: kuiper-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-support-notifications + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.3.0-alpine + - name: edgex-support-notifications + image: openyurt/support-notifications:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59860 hostport: 0 - containerport: 59720 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -8255,38 +8129,14 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: SERVICE_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -8315,7 +8165,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -8342,58 +8192,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: hanoi - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-hanoi - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_COMMAND_HOST: edgex-core-command - CLIENTS_COREDATA_HOST: edgex-core-data - CLIENTS_DATA_HOST: edgex-core-data - CLIENTS_METADATA_HOST: edgex-core-metadata - CLIENTS_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_RULESENGINE_HOST: edgex-kuiper - CLIENTS_SCHEDULER_HOST: edgex-support-scheduler - CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - LOGGING_ENABLEREMOTE: "false" - REGISTRY_HOST: edgex-core-consul - SERVICE_SERVERBINDADDR: 0.0.0.0 - binarydata: {} - components: - - name: edgex-core-command + - name: edgex-app-rules-engine service: ports: - - name: tcp-48082 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 48082 + port: 59701 targetport: type: 0 - intval: 48082 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -8415,7 +8227,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -8430,7 +8242,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -8439,27 +8251,36 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48082 + - name: tcp-59701 hostport: 0 - containerport: 48082 + containerport: 59701 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-hanoi + name: common-variable-ireland optional: null secretref: null env: + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-app-rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} @@ -8494,7 +8315,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -8521,29 +8342,58 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - versionName: hanoi + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-hanoi + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_COMMAND_HOST: edgex-core-command + CLIENTS_COREDATA_HOST: edgex-core-data + CLIENTS_DATA_HOST: edgex-core-data + CLIENTS_METADATA_HOST: edgex-core-metadata + CLIENTS_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_RULESENGINE_HOST: edgex-kuiper + CLIENTS_SCHEDULER_HOST: edgex-support-scheduler + CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + LOGGING_ENABLEREMOTE: "false" + REGISTRY_HOST: edgex-core-consul + SERVICE_SERVERBINDADDR: 0.0.0.0 + binarydata: {} + components: + - name: edgex-support-scheduler service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-48080 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 48080 + port: 48085 targetport: type: 0 - intval: 48080 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -8565,7 +8415,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -8580,7 +8430,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -8589,20 +8439,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-48080 + - name: tcp-48085 hostport: 0 - containerport: 48080 + containerport: 48085 protocol: TCP hostip: "" envfrom: @@ -8613,7 +8458,13 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST value: edgex-core-data valuefrom: null resources: @@ -8649,7 +8500,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -8676,20 +8527,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-48085 + - name: tcp-48090 protocol: TCP appprotocol: null - port: 48085 + port: 48090 targetport: type: 0 - intval: 48085 + intval: 48090 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -8711,7 +8562,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -8726,24 +8577,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: anonymous-volume1 + volumesource: + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/docker-support-scheduler-go:1.3.1 + - name: edgex-sys-mgmt-agent + image: openyurt/docker-sys-mgmt-agent-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48085 + - name: tcp-48090 hostport: 0 - containerport: 48085 + containerport: 48090 protocol: TCP hostip: "" envfrom: @@ -8754,20 +8638,26 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: METRICSMECHANISM + value: executor valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler + value: edgex-sys-mgmt-agent valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -8796,7 +8686,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -8823,20 +8713,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-kuiper service: ports: - - name: tcp-49990 + - name: tcp-20498 protocol: TCP appprotocol: null - port: 49990 + port: 20498 targetport: type: 0 - intval: 49990 + intval: 20498 + strval: "" + nodeport: 0 + - name: tcp-48075 + protocol: TCP + appprotocol: null + port: 48075 + targetport: + type: 0 + intval: 48075 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -8858,7 +8757,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -8873,7 +8772,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -8882,15 +8781,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/docker-device-virtual-go:1.3.1 + - name: edgex-kuiper + image: openyurt/kuiper:1.1.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-49990 + - name: tcp-20498 hostport: 0 - containerport: 49990 + containerport: 20498 + protocol: TCP + hostip: "" + - name: tcp-48075 + hostport: 0 + containerport: 48075 protocol: TCP hostip: "" envfrom: @@ -8901,8 +8805,26 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: EDGEX__DEFAULT__PORT + value: "5566" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: tcp + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-app-service-configurable-rules + valuefrom: null + - name: EDGEX__DEFAULT__SERVICESERVER + value: http://edgex-core-data:48080 + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "48075" valuefrom: null resources: limits: {} @@ -8937,7 +8859,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -8964,20 +8886,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-data service: ports: - - name: tcp-49986 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 49986 + port: 5563 targetport: type: 0 - intval: 49986 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-48080 + protocol: TCP + appprotocol: null + port: 48080 + targetport: + type: 0 + intval: 48080 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -8999,7 +8930,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -9014,7 +8945,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -9023,15 +8954,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/docker-device-rest-go:1.2.1 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-49986 + - name: tcp-5563 hostport: 0 - containerport: 49986 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 protocol: TCP hostip: "" envfrom: @@ -9043,7 +8979,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-core-data valuefrom: null resources: limits: {} @@ -9078,7 +9014,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -9105,20 +9041,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-redis service: ports: - - name: tcp-8500 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 8500 + port: 6379 targetport: type: 0 - intval: 8500 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -9140,7 +9076,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -9155,80 +9091,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-scripts + - name: db-data volumesource: hostpath: null emptydir: @@ -9263,15 +9133,159 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/docker-edgex-consul:1.3.0 + - name: edgex-redis + image: openyurt/redis:6.0.9-alpine + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-6379 + hostport: 0 + containerport: 6379 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-hanoi + optional: null + secretref: null + env: [] + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-redis + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-device-virtual + service: + ports: + - name: tcp-49990 + protocol: TCP + appprotocol: null + port: 49990 + targetport: + type: 0 + intval: 49990 + strval: "" + nodeport: 0 + selector: + app: edgex-device-virtual + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null + deployment: + replicas: null + selector: + matchlabels: + app: edgex-device-virtual + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-device-virtual + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] + initcontainers: [] + containers: + - name: edgex-device-virtual + image: openyurt/docker-device-virtual-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-49990 hostport: 0 - containerport: 8500 + containerport: 49990 protocol: TCP hostip: "" envfrom: @@ -9282,35 +9296,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_DB - value: redis - valuefrom: null - - name: EDGEX_SECURE - value: "false" + - name: SERVICE_HOST + value: edgex-device-virtual valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data - readonly: false - mountpath: /consul/data - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -9339,7 +9332,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -9366,29 +9359,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-core-command service: ports: - - name: tcp-20498 - protocol: TCP - appprotocol: null - port: 20498 - targetport: - type: 0 - intval: 20498 - strval: "" - nodeport: 0 - - name: tcp-48075 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 48075 + port: 48082 targetport: type: 0 - intval: 48075 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -9410,7 +9394,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -9425,7 +9409,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -9434,20 +9418,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/kuiper:1.1.1-alpine + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-20498 - hostport: 0 - containerport: 20498 - protocol: TCP - hostip: "" - - name: tcp-48075 + - name: tcp-48082 hostport: 0 - containerport: 48075 + containerport: 48082 protocol: TCP hostip: "" envfrom: @@ -9458,26 +9437,8 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__TOPIC - value: events - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "48075" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "5566" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: tcp - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-app-service-configurable-rules - valuefrom: null - - name: EDGEX__DEFAULT__SERVICESERVER - value: http://edgex-core-data:48080 + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null resources: limits: {} @@ -9512,7 +9473,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -9539,20 +9500,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-consul service: ports: - - name: tcp-48081 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 48081 + port: 8500 targetport: type: 0 - intval: 48081 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -9574,7 +9535,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -9589,24 +9550,123 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-scripts + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: edgex-core-consul + image: openyurt/docker-edgex-consul:1.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-8500 hostport: 0 - containerport: 48081 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -9617,17 +9677,35 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: EDGEX_DB + value: redis valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata + - name: EDGEX_SECURE + value: "false" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -9656,7 +9734,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -9761,20 +9839,20 @@ versions: optional: null secretref: null env: - - name: MESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-core-data + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - name: SERVICE_PORT value: "48100" valuefrom: null - - name: SERVICE_HOST - value: edgex-app-service-configurable-rules + - name: MESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-core-data valuefrom: null - name: BINDING_PUBLISHTOPIC value: events valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: SERVICE_HOST + value: edgex-app-service-configurable-rules valuefrom: null resources: limits: {} @@ -9836,20 +9914,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-device-rest service: ports: - - name: tcp-48090 + - name: tcp-49986 protocol: TCP appprotocol: null - port: 48090 + port: 49986 targetport: type: 0 - intval: 48090 + intval: 49986 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -9871,7 +9949,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -9886,57 +9964,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/docker-sys-mgmt-agent-go:1.3.1 + - name: edgex-device-rest + image: openyurt/docker-device-rest-go:1.2.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48090 + - name: tcp-49986 hostport: 0 - containerport: 48090 + containerport: 49986 protocol: TCP hostip: "" envfrom: @@ -9947,26 +9992,14 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-device-rest valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -9995,7 +10028,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -10022,20 +10055,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-metadata service: ports: - - name: tcp-6379 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 6379 + port: 48081 targetport: type: 0 - intval: 6379 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -10057,7 +10090,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -10072,57 +10105,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.0.9-alpine + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-48081 hostport: 0 - containerport: 6379 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -10132,18 +10132,18 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -10172,7 +10172,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" diff --git a/EdgeXConfig/config.yaml b/EdgeXConfig/config.yaml index e5010eb..70495be 100644 --- a/EdgeXConfig/config.yaml +++ b/EdgeXConfig/config.yaml @@ -56,12 +56,42 @@ versions: STAGEGATE_WAITFOR_TIMEOUT: 60s binarydata: {} components: - - name: edgex-security-proxy-setup + - name: edgex-core-command + service: + ports: + - name: tcp-59882 + protocol: TCP + appprotocol: null + port: 59882 + targetport: + type: 0 + intval: 59882 + strval: "" + nodeport: 0 + selector: + app: edgex-core-command + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -76,7 +106,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -116,43 +146,10 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -184,12 +181,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.3.0 + - name: edgex-core-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59882 + hostport: 0 + containerport: 59882 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -198,38 +200,14 @@ versions: optional: null secretref: null env: - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual - valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST + - name: SERVICE_HOST value: edgex-core-command valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent + - name: MESSAGEQUEUE_INTERNAL_HOST + value: edgex-redis + valuefrom: null + - name: MESSAGEQUEUE_EXTERNAL_URL + value: tcp://edgex-mqtt-broker:1883 valuefrom: null resources: limits: {} @@ -242,15 +220,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token - readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /tmp/edgex/secrets/core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -282,7 +254,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -528,20 +500,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-device-rest service: ports: - - name: tcp-59701 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59701 + port: 59986 targetport: type: 0 - intval: 59701 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -563,7 +535,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -578,7 +550,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -621,7 +593,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -653,15 +625,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.3.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59986 hostport: 0 - containerport: 59701 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -672,17 +644,8 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -697,7 +660,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -729,7 +692,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -756,38 +719,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-support-notifications service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-8100 - protocol: TCP - appprotocol: null - port: 8100 - targetport: - type: 0 - intval: 8100 - strval: "" - nodeport: 0 - - name: tcp-8443 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 8443 + port: 59860 targetport: type: 0 - intval: 8443 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -809,7 +754,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -824,47 +769,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -897,111 +809,12 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/security-proxy-setup - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: postgres-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/support-notifications + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1031,25 +844,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.8.1 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 + - name: tcp-59860 hostport: 0 - containerport: 8443 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -1060,62 +863,14 @@ versions: optional: null secretref: null env: - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME - valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" + - name: SERVICE_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -1124,19 +879,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config - readonly: false - mountpath: /tmp/postgres-config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -1168,7 +911,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -1195,12 +938,51 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-core-data + service: + ports: + - name: tcp-5563 + protocol: TCP + appprotocol: null + port: 5563 + targetport: + type: 0 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 + strval: "" + nodeport: 0 + selector: + app: edgex-core-data + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -1215,7 +997,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -1255,14 +1037,57 @@ versions: storageos: null csi: null ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/core-data + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.3.0 + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-5563 + hostport: 0 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -1271,11 +1096,11 @@ versions: optional: null secretref: null env: - - name: EDGEX_USER - value: "2002" + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} @@ -1288,6 +1113,12 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -1316,7 +1147,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -1343,20 +1174,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-kuiper service: ports: - - name: tcp-59860 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59860 + port: 59720 targetport: type: 0 - intval: 59860 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -1378,7 +1209,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -1393,7 +1224,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -1433,12 +1264,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data volumesource: - hostpath: - path: /tmp/edgex/secrets/support-notifications - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-connections + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-sources + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1468,15 +1365,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.3.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59720 hostport: 0 - containerport: 59860 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -1487,8 +1384,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis valuefrom: null resources: limits: {} @@ -1501,9 +1428,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /kuiper/etc/connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-sources + readonly: false + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -1535,7 +1474,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -1562,12 +1501,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - name: edgex-sys-mgmt-agent + service: + ports: + - name: tcp-58890 + protocol: TCP + appprotocol: null + port: 58890 + targetport: + type: 0 + intval: 58890 + strval: "" + nodeport: 0 + selector: + app: edgex-sys-mgmt-agent + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -1582,14 +1551,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -1622,12 +1591,12 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/sys-mgmt-agent + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1655,177 +1624,12 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-sources - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-connections - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1855,12 +1659,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.3.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.3.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-58890 + hostport: 0 + containerport: 58890 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -1869,38 +1678,20 @@ versions: optional: null secretref: null env: - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual] - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /vault - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -1909,31 +1700,13 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /tmp/kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-sources - readonly: false - mountpath: /tmp/kuiper - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections - readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume2 readonly: false - mountpath: /vault/config + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -1965,7 +1738,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -2133,42 +1906,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command - service: - ports: - - name: tcp-59882 - protocol: TCP - appprotocol: null - port: 59882 - targetport: - type: 0 - intval: 59882 - strval: "" - nodeport: 0 - selector: - app: edgex-core-command - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -2183,14 +1926,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -2223,13 +1966,13 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/core-command - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null awselasticblockstore: null gitrepo: null secret: null @@ -2256,165 +1999,6 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-core-command - image: openyurt/core-command:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59882 - hostport: 0 - containerport: 59882 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-command - valuefrom: null - - name: MESSAGEQUEUE_EXTERNAL_URL - value: tcp://edgex-mqtt-broker:1883 - valuefrom: null - - name: MESSAGEQUEUE_INTERNAL_HOST - value: edgex-redis - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-command - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-command - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-core-metadata - service: - ports: - - name: tcp-59881 - protocol: TCP - appprotocol: null - port: 59881 - targetport: - type: 0 - intval: 59881 - strval: "" - nodeport: 0 - selector: - app: edgex-core-metadata - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-core-metadata - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-metadata - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - name: edgex-init volumesource: hostpath: null @@ -2451,7 +2035,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-metadata + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -2481,163 +2065,7 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59881 - hostport: 0 - containerport: 59881 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-metadata - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-metadata - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-redis - service: - ports: - - name: tcp-6379 - protocol: TCP - appprotocol: null - port: 6379 - targetport: - type: 0 - intval: 6379 - strval: "" - nodeport: 0 - selector: - app: edgex-redis - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-redis - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-redis - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 + - name: kong volumesource: hostpath: null emptydir: @@ -2670,7 +2098,7 @@ versions: storageos: null csi: null ephemeral: null - - name: db-data + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -2703,7 +2131,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -2736,7 +2164,7 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config + - name: vault-config volumesource: hostpath: null emptydir: @@ -2769,52 +2197,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:7.0.5-alpine + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.3.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-6379 - hostport: 0 - containerport: 6379 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -2823,11 +2213,20 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual] valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: SECUREMESSAGEBUS_TYPE + value: redis + valuefrom: null + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: ADD_SECRETSTORE_TOKENS + value: "" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -2840,9 +2239,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: db-data + - name: tmpfs-volume2 readonly: false - mountpath: /data + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -2852,15 +2251,33 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config + - name: anonymous-volume1 readonly: false - mountpath: /run/redis/conf + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kong readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + mountpath: /tmp/kong + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-sources + readonly: false + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /tmp/kuiper-connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -2892,7 +2309,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -2919,20 +2336,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-kong-db service: ports: - - name: tcp-58890 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 58890 + port: 5432 targetport: type: 0 - intval: 58890 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -2954,7 +2371,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -2969,13 +2386,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -3009,12 +2525,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: postgres-config volumesource: - hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -3042,12 +2558,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: postgres-data volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -3077,15 +2593,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.3.0 + - name: edgex-kong-db + image: openyurt/postgres:13.8-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-5432 hostport: 0 - containerport: 58890 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -3096,35 +2612,53 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: POSTGRES_USER + value: kong valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: POSTGRES_DB + value: kong valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: postgres-config readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: postgres-data readonly: false - mountpath: /var/run/docker.sock + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -3156,7 +2690,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -3183,20 +2717,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-core-metadata service: ports: - - name: tcp-8200 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 8200 + port: 59881 targetport: type: 0 - intval: 8200 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -3218,7 +2752,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -3233,46 +2767,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -3306,45 +2807,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-logs + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/core-metadata + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -3374,15 +2842,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.11.4 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59881 hostport: 0 - containerport: 8200 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -3393,41 +2861,26 @@ versions: optional: null secretref: null env: - - name: VAULT_ADDR - value: http://edgex-vault:8200 - valuefrom: null - - name: VAULT_UI - value: "true" + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file - readonly: false - mountpath: /vault/file - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-logs + - name: anonymous-volume1 readonly: false - mountpath: /vault/logs + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -3459,7 +2912,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -3486,20 +2939,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-redis service: ports: - - name: tcp-59861 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59861 + port: 6379 targetport: type: 0 - intval: 59861 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -3521,7 +2974,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -3536,13 +2989,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -3576,10 +3095,43 @@ versions: storageos: null csi: null ephemeral: null + - name: redis-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -3611,15 +3163,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.3.0 + - name: edgex-redis + image: openyurt/redis:7.0.5-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-6379 hostport: 0 - containerport: 59861 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -3630,29 +3182,44 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" + - name: redis-config + readonly: false + mountpath: /run/redis/conf + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -3684,7 +3251,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -3711,20 +3278,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-kong service: ports: - - name: tcp-59720 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59720 + port: 8000 targetport: type: 0 - intval: 59720 + intval: 8000 + strval: "" + nodeport: 0 + - name: tcp-8100 + protocol: TCP + appprotocol: null + port: 8100 + targetport: + type: 0 + intval: 8100 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -3746,7 +3331,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -3761,14 +3346,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -3801,7 +3386,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -3834,7 +3419,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: edgex-init volumesource: hostpath: null emptydir: @@ -3867,7 +3452,73 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/security-proxy-setup + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong volumesource: hostpath: null emptydir: @@ -3902,15 +3553,25 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.7.1-alpine + - name: edgex-kong + image: openyurt/kong:2.8.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-8000 + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" + - name: tcp-8100 hostport: 0 - containerport: 59720 + containerport: 8100 + protocol: TCP + hostip: "" + - name: tcp-8443 + hostport: 0 + containerport: 8443 protocol: TCP hostip: "" envfrom: @@ -3921,65 +3582,83 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: KONG_DNS_ORDER + value: LAST,A,CNAME valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" + - name: KONG_DNS_VALID_TTL + value: "1" valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: KONG_PG_HOST + value: edgex-kong-db valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: KONG_DATABASE + value: postgres valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/data + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: postgres-config readonly: false - mountpath: /kuiper/etc/connections + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: kong readonly: false - mountpath: /kuiper/etc/sources + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -4011,7 +3690,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -4038,20 +3717,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-consul service: ports: - - name: tcp-59986 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59986 + port: 8500 targetport: type: 0 - intval: 59986 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -4073,7 +3752,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -4088,13 +3767,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -4128,10 +3873,43 @@ versions: storageos: null csi: null ephemeral: null + - name: consul-acl-token + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + path: /tmp/edgex/secrets/edgex-consul type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -4163,15 +3941,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-8500 hostport: 0 - containerport: 59986 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -4182,23 +3960,56 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/mgmt_token.json + valuefrom: null + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: ADD_REGISTRY_ACL_ROLES + value: "" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -4230,7 +4041,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -4257,20 +4068,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-app-rules-engine service: ports: - - name: tcp-5432 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 5432 + port: 59701 targetport: type: 0 - intval: 5432 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -4292,7 +4103,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -4307,112 +4118,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume3 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -4446,45 +4158,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: postgres-data + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/app-rules-engine + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -4514,15 +4193,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.8-alpine + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-59701 hostport: 0 - containerport: 5432 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -4533,53 +4212,32 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - - name: POSTGRES_DB - value: kong + - name: SERVICE_HOST + value: edgex-app-rules-engine valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume3 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config - readonly: false - mountpath: /tmp/postgres-config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-data + - name: anonymous-volume1 readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -4611,7 +4269,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -4638,29 +4296,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-support-scheduler service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59880 + port: 59861 targetport: type: 0 - intval: 59880 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -4682,7 +4331,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -4697,7 +4346,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -4740,7 +4389,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -4772,20 +4421,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.3.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59861 hostport: 0 - containerport: 59880 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -4796,12 +4440,15 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: SERVICE_HOST + - name: INTERVALACTIONS_SCRUBPUSHED_HOST value: edgex-core-data valuefrom: null + - name: SERVICE_HOST + value: edgex-support-scheduler + valuefrom: null resources: limits: {} requests: {} @@ -4815,7 +4462,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -4847,7 +4494,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -4874,20 +4521,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-vault service: ports: - - name: tcp-8500 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 8500 + port: 8200 targetport: type: 0 - intval: 8500 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -4909,7 +4556,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -4924,14 +4571,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -4964,7 +4611,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-data + - name: edgex-init volumesource: hostpath: null emptydir: @@ -4997,7 +4644,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: vault-file volumesource: hostpath: null emptydir: @@ -5030,7 +4677,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: vault-logs volumesource: hostpath: null emptydir: @@ -5063,50 +4710,17 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.13.2 + - name: edgex-vault + image: openyurt/vault:1.11.4 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-8200 hostport: 0 - containerport: 8500 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -5117,38 +4731,23 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done - valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + - name: VAULT_UI + value: "true" valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/mgmt_token.json + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: tmpfs-volume1 readonly: false - mountpath: /consul/data + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -5158,15 +4757,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: vault-file readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: vault-logs readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -5198,7 +4797,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -5225,96 +4824,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: jakarta - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-jakarta - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: 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 - binarydata: {} - components: - - name: edgex-app-rules-engine - service: - ports: - - name: tcp-59701 - protocol: TCP - appprotocol: null - port: 59701 - targetport: - type: 0 - intval: 59701 - strval: "" - nodeport: 0 - selector: - app: edgex-app-rules-engine - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -5329,7 +4844,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -5369,10 +4884,43 @@ versions: storageos: null csi: null ephemeral: null + - name: consul-acl-token + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -5404,36 +4952,52 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.3.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59701 - hostport: 0 - containerport: 59701 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-levski optional: null secretref: null env: - - name: EDGEX_PROFILE - value: rules-engine + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual + valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -5446,9 +5010,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -5480,7 +5050,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -5507,42 +5077,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault - service: - ports: - - name: tcp-8200 - protocol: TCP - appprotocol: null - port: 8200 - targetport: - type: 0 - intval: 8200 - strval: "" - nodeport: 0 - selector: - app: edgex-vault - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -5557,46 +5097,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -5630,131 +5137,39 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-logs - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.4 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.3.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-8200 - hostport: 0 - containerport: 8200 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-levski optional: null secretref: null env: - - name: VAULT_ADDR - value: http://edgex-vault:8200 - valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: VAULT_UI - value: "true" + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file - readonly: false - mountpath: /vault/file - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-logs - readonly: false - mountpath: /vault/logs - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5783,7 +5198,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -5810,42 +5225,66 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db - service: - ports: - - name: tcp-5432 - protocol: TCP - appprotocol: null - port: 5432 - targetport: - type: 0 - intval: 5432 - strval: "" - nodeport: 0 - selector: - app: edgex-kong-db - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - versionName: jakarta + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-jakarta + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: 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 + binarydata: {} + components: + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -5860,7 +5299,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -5933,7 +5372,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -5966,12 +5405,12 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -5999,7 +5438,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kong volumesource: hostpath: null emptydir: @@ -6032,7 +5471,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -6052,203 +5491,20 @@ versions: cephfs: null flocker: null downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - initcontainers: [] - containers: - - name: edgex-kong-db - image: openyurt/postgres:13.4-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: - - name: POSTGRES_USER - value: kong - valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: POSTGRES_DB - value: kong - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume3 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config - readonly: false - mountpath: /tmp/postgres-config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-data - readonly: false - mountpath: /var/lib/postgresql/data - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-kong-db - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-core-command - service: - ports: - - name: tcp-59882 - protocol: TCP - appprotocol: null - port: 59882 - targetport: - type: 0 - intval: 59882 - strval: "" - nodeport: 0 - selector: - app: edgex-core-command - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-core-command - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-command - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: edgex-init + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -6281,12 +5537,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-config volumesource: - hostpath: - path: /tmp/edgex/secrets/core-command - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6316,17 +5572,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.1.1 + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59882 - hostport: 0 - containerport: 59882 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -6335,14 +5586,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-command + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: ADD_SECRETSTORE_TOKENS + value: "" + valuefrom: null + - name: SECUREMESSAGEBUS_TYPE + value: redis + valuefrom: null + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] + valuefrom: null + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /vault + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -6351,7 +5626,31 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /tmp/kong + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-sources + readonly: false + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /tmp/kuiper-connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -6383,7 +5682,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -6410,20 +5709,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-support-scheduler service: ports: - - name: tcp-59881 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59881 + port: 59861 targetport: type: 0 - intval: 59881 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -6445,7 +5744,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -6460,7 +5759,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -6503,7 +5802,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-metadata + path: /tmp/edgex/secrets/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -6535,15 +5834,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59861 hostport: 0 - containerport: 59881 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -6554,11 +5853,14 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -6573,7 +5875,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-metadata + mountpath: /tmp/edgex/secrets/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -6605,7 +5907,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -6632,12 +5934,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-core-command + service: + ports: + - name: tcp-59882 + protocol: TCP + appprotocol: null + port: 59882 + targetport: + type: 0 + intval: 59882 + strval: "" + nodeport: 0 + selector: + app: edgex-core-command + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -6652,7 +5984,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -6692,14 +6024,52 @@ versions: storageos: null csi: null ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/core-command + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.1.1 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59882 + hostport: 0 + containerport: 59882 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -6708,11 +6078,8 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null resources: limits: {} @@ -6725,6 +6092,12 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-command + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -6753,7 +6126,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -6780,20 +6153,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-kong-db service: ports: - - name: tcp-59860 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59860 + port: 5432 targetport: type: 0 - intval: 59860 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -6815,7 +6188,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -6830,13 +6203,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -6870,12 +6342,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: postgres-config volumesource: - hostpath: - path: /tmp/edgex/secrets/support-notifications - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: postgres-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6905,15 +6410,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 + - name: edgex-kong-db + image: openyurt/postgres:13.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-5432 hostport: 0 - containerport: 59860 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -6924,23 +6429,53 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: POSTGRES_DB + value: kong + valuefrom: null + - name: POSTGRES_USER + value: kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: postgres-config readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-data + readonly: false + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -6972,7 +6507,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -6999,42 +6534,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual - service: - ports: - - name: tcp-59900 - protocol: TCP - appprotocol: null - port: 59900 - targetport: - type: 0 - intval: 59900 - strval: "" - nodeport: 0 - selector: - app: edgex-device-virtual - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -7049,7 +6554,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -7089,52 +6594,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/device-virtual - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59900 - hostport: 0 - containerport: 59900 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -7143,8 +6610,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: EDGEX_USER + value: "2002" valuefrom: null resources: limits: {} @@ -7157,12 +6627,6 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/device-virtual - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7191,7 +6655,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -7218,20 +6682,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-kuiper service: ports: - - name: tcp-59861 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59861 + port: 59720 targetport: type: 0 - intval: 59861 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -7253,7 +6717,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -7268,7 +6732,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -7308,12 +6772,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data volumesource: - hostpath: - path: /tmp/edgex/secrets/support-scheduler - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-connections + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-sources + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -7343,15 +6873,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59720 hostport: 0 - containerport: 59861 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -7362,14 +6892,38 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis valuefrom: null resources: limits: {} @@ -7382,9 +6936,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /kuiper/etc/connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-sources + readonly: false + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -7416,7 +6982,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -7443,20 +7009,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-core-consul service: ports: - - name: tcp-59720 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59720 + port: 8500 targetport: type: 0 - intval: 59720 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -7478,7 +7044,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -7493,14 +7059,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: consul-config volumesource: hostpath: null emptydir: @@ -7533,7 +7099,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: consul-data volumesource: hostpath: null emptydir: @@ -7566,7 +7132,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: edgex-init volumesource: hostpath: null emptydir: @@ -7599,7 +7165,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -7632,86 +7198,107 @@ versions: storageos: null csi: null ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59720 - hostport: 0 - containerport: 59720 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis + - name: edgex-core-consul + image: openyurt/consul:1.10.3 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-jakarta + optional: null + secretref: null + env: + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: ADD_REGISTRY_ACL_ROLES + value: "" valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: edgex-init + - name: consul-config readonly: false - mountpath: /edgex-init + mountpath: /consul/config subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data + - name: consul-data readonly: false - mountpath: /kuiper/data + mountpath: /consul/data subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: edgex-init readonly: false - mountpath: /kuiper/etc/connections + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: consul-acl-token readonly: false - mountpath: /kuiper/etc/sources + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -7743,7 +7330,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -7770,20 +7357,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-support-notifications service: ports: - - name: tcp-4000 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 4000 + port: 59860 targetport: type: 0 - intval: 4000 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -7805,7 +7392,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -7820,24 +7407,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/support-notifications + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.1.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59860 hostport: 0 - containerport: 4000 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -7847,12 +7500,27 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-support-notifications + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/support-notifications + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7881,7 +7549,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -7908,20 +7576,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-metadata service: ports: - - name: tcp-6379 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 6379 + port: 59881 targetport: type: 0 - intval: 6379 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -7943,7 +7611,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -7958,79 +7626,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-metadata annotations: {} ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + finalizers: [] + managedfields: [] + spec: + volumes: - name: edgex-init volumesource: hostpath: null @@ -8064,43 +7666,10 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -8132,15 +7701,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-core-metadata + image: openyurt/core-metadata:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59881 hostport: 0 - containerport: 6379 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -8151,44 +7720,26 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config - readonly: false - mountpath: /run/redis/conf - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -8220,7 +7771,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -8247,12 +7798,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -8267,79 +7818,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -8373,106 +7858,7 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-sources - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-connections + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -8505,12 +7891,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-config + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/security-proxy-setup + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -8540,8 +7926,8 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.1.1 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.1.1 command: [] args: [] workingdir: "" @@ -8554,71 +7940,59 @@ versions: optional: null secretref: null env: - - name: EDGEX_USER - value: "2002" + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: ADD_PROXY_ROUTE + value: "" valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul + valuefrom: null + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /vault - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /tmp/kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-sources - readonly: false - mountpath: /tmp/kuiper - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections + - name: consul-acl-token readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/edgex/secrets/consul-acl-token subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume1 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -8650,7 +8024,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -8677,29 +8051,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59880 + port: 58890 targetport: type: 0 - intval: 59880 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -8721,7 +8086,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -8736,7 +8101,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -8779,7 +8144,40 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/sys-mgmt-agent + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume2 + volumesource: + hostpath: + path: /var/run/docker.sock type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -8811,20 +8209,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.1.1 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-58890 hostport: 0 - containerport: 59880 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -8835,11 +8228,14 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: METRICSMECHANISM + value: executor + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - name: SERVICE_HOST - value: edgex-core-data + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} @@ -8854,7 +8250,13 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/sys-mgmt-agent + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume2 + readonly: false + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -8886,7 +8288,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -8913,20 +8315,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-device-rest service: ports: - - name: tcp-58890 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 58890 + port: 59986 targetport: type: 0 - intval: 58890 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -8948,7 +8350,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -8963,7 +8365,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -9006,40 +8408,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume2 - volumesource: - hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -9071,15 +8440,15 @@ versions: ephemeral: null initcontainers: [] 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 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59986 hostport: 0 - containerport: 58890 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -9090,14 +8459,8 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - - name: METRICSMECHANISM - value: executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -9112,13 +8475,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume2 - readonly: false - mountpath: /var/run/docker.sock + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -9150,7 +8507,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -9177,20 +8534,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-core-data service: ports: - - name: tcp-8500 + - name: tcp-5563 + protocol: TCP + appprotocol: null + port: 5563 + targetport: + type: 0 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 protocol: TCP appprotocol: null - port: 8500 + port: 59880 targetport: type: 0 - intval: 8500 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -9212,7 +8578,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -9227,79 +8593,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -9333,43 +8633,10 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-consul + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -9401,15 +8668,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - name: edgex-core-data + image: openyurt/core-data:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-5563 hostport: 0 - containerport: 8500 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -9420,53 +8692,26 @@ versions: optional: null secretref: null env: - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json - valuefrom: null - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data - readonly: false - mountpath: /consul/data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token - readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -9498,7 +8743,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -9525,12 +8770,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-vault + service: + ports: + - name: tcp-8200 + protocol: TCP + appprotocol: null + port: 8200 + targetport: + type: 0 + intval: 8200 + strval: "" + nodeport: 0 + selector: + app: edgex-vault + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -9545,13 +8820,46 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -9585,7 +8893,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: vault-file volumesource: hostpath: null emptydir: @@ -9618,12 +8926,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-logs volumesource: - hostpath: - path: /tmp/edgex/secrets/security-proxy-setup - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -9653,12 +8961,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.1.1 + - name: edgex-vault + image: openyurt/vault:1.8.4 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-8200 + hostport: 0 + containerport: 8200 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -9667,59 +8980,41 @@ versions: optional: null secretref: null env: - - name: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command + - name: VAULT_UI + value: "true" valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /vault/config + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: vault-file readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: vault-logs readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -9751,7 +9046,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -9778,38 +9073,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-ui-go service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-8100 - protocol: TCP - appprotocol: null - port: 8100 - targetport: - type: 0 - intval: 8100 - strval: "" - nodeport: 0 - - name: tcp-8443 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 8443 + port: 4000 targetport: type: 0 - intval: 8443 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -9831,7 +9108,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -9846,79 +9123,151 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] + initcontainers: [] + containers: + - name: edgex-ui-go + image: openyurt/edgex-ui:2.1.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-4000 + hostport: 0 + containerport: 4000 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-jakarta + optional: null + secretref: null + env: [] + resources: + limits: {} + requests: {} + claims: [] + volumemounts: [] + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-ui-go + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-device-virtual + service: + ports: + - name: tcp-59900 + protocol: TCP + appprotocol: null + port: 59900 + targetport: + type: 0 + intval: 59900 + strval: "" + nodeport: 0 + selector: + app: edgex-device-virtual + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null + deployment: + replicas: null + selector: + matchlabels: + app: edgex-device-virtual + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-device-virtual + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: - name: edgex-init volumesource: hostpath: null @@ -9955,7 +9304,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -9985,93 +9334,17 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.5.1 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 + - name: tcp-59900 hostport: 0 - containerport: 8443 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -10082,62 +9355,14 @@ versions: optional: null secretref: null env: - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout + - name: SERVICE_HOST + value: edgex-device-virtual valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -10146,19 +9371,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config - readonly: false - mountpath: /tmp/postgres-config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -10190,7 +9403,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -10217,20 +9430,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-kong service: ports: - - name: tcp-59986 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59986 + port: 8000 targetport: type: 0 - intval: 59986 + intval: 8000 + strval: "" + nodeport: 0 + - name: tcp-8100 + protocol: TCP + appprotocol: null + port: 8100 + targetport: + type: 0 + intval: 8100 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -10252,7 +9483,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -10267,13 +9498,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -10310,7 +9607,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10340,17 +9637,93 @@ versions: storageos: null csi: null ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.1.1 + - name: edgex-kong + image: openyurt/kong:2.5.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-8000 hostport: 0 - containerport: 59986 + containerport: 8000 + protocol: TCP + hostip: "" + - name: tcp-8100 + hostport: 0 + containerport: 8100 + protocol: TCP + hostip: "" + - name: tcp-8443 + hostport: 0 + containerport: 8443 protocol: TCP hostip: "" envfrom: @@ -10361,14 +9734,62 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + valuefrom: null + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -10377,7 +9798,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/security-proxy-setup + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -10409,7 +9842,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -10429,84 +9862,27 @@ versions: hostusers: null schedulinggates: [] resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - versionName: kamakura - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-kamakura - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - API_GATEWAY_HOST: edgex-kong - API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "true" - MESSAGEQUEUE_HOST: edgex-redis - PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul - SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PORT: "8200" - SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock - SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle - SPIFFE_TRUSTDOMAIN: edgexfoundry.org - STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper - STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" - STAGEGATE_DATABASE_HOST: edgex-redis - STAGEGATE_DATABASE_PORT: "6379" - STAGEGATE_DATABASE_READYPORT: "6379" - STAGEGATE_KONGDB_HOST: edgex-kong-db - STAGEGATE_KONGDB_PORT: "5432" - STAGEGATE_KONGDB_READYPORT: "54325" - STAGEGATE_READY_TORUNPORT: "54329" - STAGEGATE_REGISTRY_HOST: edgex-core-consul - STAGEGATE_REGISTRY_PORT: "8500" - STAGEGATE_REGISTRY_READYPORT: "54324" - STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup - STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" - STAGEGATE_WAITFOR_TIMEOUT: 60s - binarydata: {} - components: - - name: edgex-core-consul + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-redis service: ports: - - name: tcp-8500 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 8500 + port: 6379 targetport: type: 0 - intval: 8500 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -10528,7 +9904,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -10543,14 +9919,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -10583,7 +9959,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-data + - name: db-data volumesource: hostpath: null emptydir: @@ -10649,7 +10025,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: redis-config volumesource: hostpath: null emptydir: @@ -10685,7 +10061,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-consul + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10717,54 +10093,45 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.10 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-6379 hostport: 0 - containerport: 8500 + containerport: 6379 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-jakarta optional: null secretref: null env: - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config + - name: tmpfs-volume1 readonly: false - mountpath: /consul/config + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-data + - name: db-data readonly: false - mountpath: /consul/data + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -10774,15 +10141,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: redis-config readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /run/redis/conf subpath: "" mountpropagation: null subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -10814,7 +10181,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -10841,20 +10208,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-app-rules-engine service: ports: - - name: tcp-59882 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59882 + port: 59701 targetport: type: 0 - intval: 59882 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -10876,7 +10243,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -10891,7 +10258,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -10934,7 +10301,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10966,27 +10333,36 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.2.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59701 hostport: 0 - containerport: 59882 + containerport: 59701 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-jakarta optional: null secretref: null env: + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-app-rules-engine + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} @@ -11001,7 +10377,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -11033,145 +10409,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-ui-go - service: - ports: - - name: tcp-4000 - protocol: TCP - appprotocol: null - port: 4000 - targetport: - type: 0 - intval: 4000 - strval: "" - nodeport: 0 - selector: - app: edgex-ui-go - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-ui-go - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-ui-go - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.2.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-4000 - hostport: 0 - containerport: 4000 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura - optional: null - secretref: null - env: [] - resources: - limits: {} - requests: {} - claims: [] - volumemounts: [] - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -11198,20 +10436,77 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - versionName: kamakura + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-kamakura + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + API_GATEWAY_HOST: edgex-kong + API_GATEWAY_STATUS_PORT: "8100" + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis + PROXY_SETUP_HOST: edgex-security-proxy-setup + REGISTRY_HOST: edgex-core-consul + SECRETSTORE_HOST: edgex-vault + SECRETSTORE_PORT: "8200" + SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock + SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle + SPIFFE_TRUSTDOMAIN: edgexfoundry.org + STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper + STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" + STAGEGATE_DATABASE_HOST: edgex-redis + STAGEGATE_DATABASE_PORT: "6379" + STAGEGATE_DATABASE_READYPORT: "6379" + STAGEGATE_KONGDB_HOST: edgex-kong-db + STAGEGATE_KONGDB_PORT: "5432" + STAGEGATE_KONGDB_READYPORT: "54325" + STAGEGATE_READY_TORUNPORT: "54329" + STAGEGATE_REGISTRY_HOST: edgex-core-consul + STAGEGATE_REGISTRY_PORT: "8500" + STAGEGATE_REGISTRY_READYPORT: "54324" + STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup + STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" + STAGEGATE_WAITFOR_TIMEOUT: 60s + binarydata: {} + components: + - name: edgex-support-scheduler service: ports: - - name: tcp-59701 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59701 + port: 59861 targetport: type: 0 - intval: 59701 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -11233,7 +10528,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -11248,7 +10543,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -11291,7 +10586,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -11323,15 +10618,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59861 hostport: 0 - containerport: 59701 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -11342,17 +10637,14 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -11367,7 +10659,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -11399,7 +10691,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -11426,20 +10718,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-core-data service: ports: - - name: tcp-8200 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 8200 + port: 5563 targetport: type: 0 - intval: 8200 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -11461,7 +10762,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -11476,46 +10777,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -11549,45 +10817,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-logs + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/core-data + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -11617,15 +10852,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.9 + - name: edgex-core-data + image: openyurt/core-data:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-5563 hostport: 0 - containerport: 8200 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -11636,41 +10876,26 @@ versions: optional: null secretref: null env: - - name: VAULT_UI - value: "true" - valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file - readonly: false - mountpath: /vault/file - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-logs + - name: anonymous-volume1 readonly: false - mountpath: /vault/logs + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -11702,7 +10927,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -11729,20 +10954,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-vault service: ports: - - name: tcp-59986 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 59986 + port: 8200 targetport: type: 0 - intval: 59986 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -11764,7 +10989,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -11779,13 +11004,46 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -11819,12 +11077,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-file volumesource: - hostpath: - path: /tmp/edgex/secrets/device-rest - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: vault-logs + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -11854,15 +11145,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.2.0 + - name: edgex-vault + image: openyurt/vault:1.8.9 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-8200 hostport: 0 - containerport: 59986 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -11873,23 +11164,41 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: VAULT_ADDR + value: http://edgex-vault:8200 + valuefrom: null + - name: VAULT_CONFIG_DIR + value: /vault/config + valuefrom: null + - name: VAULT_UI + value: "true" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /vault/config + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: vault-file readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /vault/file + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-logs + readonly: false + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -11921,7 +11230,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -11948,20 +11257,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-core-command service: ports: - - name: tcp-59720 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59720 + port: 59882 targetport: type: 0 - intval: 59720 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -11983,7 +11292,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -11998,7 +11307,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -12038,78 +11347,12 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-connections - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-sources + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/core-command + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -12127,69 +11370,39 @@ versions: fc: null azurefile: null configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - initcontainers: [] - containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59720 - hostport: 0 - containerport: 59720 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura - optional: null - secretref: null - env: - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-command + image: openyurt/core-command:2.2.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59882 + hostport: 0 + containerport: 59882 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null resources: limits: {} @@ -12202,21 +11415,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections - readonly: false - mountpath: /kuiper/etc/connections - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-sources + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/etc/sources + mountpath: /tmp/edgex/secrets/core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -12248,7 +11449,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -12275,38 +11476,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-ui-go service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-8100 - protocol: TCP - appprotocol: null - port: 8100 - targetport: - type: 0 - intval: 8100 - strval: "" - nodeport: 0 - - name: tcp-8443 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 8443 + port: 4000 targetport: type: 0 - intval: 8443 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -12328,7 +11511,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -12343,7 +11526,115 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-ui-go + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] + initcontainers: [] + containers: + - name: edgex-ui-go + image: openyurt/edgex-ui:2.2.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-4000 + hostport: 0 + containerport: 4000 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura + optional: null + secretref: null + env: [] + resources: + limits: {} + requests: {} + claims: [] + volumemounts: [] + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-ui-go + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-security-secretstore-setup + deployment: + replicas: null + selector: + matchlabels: + app: edgex-security-secretstore-setup + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -12385,10 +11676,76 @@ versions: ephemeral: null - name: tmpfs-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -12416,7 +11773,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: kong volumesource: hostpath: null emptydir: @@ -12449,12 +11806,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-sources volumesource: - hostpath: - path: /tmp/edgex/secrets/security-proxy-setup - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -12482,7 +11839,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -12515,7 +11872,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + - name: vault-config volumesource: hostpath: null emptydir: @@ -12550,27 +11907,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.6.1 + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -12579,44 +11921,20 @@ versions: optional: null secretref: null env: - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_DATABASE - value: postgres + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout + - name: SECUREMESSAGEBUS_TYPE + value: redis valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null resources: limits: {} @@ -12631,7 +11949,7 @@ versions: subpathexpr: "" - name: tmpfs-volume2 readonly: false - mountpath: /tmp + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -12643,19 +11961,31 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: kong readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/kong subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: kuiper-sources readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /tmp/kuiper-connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -12687,7 +12017,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -12714,12 +12044,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-kong-db + service: + ports: + - name: tcp-5432 + protocol: TCP + appprotocol: null + port: 5432 + targetport: + type: 0 + intval: 5432 + strval: "" + nodeport: 0 + selector: + app: edgex-kong-db + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -12734,13 +12094,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -12774,14 +12233,85 @@ versions: storageos: null csi: null ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: postgres-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.2.0 + - name: edgex-kong-db + image: openyurt/postgres:13.5-alpine command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-5432 + hostport: 0 + containerport: 5432 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -12790,23 +12320,56 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: POSTGRES_USER + value: kong + valuefrom: null + - name: POSTGRES_DB + value: kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-data + readonly: false + mountpath: /var/lib/postgresql/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -12835,7 +12398,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -12862,20 +12425,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-device-virtual service: ports: - - name: tcp-59881 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59881 + port: 59900 targetport: type: 0 - intval: 59881 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -12897,7 +12460,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -12912,7 +12475,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -12955,7 +12518,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-metadata + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -12987,15 +12550,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.2.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59900 hostport: 0 - containerport: 59881 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -13006,11 +12569,8 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -13025,7 +12585,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-metadata + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -13057,7 +12617,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -13084,20 +12644,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-core-consul service: ports: - - name: tcp-5432 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 5432 + port: 8500 targetport: type: 0 - intval: 5432 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -13119,7 +12679,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -13134,47 +12694,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 + - name: consul-config volumesource: hostpath: null emptydir: @@ -13207,7 +12734,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: consul-data volumesource: hostpath: null emptydir: @@ -13273,7 +12800,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -13306,12 +12833,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -13341,15 +12868,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.5-alpine + - name: edgex-core-consul + image: openyurt/consul:1.10.10 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-8500 hostport: 0 - containerport: 5432 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -13360,35 +12887,35 @@ versions: optional: null secretref: null env: - - name: POSTGRES_DB - value: kong + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: POSTGRES_USER - value: kong + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: ADD_REGISTRY_ACL_ROLES + value: "" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 + - name: consul-config readonly: false - mountpath: /tmp + mountpath: /consul/config subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume3 + - name: consul-data readonly: false - mountpath: /run + mountpath: /consul/data subpath: "" mountpropagation: null subpathexpr: "" @@ -13398,15 +12925,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: consul-acl-token readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/edgex/secrets/consul-acl-token subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: anonymous-volume1 readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -13438,7 +12965,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -13465,12 +12992,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -13485,47 +13012,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -13558,7 +13052,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -13594,7 +13088,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -13624,142 +13118,10 @@ versions: storageos: null csi: null ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-sources - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-connections - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.2.0 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.2.0 command: [] args: [] workingdir: "" @@ -13772,71 +13134,59 @@ versions: optional: null secretref: null env: - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /vault - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /tmp/kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-sources - readonly: false - mountpath: /tmp/kuiper - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections + - name: consul-acl-token readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/edgex/secrets/consul-acl-token subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume1 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -13868,7 +13218,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -13895,20 +13245,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-core-metadata service: ports: - - name: tcp-59861 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59861 + port: 59881 targetport: type: 0 - intval: 59861 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -13930,7 +13280,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -13945,7 +13295,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -13988,7 +13338,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14020,15 +13370,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59881 hostport: 0 - containerport: 59861 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -14039,14 +13389,11 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -14061,7 +13408,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -14093,7 +13440,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -14276,85 +13623,257 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + - name: redis-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/security-bootstrapper-redis + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-6379 + hostport: 0 + containerport: 6379 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura + optional: null + secretref: null + env: + - name: DATABASECONFIG_NAME + value: redis.conf + valuefrom: null + - name: DATABASECONFIG_PATH + value: /run/redis/conf + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: redis-config + readonly: false + mountpath: /run/redis/conf + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-redis + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-security-bootstrapper + deployment: + replicas: null + selector: + matchlabels: + app: edgex-security-bootstrapper + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-security-bootstrapper + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-6379 - hostport: 0 - containerport: 6379 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -14363,47 +13882,23 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: DATABASECONFIG_NAME - value: redis.conf + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config - readonly: false - mountpath: /run/redis/conf - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -14432,7 +13927,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -14459,29 +13954,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-device-rest service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59880 + port: 59986 targetport: type: 0 - intval: 59880 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -14503,7 +13989,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -14518,7 +14004,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -14561,7 +14047,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14593,20 +14079,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59986 hostport: 0 - containerport: 59880 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -14618,10 +14099,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data - valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -14636,7 +14114,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -14668,7 +14146,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -14914,20 +14392,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-kong service: ports: - - name: tcp-59900 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59900 + port: 8000 targetport: type: 0 - intval: 59900 + intval: 8000 + strval: "" + nodeport: 0 + - name: tcp-8100 + protocol: TCP + appprotocol: null + port: 8100 + targetport: + type: 0 + intval: 8100 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -14949,7 +14445,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -14964,13 +14460,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -15007,7 +14569,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15037,17 +14599,93 @@ versions: storageos: null csi: null ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-kong + image: openyurt/kong:2.6.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-8000 hostport: 0 - containerport: 59900 + containerport: 8000 + protocol: TCP + hostip: "" + - name: tcp-8100 + hostport: 0 + containerport: 8100 + protocol: TCP + hostip: "" + - name: tcp-8443 + hostport: 0 + containerport: 8443 protocol: TCP hostip: "" envfrom: @@ -15058,14 +14696,62 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + valuefrom: null + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -15074,7 +14760,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + mountpath: /tmp/edgex/secrets/security-proxy-setup + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -15106,7 +14804,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -15133,20 +14831,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-kuiper service: ports: - - name: tcp-58890 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 58890 + port: 59720 targetport: type: 0 - intval: 58890 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -15168,7 +14866,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -15183,7 +14881,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -15223,12 +14921,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data volumesource: - hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -15256,12 +14954,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: kuiper-connections volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-sources + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -15290,16 +15021,16 @@ versions: csi: null ephemeral: null initcontainers: [] - containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.2.0 + containers: + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59720 hostport: 0 - containerport: 58890 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -15310,14 +15041,38 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis valuefrom: null resources: limits: {} @@ -15330,15 +15085,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent + mountpath: /kuiper/data subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: kuiper-connections readonly: false - mountpath: /var/run/docker.sock + mountpath: /kuiper/etc/connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-sources + readonly: false + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -15370,7 +15131,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -15397,12 +15158,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-sys-mgmt-agent + service: + ports: + - name: tcp-58890 + protocol: TCP + appprotocol: null + port: 58890 + targetport: + type: 0 + intval: 58890 + strval: "" + nodeport: 0 + selector: + app: edgex-sys-mgmt-agent + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -15417,7 +15208,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -15457,12 +15248,12 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/sys-mgmt-agent + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -15490,10 +15281,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /var/run/docker.sock type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15525,12 +15316,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.2.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.2.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-58890 + hostport: 0 + containerport: 58890 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -15539,38 +15335,14 @@ versions: optional: null secretref: null env: - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST + - name: SERVICE_HOST value: edgex-sys-mgmt-agent valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} @@ -15583,15 +15355,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -15623,7 +15395,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -15650,74 +15422,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: ireland - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-ireland - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: 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 - binarydata: {} - components: - - name: edgex-support-scheduler + - name: edgex-app-rules-engine service: ports: - - name: tcp-59861 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59861 + port: 59701 targetport: type: 0 - intval: 59861 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -15739,7 +15457,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -15754,7 +15472,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -15797,7 +15515,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15829,33 +15547,36 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.0.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59701 hostport: 0 - containerport: 59861 + containerport: 59701 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-rules-engine valuefrom: null resources: limits: {} @@ -15870,7 +15591,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -15902,7 +15623,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -15929,20 +15650,74 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - versionName: ireland + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-ireland + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: 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 + binarydata: {} + components: + - name: edgex-vault service: ports: - - name: tcp-6379 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 6379 + port: 8200 targetport: type: 0 - intval: 6379 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -15964,7 +15739,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -15979,7 +15754,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] @@ -16019,7 +15794,7 @@ versions: storageos: null csi: null ephemeral: null - - name: db-data + - name: edgex-init volumesource: hostpath: null emptydir: @@ -16052,7 +15827,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: vault-file volumesource: hostpath: null emptydir: @@ -16085,7 +15860,7 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config + - name: vault-logs volumesource: hostpath: null emptydir: @@ -16118,50 +15893,17 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.4-alpine + - name: edgex-vault + image: openyurt/vault:1.7.2 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-8200 hostport: 0 - containerport: 6379 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -16172,11 +15914,14 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf + - name: VAULT_UI + value: "true" valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: VAULT_CONFIG_DIR + value: /vault/config + valuefrom: null + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null resources: limits: {} @@ -16185,13 +15930,7 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: db-data - readonly: false - mountpath: /data + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -16201,15 +15940,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config + - name: vault-file readonly: false - mountpath: /run/redis/conf + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: vault-logs readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -16241,7 +15980,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -16268,12 +16007,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - name: edgex-redis + service: + ports: + - name: tcp-6379 + protocol: TCP + appprotocol: null + port: 6379 + targetport: + type: 0 + intval: 6379 + strval: "" + nodeport: 0 + selector: + app: edgex-redis + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -16288,7 +16057,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] @@ -16328,7 +16097,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: db-data volumesource: hostpath: null emptydir: @@ -16394,73 +16163,7 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-config + - name: redis-config volumesource: hostpath: null emptydir: @@ -16493,12 +16196,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-config + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/security-bootstrapper-redis + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -16528,12 +16231,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.0.0 + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-6379 + hostport: 0 + containerport: 6379 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -16542,20 +16250,11 @@ versions: optional: null secretref: null env: - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] - valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis - valuefrom: null - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null resources: limits: {} @@ -16568,9 +16267,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume2 + - name: db-data readonly: false - mountpath: /vault + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -16580,27 +16279,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /tmp/kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-config + - name: redis-config readonly: false - mountpath: /tmp/kuiper + mountpath: /run/redis/conf subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume1 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -16632,7 +16319,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -16659,20 +16346,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-support-scheduler service: ports: - - name: tcp-5432 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 5432 + port: 59861 targetport: type: 0 - intval: 5432 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -16694,7 +16381,202 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-support-scheduler + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-support-scheduler + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/support-scheduler + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59861 + hostport: 0 + containerport: 59861 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data + valuefrom: null + - name: SERVICE_HOST + value: edgex-support-scheduler + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/support-scheduler + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-support-scheduler + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-security-proxy-setup + deployment: + replicas: null + selector: + matchlabels: + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -16709,112 +16591,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume3 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -16848,7 +16631,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -16881,12 +16664,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/security-proxy-setup + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -16916,17 +16699,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:12.3-alpine + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -16935,53 +16713,59 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: ADD_PROXY_ROUTE + value: "" valuefrom: null - - name: POSTGRES_DB - value: kong + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual + valuefrom: null + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume3 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: consul-acl-token readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/edgex/secrets/consul-acl-token subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: anonymous-volume1 readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -17013,7 +16797,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -17040,20 +16824,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-kuiper service: ports: - - name: tcp-8200 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 8200 + port: 59720 targetport: type: 0 - intval: 8200 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -17075,7 +16859,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -17090,46 +16874,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-kuiper annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: - name: edgex-init volumesource: hostpath: null @@ -17163,7 +16914,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - name: kuiper-data volumesource: hostpath: null emptydir: @@ -17196,7 +16947,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - name: kuiper-config volumesource: hostpath: null emptydir: @@ -17231,15 +16982,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.7.2 + - name: edgex-kuiper + image: openyurt/ekuiper:1.3.0-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59720 hostport: 0 - containerport: 8200 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -17250,41 +17001,47 @@ versions: optional: null secretref: null env: - - name: VAULT_ADDR - value: http://edgex-vault:8200 - valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: EDGEX__DEFAULT__TOPIC + value: rules-events valuefrom: null - - name: VAULT_UI + - name: KUIPER__BASIC__CONSOLELOG value: "true" valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: kuiper-data readonly: false - mountpath: /vault/file + mountpath: /kuiper/data subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-logs + - name: kuiper-config readonly: false - mountpath: /vault/logs + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -17316,7 +17073,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -17343,20 +17100,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59881 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59881 + port: 58890 targetport: type: 0 - intval: 59881 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -17378,7 +17135,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -17393,7 +17150,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -17436,7 +17193,40 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-metadata + path: /tmp/edgex/secrets/sys-mgmt-agent + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume2 + volumesource: + hostpath: + path: /var/run/docker.sock type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -17468,15 +17258,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.0.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-58890 hostport: 0 - containerport: 59881 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -17487,11 +17277,14 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: METRICSMECHANISM + value: executor valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-sys-mgmt-agent + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} @@ -17506,7 +17299,13 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-metadata + mountpath: /tmp/edgex/secrets/sys-mgmt-agent + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume2 + readonly: false + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -17538,7 +17337,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -17565,129 +17364,33 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul - service: - ports: - - name: tcp-8500 - protocol: TCP - appprotocol: null - port: 8500 - targetport: - type: 0 - intval: 8500 - strval: "" - nodeport: 0 - selector: - app: edgex-core-consul - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-bootstrapper deployment: - replicas: null - selector: - matchlabels: - app: edgex-core-consul - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-consul - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + replicas: null + selector: + matchlabels: + app: edgex-security-bootstrapper + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-security-bootstrapper + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: - name: edgex-init volumesource: hostpath: null @@ -17721,85 +17424,14 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.9.5 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-8500 - hostport: 0 - containerport: 8500 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -17808,56 +17440,23 @@ versions: optional: null secretref: null env: - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" - valuefrom: null - name: EDGEX_USER value: "2002" valuefrom: null - name: EDGEX_GROUP value: "2001" valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done - valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data - readonly: false - mountpath: /consul/data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token - readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -17886,7 +17485,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -17913,20 +17512,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-app-rules-engine service: ports: - - name: tcp-59860 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59860 + port: 59701 targetport: type: 0 - intval: 59860 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -17948,7 +17547,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -17963,7 +17562,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -18006,7 +17605,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18038,15 +17637,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59701 hostport: 0 - containerport: 59860 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -18058,7 +17657,16 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-app-rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} @@ -18073,7 +17681,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -18105,7 +17713,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -18132,12 +17740,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-core-command + service: + ports: + - name: tcp-59882 + protocol: TCP + appprotocol: null + port: 59882 + targetport: + type: 0 + intval: 59882 + strval: "" + nodeport: 0 + selector: + app: edgex-core-command + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -18152,7 +17790,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -18192,14 +17830,52 @@ versions: storageos: null csi: null ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/core-command + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.0.0 + - name: edgex-core-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59882 + hostport: 0 + containerport: 59882 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -18208,11 +17884,8 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null resources: limits: {} @@ -18225,6 +17898,12 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-command + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -18253,7 +17932,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -18280,42 +17959,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper - service: - ports: - - name: tcp-59720 - protocol: TCP - appprotocol: null - port: 59720 - targetport: - type: 0 - intval: 59720 - strval: "" - nodeport: 0 - selector: - app: edgex-kuiper - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -18330,13 +17979,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -18370,7 +18085,40 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong volumesource: hostpath: null emptydir: @@ -18436,19 +18184,47 @@ versions: storageos: null csi: null ephemeral: null + - name: vault-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.3.0-alpine + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59720 - hostport: 0 - containerport: 59720 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -18457,47 +18233,65 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__TYPE + - name: SECUREMESSAGEBUS_TYPE value: redis valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /vault + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/data + mountpath: /tmp/edgex/secrets + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /tmp/kong subpath: "" mountpropagation: null subpathexpr: "" - name: kuiper-config readonly: false - mountpath: /kuiper/etc/sources + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -18529,7 +18323,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -18556,20 +18350,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-device-virtual service: ports: - - name: tcp-59701 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59701 + port: 59900 targetport: type: 0 - intval: 59701 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -18591,7 +18385,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -18606,7 +18400,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -18649,7 +18443,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18681,15 +18475,15 @@ versions: ephemeral: null initcontainers: [] 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 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59900 hostport: 0 - containerport: 59701 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -18700,17 +18494,8 @@ versions: optional: null secretref: null env: - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -18725,7 +18510,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -18757,7 +18542,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -18784,29 +18569,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-kong service: ports: - - name: tcp-5563 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 5563 + port: 8000 targetport: type: 0 - intval: 5563 + intval: 8000 strval: "" nodeport: 0 - - name: tcp-59880 + - name: tcp-8100 protocol: TCP appprotocol: null - port: 59880 + port: 8100 targetport: type: 0 - intval: 59880 + intval: 8100 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -18828,7 +18622,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -18843,13 +18637,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -18886,7 +18746,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18916,22 +18776,93 @@ versions: storageos: null csi: null ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.0.0 + - name: edgex-kong + image: openyurt/kong:2.4.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 + - name: tcp-8000 hostport: 0 - containerport: 5563 + containerport: 8000 protocol: TCP hostip: "" - - name: tcp-59880 + - name: tcp-8100 hostport: 0 - containerport: 59880 + containerport: 8100 + protocol: TCP + hostip: "" + - name: tcp-8443 + hostport: 0 + containerport: 8443 protocol: TCP hostip: "" envfrom: @@ -18942,17 +18873,56 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: KONG_DNS_VALID_TTL + value: "1" valuefrom: null - - name: SERVICE_HOST - value: edgex-core-data + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -18961,7 +18931,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/security-proxy-setup + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -18993,7 +18975,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -19020,12 +19002,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-kong-db + service: + ports: + - name: tcp-5432 + protocol: TCP + appprotocol: null + port: 5432 + targetport: + type: 0 + intval: 5432 + strval: "" + nodeport: 0 + selector: + app: edgex-kong-db + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -19040,13 +19052,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -19080,7 +19191,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: postgres-config volumesource: hostpath: null emptydir: @@ -19113,12 +19224,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: postgres-data volumesource: - hostpath: - path: /tmp/edgex/secrets/security-proxy-setup - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -19148,12 +19259,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.0.0 + - name: edgex-kong-db + image: openyurt/postgres:12.3-alpine command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-5432 + hostport: 0 + containerport: 5432 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -19162,59 +19278,53 @@ versions: optional: null secretref: null env: - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual - valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command + - name: POSTGRES_DB + value: kong valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler + - name: POSTGRES_USER + value: kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: postgres-config readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: postgres-data readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -19246,7 +19356,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -19273,20 +19383,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-core-metadata service: ports: - - name: tcp-58890 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 58890 + port: 59881 targetport: type: 0 - intval: 58890 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -19308,7 +19418,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -19323,7 +19433,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -19366,40 +19476,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume2 - volumesource: - hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19431,15 +19508,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.0.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59881 hostport: 0 - containerport: 58890 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -19450,14 +19527,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -19472,13 +19546,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume2 - readonly: false - mountpath: /var/run/docker.sock + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -19510,7 +19578,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -19537,20 +19605,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-device-rest service: ports: - - name: tcp-59882 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59882 + port: 59986 targetport: type: 0 - intval: 59882 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -19572,7 +19640,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -19587,7 +19655,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -19630,7 +19698,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19662,15 +19730,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59986 hostport: 0 - containerport: 59882 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -19682,7 +19750,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -19697,7 +19765,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -19729,7 +19797,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -19756,20 +19824,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-support-notifications service: ports: - - name: tcp-59986 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59986 + port: 59860 targetport: type: 0 - intval: 59986 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -19791,7 +19859,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -19806,7 +19874,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -19849,7 +19917,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + path: /tmp/edgex/secrets/support-notifications type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19881,15 +19949,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.0.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59860 hostport: 0 - containerport: 59986 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -19901,7 +19969,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -19916,7 +19984,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -19948,7 +20016,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -19975,20 +20043,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-core-consul service: ports: - - name: tcp-59900 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59900 + port: 8500 targetport: type: 0 - intval: 59900 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -20010,7 +20078,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -20025,13 +20093,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -20065,10 +20199,43 @@ versions: storageos: null csi: null ephemeral: null + - name: consul-acl-token + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/edgex-consul type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -20100,15 +20267,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.0.0 + - name: edgex-core-consul + image: openyurt/consul:1.9.5 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-8500 hostport: 0 - containerport: 59900 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -20119,23 +20286,53 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + valuefrom: null + - name: ADD_REGISTRY_ACL_ROLES + value: "" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -20167,7 +20364,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -20194,38 +20391,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-core-data service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-8100 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 8100 + port: 5563 targetport: type: 0 - intval: 8100 + intval: 5563 strval: "" nodeport: 0 - - name: tcp-8443 + - name: tcp-59880 protocol: TCP appprotocol: null - port: 8443 + port: 59880 targetport: type: 0 - intval: 8443 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -20247,7 +20435,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -20262,79 +20450,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: edgex-init volumesource: hostpath: null @@ -20371,7 +20493,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -20399,155 +20521,45 @@ versions: portworxvolume: null scaleio: null storageos: null - csi: null - ephemeral: null - - name: postgres-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - initcontainers: [] - containers: - - name: edgex-kong - image: openyurt/kong:2.4.1-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-ireland - optional: null - secretref: null - env: - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-data + image: openyurt/core-data:2.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-5563 + hostport: 0 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -20556,19 +20568,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config - readonly: false - mountpath: /tmp/postgres-config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -20600,7 +20600,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -20668,20 +20668,20 @@ versions: SERVICE_SERVERBINDADDR: 0.0.0.0 binarydata: {} components: - - name: kong-db + - name: edgex-device-rest service: ports: - - name: tcp-5432 + - name: tcp-49986 protocol: TCP appprotocol: null - port: 5432 + port: 49986 targetport: type: 0 - intval: 5432 + intval: 49986 strval: "" nodeport: 0 selector: - app: kong-db + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -20703,7 +20703,7 @@ versions: replicas: null selector: matchlabels: - app: kong-db + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -20718,156 +20718,179 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong-db + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume3 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: postgres-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] + initcontainers: [] + containers: + - name: edgex-device-rest + image: openyurt/docker-device-rest-go:1.2.1 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-49986 + hostport: 0 + containerport: 49986 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-hanoi + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-device-rest + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: [] + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-device-rest + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-kuiper + service: + ports: + - name: tcp-20498 + protocol: TCP + appprotocol: null + port: 20498 + targetport: + type: 0 + intval: 20498 + strval: "" + nodeport: 0 + - name: tcp-48075 + protocol: TCP + appprotocol: null + port: 48075 + targetport: + type: 0 + intval: 48075 + strval: "" + nodeport: 0 + selector: + app: edgex-kuiper + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null + deployment: + replicas: null + selector: + matchlabels: + app: edgex-kuiper + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-kuiper + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] initcontainers: [] containers: - - name: kong-db - image: openyurt/postgres:12.3-alpine + - name: edgex-kuiper + image: openyurt/kuiper:1.1.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-20498 hostport: 0 - containerport: 5432 + containerport: 20498 + protocol: TCP + hostip: "" + - name: tcp-48075 + hostport: 0 + containerport: 48075 protocol: TCP hostip: "" envfrom: @@ -20878,44 +20901,32 @@ versions: optional: null secretref: null env: - - name: POSTGRES_DB - value: kong + - name: KUIPER__BASIC__CONSOLELOG + value: "true" valuefrom: null - - name: POSTGRES_PASSWORD - value: kong + - name: KUIPER__BASIC__RESTPORT + value: "48075" valuefrom: null - - name: POSTGRES_USER - value: kong + - name: EDGEX__DEFAULT__PORT + value: "5566" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: tcp + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-app-service-configurable-rules + valuefrom: null + - name: EDGEX__DEFAULT__SERVICESERVER + value: http://edgex-core-data:48080 + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: events valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume3 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-data - readonly: false - mountpath: /var/lib/postgresql/data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -20944,7 +20955,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: kong-db + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -20971,47 +20982,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: kong + - name: kong-db service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-8001 - protocol: TCP - appprotocol: null - port: 8001 - targetport: - type: 0 - intval: 8001 - strval: "" - nodeport: 0 - - name: tcp-8443 - protocol: TCP - appprotocol: null - port: 8443 - targetport: - type: 0 - intval: 8443 - strval: "" - nodeport: 0 - - name: tcp-8444 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 8444 + port: 5432 targetport: type: 0 - intval: 8444 + intval: 5432 strval: "" nodeport: 0 selector: - app: kong + app: kong-db clusterip: "" clusterips: [] type: "" @@ -21033,7 +21017,7 @@ versions: replicas: null selector: matchlabels: - app: kong + app: kong-db matchexpressions: [] template: objectmeta: @@ -21048,7 +21032,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong + app: kong-db annotations: {} ownerreferences: [] finalizers: [] @@ -21121,7 +21105,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts + - name: tmpfs-volume3 volumesource: hostpath: null emptydir: @@ -21154,7 +21138,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + - name: postgres-data volumesource: hostpath: null emptydir: @@ -21189,30 +21173,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: kong - image: openyurt/kong:2.0.5 + - name: kong-db + image: openyurt/postgres:12.3-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8001 - hostport: 0 - containerport: 8001 - protocol: TCP - hostip: "" - - name: tcp-8443 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" - - name: tcp-8444 + - name: tcp-5432 hostport: 0 - containerport: 8444 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -21223,29 +21192,14 @@ versions: optional: null secretref: null env: - - name: KONG_PG_HOST - value: kong-db - valuefrom: null - - name: KONG_PG_PASSWORD + - name: POSTGRES_PASSWORD value: kong valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 0.0.0.0:8001, 0.0.0.0:8444 ssl + - name: POSTGRES_USER + value: kong valuefrom: null - - name: KONG_DATABASE - value: postgres + - name: POSTGRES_DB + value: kong valuefrom: null resources: limits: {} @@ -21254,7 +21208,7 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run + mountpath: /var/run subpath: "" mountpropagation: null subpathexpr: "" @@ -21264,15 +21218,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-scripts + - name: tmpfs-volume3 readonly: false - mountpath: /consul/scripts + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: postgres-data readonly: false - mountpath: /usr/local/kong + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -21304,7 +21258,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: kong + hostname: kong-db subdomain: "" affinity: null schedulername: "" @@ -21331,20 +21285,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-command service: ports: - - name: tcp-6379 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 6379 + port: 48082 targetport: type: 0 - intval: 6379 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -21366,7 +21320,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -21381,19 +21335,52 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: db-data + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/ca + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume2 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-core-command + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -21423,15 +21410,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.0.9-alpine + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-48082 hostport: 0 - containerport: 6379 + containerport: 48082 protocol: TCP hostip: "" envfrom: @@ -21441,15 +21428,27 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: [] + env: + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-command/secrets-token.json + valuefrom: null + - name: SERVICE_HOST + value: edgex-core-command + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: db-data + - name: anonymous-volume1 readonly: false - mountpath: /data + mountpath: /tmp/edgex/secrets/ca + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume2 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -21481,7 +21480,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -21508,20 +21507,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-vault service: ports: - - name: tcp-49990 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 49990 + port: 8200 targetport: type: 0 - intval: 49990 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -21543,7 +21542,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -21558,24 +21557,189 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-vault + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: vault-file + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: vault-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: vault-logs + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/docker-device-virtual-go:1.3.1 + - name: edgex-vault + image: openyurt/vault:1.5.3 command: [] args: [] workingdir: "" ports: - - name: tcp-49990 + - name: tcp-8200 hostport: 0 - containerport: 49990 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -21586,14 +21750,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: VAULT_ADDR + value: https://edgex-vault:8200 + valuefrom: null + - name: VAULT_CONFIG_DIR + value: /vault/config + valuefrom: null + - name: VAULT_UI + value: "true" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /vault/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-vault + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-file + readonly: false + mountpath: /vault/file + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-init + readonly: false + mountpath: /vault/init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-logs + readonly: false + mountpath: /vault/logs + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -21622,7 +21822,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -21649,20 +21849,47 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: kong service: ports: - - name: tcp-48081 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 48081 + port: 8000 targetport: type: 0 - intval: 48081 + intval: 8000 + strval: "" + nodeport: 0 + - name: tcp-8001 + protocol: TCP + appprotocol: null + port: 8001 + targetport: + type: 0 + intval: 8001 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 + strval: "" + nodeport: 0 + - name: tcp-8444 + protocol: TCP + appprotocol: null + port: 8444 + targetport: + type: 0 + intval: 8444 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: kong clusterip: "" clusterips: [] type: "" @@ -21684,7 +21911,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: kong matchexpressions: [] template: objectmeta: @@ -21699,19 +21926,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: anonymous-volume1 + - name: tmpfs-volume1 volumesource: - hostpath: - path: /tmp/edgex/secrets/ca - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -21739,12 +21966,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-core-metadata - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-scripts + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -21774,15 +22067,30 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: kong + image: openyurt/kong:2.0.5 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-8000 hostport: 0 - containerport: 48081 + containerport: 8000 + protocol: TCP + hostip: "" + - name: tcp-8001 + hostport: 0 + containerport: 8001 + protocol: TCP + hostip: "" + - name: tcp-8443 + hostport: 0 + containerport: 8443 + protocol: TCP + hostip: "" + - name: tcp-8444 + hostport: 0 + containerport: 8444 protocol: TCP hostip: "" envfrom: @@ -21793,29 +22101,56 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: KONG_ADMIN_LISTEN + value: 0.0.0.0:8001, 0.0.0.0:8444 ssl + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PG_HOST + value: kong-db + valuefrom: null + - name: KONG_PG_PASSWORD + value: kong + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: anonymous-volume1 + - name: tmpfs-volume1 readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: tmpfs-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-metadata + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -21847,7 +22182,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: kong subdomain: "" affinity: null schedulername: "" @@ -21874,29 +22209,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-support-scheduler service: ports: - - name: tcp-20498 - protocol: TCP - appprotocol: null - port: 20498 - targetport: - type: 0 - intval: 20498 - strval: "" - nodeport: 0 - - name: tcp-48075 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 48075 + port: 48085 targetport: type: 0 - intval: 48075 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -21918,7 +22244,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -21933,29 +22259,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/ca + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume2 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-support-scheduler + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/kuiper:1.1.1-alpine + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-20498 - hostport: 0 - containerport: 20498 - protocol: TCP - hostip: "" - - name: tcp-48075 + - name: tcp-48085 hostport: 0 - containerport: 48075 + containerport: 48085 protocol: TCP hostip: "" envfrom: @@ -21966,32 +22353,35 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__RESTPORT - value: "48075" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "5566" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: tcp - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-app-service-configurable-rules + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX__DEFAULT__SERVICESERVER - value: http://edgex-core-data:48080 + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: events + - name: SERVICE_HOST + value: edgex-support-scheduler valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/ca + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume2 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-support-scheduler + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -22020,7 +22410,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -22047,42 +22437,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications - service: - ports: - - name: tcp-48060 - protocol: TCP - appprotocol: null - port: 48060 - targetport: - type: 0 - intval: 48060 - strval: "" - nodeport: 0 - selector: - app: edgex-support-notifications - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: "" deployment: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: "" matchexpressions: [] template: objectmeta: @@ -22097,19 +22457,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: "" annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: anonymous-volume1 + - name: tmpfs-volume1 volumesource: - hostpath: - path: /tmp/edgex/secrets/ca - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22137,12 +22497,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: consul-scripts volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-support-notifications - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22172,17 +22532,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/docker-support-notifications-go:1.3.1 + - name: "" + image: openyurt/kong:2.0.5 command: [] args: [] workingdir: "" - ports: - - name: tcp-48060 - hostport: 0 - containerport: 48060 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -22191,26 +22546,29 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: KONG_PG_PASSWORD + value: kong valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-notifications/secrets-token.json + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PG_HOST + value: kong-db valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: anonymous-volume1 + - name: tmpfs-volume1 readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: consul-scripts readonly: false - mountpath: /tmp/edgex/secrets/edgex-support-notifications + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" @@ -22242,7 +22600,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: "" subdomain: "" affinity: null schedulername: "" @@ -22269,12 +22627,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault-worker + - name: edgex-support-notifications + service: + ports: + - name: tcp-48060 + protocol: TCP + appprotocol: null + port: 48060 + targetport: + type: 0 + intval: 48060 + strval: "" + nodeport: 0 + selector: + app: edgex-support-notifications + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-vault-worker + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -22289,116 +22677,17 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault-worker + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-scripts - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets + path: /tmp/edgex/secrets/ca type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -22428,12 +22717,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-config + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/edgex-support-notifications + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22463,12 +22752,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault-worker - image: openyurt/docker-security-secretstore-setup-go:1.3.1 + - name: edgex-support-notifications + image: openyurt/docker-support-notifications-go:1.3.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-48060 + hostport: 0 + containerport: 48060 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -22477,41 +22771,26 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-support-notifications/secrets-token.json + valuefrom: null + - name: SERVICE_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /vault - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume2 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/edgex-support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -22543,7 +22822,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault-worker + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -22570,12 +22849,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrap-database + - name: edgex-secrets-setup deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrap-database + app: edgex-secrets-setup matchexpressions: [] template: objectmeta: @@ -22590,7 +22869,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrap-database + app: edgex-secrets-setup annotations: {} ownerreferences: [] finalizers: [] @@ -22663,10 +22942,43 @@ versions: storageos: null csi: null ephemeral: null + - name: secrets-setup-cache + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/ca + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -22696,12 +23008,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: vault-init volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-security-bootstrap-redis - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22731,8 +23043,8 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrap-database - image: openyurt/docker-security-bootstrap-redis-go:1.3.1 + - name: edgex-secrets-setup + image: openyurt/docker-security-secrets-setup-go:1.3.1 command: [] args: [] workingdir: "" @@ -22741,16 +23053,10 @@ versions: - prefix: "" configmapref: localobjectreference: - name: common-variable-hanoi - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-security-bootstrap-database - valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json - valuefrom: null + name: common-variable-hanoi + optional: null + secretref: null + env: [] resources: limits: {} requests: {} @@ -22758,25 +23064,31 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - name: tmpfs-volume2 readonly: false - mountpath: /vault + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: secrets-setup-cache + readonly: false + mountpath: /etc/edgex/pki subpath: "" mountpropagation: null subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: vault-init readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis + mountpath: /vault/init subpath: "" mountpropagation: null subpathexpr: "" @@ -22808,7 +23120,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrap-database + hostname: edgex-secrets-setup subdomain: "" affinity: null schedulername: "" @@ -22835,20 +23147,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-service-configurable-rules + - name: edgex-core-consul service: ports: - - name: tcp-48100 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 48100 + port: 8500 targetport: type: 0 - intval: 48100 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-app-service-configurable-rules + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -22870,130 +23182,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-service-configurable-rules - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-app-service-configurable-rules - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-app-service-configurable-rules - image: openyurt/docker-app-service-configurable:1.3.1 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-48100 - hostport: 0 - containerport: 48100 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-app-service-configurable-rules - valuefrom: null - - name: MESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-core-data - valuefrom: null - - name: BINDING_PUBLISHTOPIC - value: events - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: SERVICE_PORT - value: "48100" - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: [] - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-app-service-configurable-rules - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: "" - deployment: - replicas: null - selector: - matchlabels: - app: "" + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -23008,14 +23197,80 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: "" + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-scripts volumesource: hostpath: null emptydir: @@ -23048,12 +23303,45 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/ca + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -23081,173 +23369,10 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: "" - image: openyurt/kong:2.0.5 - command: [] - args: [] - workingdir: "" - ports: [] - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - optional: null - secretref: null - env: - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_PG_HOST - value: kong-db - valuefrom: null - - name: KONG_PG_PASSWORD - value: kong - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: "" - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-core-data - service: - ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-48080 - protocol: TCP - appprotocol: null - port: 48080 - targetport: - type: 0 - intval: 48080 - strval: "" - nodeport: 0 - selector: - app: edgex-core-data - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-core-data - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-data - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: anonymous-volume1 + - name: anonymous-volume3 volumesource: hostpath: - path: /tmp/edgex/secrets/ca + path: /tmp/edgex/secrets/edgex-kong type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23277,10 +23402,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: anonymous-volume4 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-data + path: /tmp/edgex/secrets/edgex-vault type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23312,20 +23437,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-core-consul + image: openyurt/docker-edgex-consul:1.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-48080 + - name: tcp-8500 hostport: 0 - containerport: 48080 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -23336,17 +23456,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: SECRETSTORE_SETUP_DONE_FLAG + value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json + - name: EDGEX_DB + value: redis + valuefrom: null + - name: EDGEX_SECURE + value: "true" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false mountpath: /tmp/edgex/secrets/ca @@ -23355,7 +23496,19 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-data + mountpath: /tmp/edgex/secrets/edgex-consul + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume3 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-kong + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume4 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-vault subpath: "" mountpropagation: null subpathexpr: "" @@ -23387,7 +23540,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -23414,20 +23567,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-core-metadata service: ports: - - name: tcp-48085 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 48085 + port: 48081 targetport: type: 0 - intval: 48085 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -23449,7 +23602,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -23464,7 +23617,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -23507,7 +23660,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-support-scheduler + path: /tmp/edgex/secrets/edgex-core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23539,15 +23692,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/docker-support-scheduler-go:1.3.1 + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48085 + - name: tcp-48081 hostport: 0 - containerport: 48085 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -23558,17 +23711,14 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json valuefrom: null resources: limits: {} @@ -23583,7 +23733,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-support-scheduler + mountpath: /tmp/edgex/secrets/edgex-core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -23615,7 +23765,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -23642,20 +23792,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-app-service-configurable-rules service: ports: - - name: tcp-48090 + - name: tcp-48100 protocol: TCP appprotocol: null - port: 48090 + port: 48100 targetport: type: 0 - intval: 48090 + intval: 48100 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules clusterip: "" clusterips: [] type: "" @@ -23677,7 +23827,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules matchexpressions: [] template: objectmeta: @@ -23692,57 +23842,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/docker-sys-mgmt-agent-go:1.3.1 + - name: edgex-app-service-configurable-rules + image: openyurt/docker-app-service-configurable:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48090 + - name: tcp-48100 hostport: 0 - containerport: 48090 + containerport: 48100 protocol: TCP hostip: "" envfrom: @@ -23753,26 +23870,26 @@ versions: optional: null secretref: null env: + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: BINDING_PUBLISHTOPIC + value: events + valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-app-service-configurable-rules valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: SERVICE_PORT + value: "48100" valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: MESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-core-data valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -23801,7 +23918,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-app-service-configurable-rules subdomain: "" affinity: null schedulername: "" @@ -23828,42 +23945,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault - service: - ports: - - name: tcp-8200 - protocol: TCP - appprotocol: null - port: 8200 - targetport: - type: 0 - intval: 8200 - strval: "" - nodeport: 0 - selector: - app: edgex-vault - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-vault-worker deployment: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-vault-worker matchexpressions: [] template: objectmeta: @@ -23878,7 +23965,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-vault-worker annotations: {} ownerreferences: [] finalizers: [] @@ -23918,12 +24005,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-vault - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -23951,7 +24038,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - name: consul-scripts volumesource: hostpath: null emptydir: @@ -23984,12 +24071,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-init + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -24017,7 +24104,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - name: vault-config volumesource: hostpath: null emptydir: @@ -24052,17 +24139,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.5.3 + - name: edgex-vault-worker + image: openyurt/docker-security-secretstore-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-8200 - hostport: 0 - containerport: 8200 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -24071,14 +24153,8 @@ versions: optional: null secretref: null env: - - name: VAULT_UI - value: "true" - valuefrom: null - - name: VAULT_ADDR - value: https://edgex-vault:8200 - valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: SECRETSTORE_SETUP_DONE_FLAG + value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done valuefrom: null resources: limits: {} @@ -24087,31 +24163,31 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /vault/config + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: tmpfs-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-vault + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: consul-scripts readonly: false - mountpath: /vault/file + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-init + - name: anonymous-volume1 readonly: false - mountpath: /vault/init + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-logs + - name: vault-config readonly: false - mountpath: /vault/logs + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -24143,7 +24219,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-vault-worker subdomain: "" affinity: null schedulername: "" @@ -24170,12 +24246,51 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-proxy + - name: edgex-core-data + service: + ports: + - name: tcp-5563 + protocol: TCP + appprotocol: null + port: 5563 + targetport: + type: 0 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-48080 + protocol: TCP + appprotocol: null + port: 48080 + targetport: + type: 0 + intval: 48080 + strval: "" + nodeport: 0 + selector: + app: edgex-core-data + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-proxy + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -24190,46 +24305,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-proxy + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-scripts - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: @@ -24266,7 +24348,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-security-proxy-setup + path: /tmp/edgex/secrets/edgex-core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -24298,12 +24380,22 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-proxy - image: openyurt/docker-security-proxy-setup-go:1.3.1 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-5563 + hostport: 0 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -24312,32 +24404,17 @@ versions: optional: null secretref: null env: - - name: SECRETSERVICE_TOKENPATH - value: /tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json - valuefrom: null - - name: SECRETSERVICE_SNIS - value: edgex-kong - valuefrom: null - - name: KONGURL_SERVER - value: kong - valuefrom: null - - name: SECRETSERVICE_SERVER - value: edgex-vault + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: SECRETSERVICE_CACERTPATH - value: /tmp/edgex/secrets/ca/ca.pem + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false mountpath: /tmp/edgex/secrets/ca @@ -24346,7 +24423,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup + mountpath: /tmp/edgex/secrets/edgex-core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -24378,7 +24455,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-proxy + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -24405,12 +24482,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-secrets-setup + - name: edgex-redis + service: + ports: + - name: tcp-6379 + protocol: TCP + appprotocol: null + port: 6379 + targetport: + type: 0 + intval: 6379 + strval: "" + nodeport: 0 + selector: + app: edgex-redis + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-secrets-setup + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -24425,146 +24532,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-secrets-setup - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: secrets-setup-cache - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-init + app: edgex-redis + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: db-data volumesource: hostpath: null emptydir: @@ -24599,12 +24574,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-secrets-setup - image: openyurt/docker-security-secrets-setup-go:1.3.1 + - name: edgex-redis + image: openyurt/redis:6.0.9-alpine command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-6379 + hostport: 0 + containerport: 6379 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -24618,33 +24598,9 @@ versions: requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: secrets-setup-cache - readonly: false - mountpath: /etc/edgex/pki - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-init + - name: db-data readonly: false - mountpath: /vault/init + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -24676,7 +24632,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-secrets-setup + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -24703,20 +24659,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-48082 + - name: tcp-48090 protocol: TCP appprotocol: null - port: 48082 + port: 48090 targetport: type: 0 - intval: 48082 + intval: 48090 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -24738,7 +24694,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -24753,13 +24709,202 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-sys-mgmt-agent + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: anonymous-volume1 + volumesource: + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-sys-mgmt-agent + image: openyurt/docker-sys-mgmt-agent-go:1.3.1 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-48090 + hostport: 0 + containerport: 48090 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-hanoi + optional: null + secretref: null + env: + - name: METRICSMECHANISM + value: executor + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-sys-mgmt-agent + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-proxy + deployment: + replicas: null + selector: + matchlabels: + app: edgex-proxy + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-proxy annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: consul-scripts + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: @@ -24796,7 +24941,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-command + path: /tmp/edgex/secrets/edgex-security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -24827,18 +24972,13 @@ versions: csi: null ephemeral: null initcontainers: [] - containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + containers: + - name: edgex-proxy + image: openyurt/docker-security-proxy-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-48082 - hostport: 0 - containerport: 48082 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -24847,17 +24987,32 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-command/secrets-token.json + - name: SECRETSERVICE_CACERTPATH + value: /tmp/edgex/secrets/ca/ca.pem valuefrom: null - - name: SERVICE_HOST - value: edgex-core-command + - name: SECRETSERVICE_TOKENPATH + value: /tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json + valuefrom: null + - name: KONGURL_SERVER + value: kong + valuefrom: null + - name: SECRETSERVICE_SERVER + value: edgex-vault + valuefrom: null + - name: SECRETSERVICE_SNIS + value: edgex-kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false mountpath: /tmp/edgex/secrets/ca @@ -24866,7 +25021,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-command + mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -24898,7 +25053,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-proxy subdomain: "" affinity: null schedulername: "" @@ -24925,20 +25080,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-device-virtual service: ports: - - name: tcp-49986 + - name: tcp-49990 protocol: TCP appprotocol: null - port: 49986 + port: 49990 targetport: type: 0 - intval: 49986 + intval: 49990 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -24960,7 +25115,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -24975,7 +25130,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -24984,15 +25139,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/docker-device-rest-go:1.2.1 + - name: edgex-device-virtual + image: openyurt/docker-device-virtual-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-49986 + - name: tcp-49990 hostport: 0 - containerport: 49986 + containerport: 49990 protocol: TCP hostip: "" envfrom: @@ -25004,7 +25159,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -25039,7 +25194,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -25066,42 +25221,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul - service: - ports: - - name: tcp-8500 - protocol: TCP - appprotocol: null - port: 8500 - targetport: - type: 0 - intval: 8500 - strval: "" - nodeport: 0 - selector: - app: edgex-core-consul - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-bootstrap-database deployment: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-security-bootstrap-database matchexpressions: [] template: objectmeta: @@ -25116,47 +25241,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-security-bootstrap-database annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -25189,7 +25281,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -25258,73 +25350,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume3 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-kong - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume4 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-vault + path: /tmp/edgex/secrets/edgex-security-bootstrap-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -25356,17 +25382,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/docker-edgex-consul:1.3.0 + - name: edgex-security-bootstrap-database + image: openyurt/docker-security-bootstrap-redis-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-8500 - hostport: 0 - containerport: 8500 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -25375,35 +25396,26 @@ versions: optional: null secretref: null env: - - name: EDGEX_SECURE - value: "true" - valuefrom: null - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done + - name: SERVICE_HOST + value: edgex-security-bootstrap-database valuefrom: null - - name: EDGEX_DB - value: redis + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: tmpfs-volume1 readonly: false - mountpath: /consul/data + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-scripts + - name: tmpfs-volume2 readonly: false - mountpath: /consul/scripts + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -25415,19 +25427,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume3 - readonly: false - mountpath: /tmp/edgex/secrets/edgex-kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume4 - readonly: false - mountpath: /tmp/edgex/secrets/edgex-vault + mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -25459,7 +25459,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-security-bootstrap-database subdomain: "" affinity: null schedulername: "" diff --git a/api/v1alpha1/edgex_conversion.go b/api/v1alpha1/edgex_conversion.go index cd2dab6..8d7d09f 100644 --- a/api/v1alpha1/edgex_conversion.go +++ b/api/v1alpha1/edgex_conversion.go @@ -14,6 +14,8 @@ limitations under the License. package v1alpha1 import ( + "encoding/json" + "github.com/openyurtio/yurt-edgex-manager/api/v1alpha2" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" @@ -39,7 +41,26 @@ func (src *EdgeX) ConvertTo(dstRaw conversion.Hub) error { dst.Status.UnreadyComponentNum = src.Status.DeploymentReplicas - src.Status.DeploymentReadyReplicas dst.Status.Conditions = src.Status.Conditions + // Transform additionaldeployment + if len(src.Spec.AdditionalDeployment) > 0 { + additionalDeployment, err := json.Marshal(src.Spec.AdditionalDeployment) + if err != nil { + return err + } + dst.ObjectMeta.Annotations["AdditionalDeployments"] = string(additionalDeployment) + } + + // Transform additionalservice + if len(src.Spec.AdditionalService) > 0 { + additionalService, err := json.Marshal(src.Spec.AdditionalService) + if err != nil { + return err + } + dst.ObjectMeta.Annotations["AdditionalServices"] = string(additionalService) + } + //TODO: Components + return nil } func (dst *EdgeX) ConvertFrom(srcRaw conversion.Hub) error { @@ -64,6 +85,25 @@ func (dst *EdgeX) ConvertFrom(srcRaw conversion.Hub) error { dst.Status.DeploymentReplicas = src.Status.ReadyComponentNum + src.Status.UnreadyComponentNum dst.Status.Conditions = src.Status.Conditions - //TODO: AdditionalService and AdditionalDeployment + // Transform additionaldeployment + if _, ok := src.ObjectMeta.Annotations["AdditionalDeployments"]; ok { + var additionalDeployments []DeploymentTemplateSpec = make([]DeploymentTemplateSpec, 0) + err := json.Unmarshal([]byte(src.ObjectMeta.Annotations["AdditionalDeployments"]), &additionalDeployments) + if err != nil { + return err + } + dst.Spec.AdditionalDeployment = additionalDeployments + } + + // Transform additionalservice + if _, ok := src.ObjectMeta.Annotations["AdditionalServices"]; ok { + var additionalServices []ServiceTemplateSpec = make([]ServiceTemplateSpec, 0) + err := json.Unmarshal([]byte(src.ObjectMeta.Annotations["AdditionalServices"]), &additionalServices) + if err != nil { + return err + } + dst.Spec.AdditionalService = additionalServices + } + return nil } diff --git a/config/samples/hangzhou.yaml b/config/samples/hangzhou.yaml index 68207b7..32f2308 100644 --- a/config/samples/hangzhou.yaml +++ b/config/samples/hangzhou.yaml @@ -4,8 +4,8 @@ metadata: name: edgex-sample-hangzhou spec: version: hanoi - poolname: hangzhou - additinalservices: + poolName: hangzhou + additionalServices: - metadata: name: edgex-device-virtual spec: @@ -18,7 +18,7 @@ spec: protocol: TCP targetPort: 49990 nodePort: 30090 - additinaldeployments: + additionalDeployments: - metadata: name: edgex-device-virtual spec: @@ -41,7 +41,7 @@ spec: containerPort: 49990 envFrom: - configMapRef: - name: common-variables + name: common-variable-hanoi env: - name: Service_Host value: "edgex-device-virtual" diff --git a/config/samples/jakarta-sak.yaml b/config/samples/jakarta-sak.yaml index c5a98b7..df5c90f 100644 --- a/config/samples/jakarta-sak.yaml +++ b/config/samples/jakarta-sak.yaml @@ -4,8 +4,8 @@ metadata: name: edgex-sample-hangzhou spec: version: jakarta - poolname: hangzhou - additinalservices: + poolName: beijing + additionalServices: - metadata: name: edgex-device-sak spec: @@ -18,7 +18,7 @@ spec: protocol: TCP targetPort: 59100 nodePort: 30090 - additinaldeployments: + additionalDeployments: - metadata: name: edgex-device-sak spec: @@ -41,9 +41,8 @@ spec: containerPort: 59100 envFrom: - configMapRef: - name: common-variables + name: common-variable-jakarta env: - name: SERVICE_HOST value: "edgex-device-sak" - securityContext: - privileged: true + diff --git a/controllers/edgex_controller.go b/controllers/edgex_controller.go index d233004..7be432b 100644 --- a/controllers/edgex_controller.go +++ b/controllers/edgex_controller.go @@ -18,6 +18,7 @@ package controllers import ( "context" + "encoding/json" "reflect" "time" @@ -161,6 +162,13 @@ func (r *EdgeXReconciler) reconcileDelete(ctx context.Context, edgex *devicev1al } else { desiredComponents = NoSectyComponents[edgex.Spec.Version] } + + additionalComponents, err := annotationToComponent(edgex.Annotations) + if err != nil { + return ctrl.Result{}, err + } + desiredComponents = append(desiredComponents, additionalComponents...) + //TODO: handle edgex.Spec.Components for _, dc := range desiredComponents { @@ -285,6 +293,13 @@ func (r *EdgeXReconciler) reconcileComponent(ctx context.Context, edgex *devicev } else { desireComponents = NoSectyComponents[edgex.Spec.Version] } + + additionalComponents, err := annotationToComponent(edgex.Annotations) + if err != nil { + return false, err + } + desireComponents = append(desireComponents, additionalComponents...) + //TODO: handle edgex.Spec.Components defer func() { @@ -459,6 +474,59 @@ func (r *EdgeXReconciler) handleYurtAppSet(ctx context.Context, edgex *devicev1a return ud, nil } +// For version compatibility, v1alpha1's additionalservice and additionaldeployment are placed in +// v2alpha2's annotation, this function is to convert the annotation to component. +func annotationToComponent(annotation map[string]string) ([]*Component, error) { + var components []*Component = []*Component{} + var additionalDeployments []devicev1alpha1.DeploymentTemplateSpec = make([]devicev1alpha1.DeploymentTemplateSpec, 0) + if _, ok := annotation["AdditionalDeployments"]; ok { + err := json.Unmarshal([]byte(annotation["AdditionalDeployments"]), &additionalDeployments) + if err != nil { + return nil, err + } + } + var additionalServices []devicev1alpha1.ServiceTemplateSpec = make([]devicev1alpha1.ServiceTemplateSpec, 0) + if _, ok := annotation["AdditionalServices"]; ok { + err := json.Unmarshal([]byte(annotation["AdditionalServices"]), &additionalServices) + if err != nil { + return nil, err + } + } + if len(additionalDeployments) == 0 && len(additionalServices) == 0 { + return components, nil + } + var services map[string]*corev1.ServiceSpec = make(map[string]*corev1.ServiceSpec) + var usedServices map[string]struct{} = make(map[string]struct{}) + for _, additionalservice := range additionalServices { + services[additionalservice.Name] = &additionalservice.Spec + } + for _, additionalDeployment := range additionalDeployments { + var component Component + component.Name = additionalDeployment.Name + component.Deployment = &additionalDeployment.Spec + service, ok := services[component.Name] + if ok { + component.Service = service + usedServices[component.Name] = struct{}{} + } + components = append(components, &component) + } + if len(usedServices) < len(services) { + for name, service := range services { + _, ok := usedServices[name] + if ok { + continue + } + var component Component + component.Name = name + component.Service = service + components = append(components, &component) + } + } + + return components, nil +} + // SetupWithManager sets up the controller with the Manager. func (r *EdgeXReconciler) SetupWithManager(mgr ctrl.Manager) error { diff --git a/test/e2e/data/beijing.yaml b/test/e2e/data/beijing.yaml index 839d7ee..8c0035a 100644 --- a/test/e2e/data/beijing.yaml +++ b/test/e2e/data/beijing.yaml @@ -45,7 +45,7 @@ spec: containerPort: 59900 envFrom: - configMapRef: - name: common-variables + name: common-variable-jakarta env: - name: Service_Host value: "edgex-device-virtual" diff --git a/test/e2e/data/hangzhou.yaml b/test/e2e/data/hangzhou.yaml index 8a767f2..eeccdbd 100644 --- a/test/e2e/data/hangzhou.yaml +++ b/test/e2e/data/hangzhou.yaml @@ -45,7 +45,7 @@ spec: containerPort: 49990 envFrom: - configMapRef: - name: common-variables + name: common-variable-hanoi env: - name: Service_Host value: "edgex-device-virtual" diff --git a/tools/collector/config/multiarch_imagelist.txt b/tools/collector/config/multiarch_imagelist.txt index 1258c43..1f5ef2b 100644 --- a/tools/collector/config/multiarch_imagelist.txt +++ b/tools/collector/config/multiarch_imagelist.txt @@ -1,32 +1,29 @@ -kong:2.8.1 -redis:7.0.5-alpine -vault:1.11.4 lfedge/ekuiper:1.7.1-alpine postgres:13.8-alpine +redis:7.0.5-alpine +kong:2.8.1 consul:1.13.2 -vault:1.8.4 +vault:1.11.4 postgres:13.4-alpine lfedge/ekuiper:1.4.4-alpine -redis:6.2.6-alpine consul:1.10.3 +vault:1.8.4 kong:2.5.1 -consul:1.10.10 +redis:6.2.6-alpine vault:1.8.9 -lfedge/ekuiper:1.4.4-alpine -kong:2.6.1 postgres:13.5-alpine +consul:1.10.10 redis:6.2.6-alpine -redis:6.2.4-alpine -postgres:12.3-alpine +kong:2.6.1 +lfedge/ekuiper:1.4.4-alpine vault:1.7.2 -consul:1.9.5 +redis:6.2.4-alpine lfedge/ekuiper:1.3.0-alpine kong:2.4.1-alpine postgres:12.3-alpine -kong:2.0.5 -redis:6.0.9-alpine +consul:1.9.5 emqx/kuiper:1.1.1-alpine -kong:2.0.5 +postgres:12.3-alpine vault:1.5.3 postgres:12.3-alpine kong:2.0.5 \ No newline at end of file diff --git a/tools/collector/config/singlearch_imagelist.txt b/tools/collector/config/singlearch_imagelist.txt index a625dd3..9b02557 100644 --- a/tools/collector/config/singlearch_imagelist.txt +++ b/tools/collector/config/singlearch_imagelist.txt @@ -1,65 +1,67 @@ -edgexfoundry/security-proxy-setup:2.3.0 edgexfoundry/security-proxy-setup-arm64:2.3.0 +edgexfoundry/core-command:2.3.0 edgexfoundry/core-command-arm64:2.3.0 edgexfoundry/device-virtual:2.3.0 edgexfoundry/device-virtual-arm64:2.3.0 -edgexfoundry/app-service-configurable:2.3.0 edgexfoundry/app-service-configurable-arm64:2.3.0 -edgexfoundry/security-bootstrapper:2.3.0 edgexfoundry/security-bootstrapper-arm64:2.3.0 +edgexfoundry/device-rest:2.3.0 edgexfoundry/device-rest-arm64:2.3.0 edgexfoundry/support-notifications:2.3.0 edgexfoundry/support-notifications-arm64:2.3.0 -edgexfoundry/security-secretstore-setup:2.3.0 edgexfoundry/security-secretstore-setup-arm64:2.3.0 +edgexfoundry/core-data:2.3.0 edgexfoundry/core-data-arm64:2.3.0 +edgexfoundry/sys-mgmt-agent:2.3.0 edgexfoundry/sys-mgmt-agent-arm64:2.3.0 edgexfoundry/edgex-ui:2.3.0 edgexfoundry/edgex-ui-arm64:2.3.0 -edgexfoundry/core-command:2.3.0 edgexfoundry/core-command-arm64:2.3.0 +edgexfoundry/security-secretstore-setup:2.3.0 edgexfoundry/security-secretstore-setup-arm64:2.3.0 edgexfoundry/core-metadata:2.3.0 edgexfoundry/core-metadata-arm64:2.3.0 -edgexfoundry/sys-mgmt-agent:2.3.0 edgexfoundry/sys-mgmt-agent-arm64:2.3.0 +edgexfoundry/app-service-configurable:2.3.0 edgexfoundry/app-service-configurable-arm64:2.3.0 edgexfoundry/support-scheduler:2.3.0 edgexfoundry/support-scheduler-arm64:2.3.0 -edgexfoundry/device-rest:2.3.0 edgexfoundry/device-rest-arm64:2.3.0 -edgexfoundry/core-data:2.3.0 edgexfoundry/core-data-arm64:2.3.0 -edgexfoundry/app-service-configurable:2.1.1 edgexfoundry/app-service-configurable-arm64:2.1.1 +edgexfoundry/security-proxy-setup:2.3.0 edgexfoundry/security-proxy-setup-arm64:2.3.0 +edgexfoundry/security-bootstrapper:2.3.0 edgexfoundry/security-bootstrapper-arm64:2.3.0 +edgexfoundry/security-secretstore-setup:2.1.1 edgexfoundry/security-secretstore-setup-arm64:2.1.1 +edgexfoundry/support-scheduler:2.1.1 edgexfoundry/support-scheduler-arm64:2.1.1 edgexfoundry/core-command:2.1.1 edgexfoundry/core-command-arm64:2.1.1 -edgexfoundry/core-metadata:2.1.1 edgexfoundry/core-metadata-arm64:2.1.1 edgexfoundry/security-bootstrapper:2.1.1 edgexfoundry/security-bootstrapper-arm64:2.1.1 edgexfoundry/support-notifications:2.1.1 edgexfoundry/support-notifications-arm64:2.1.1 -edgexfoundry/device-virtual:2.1.1 edgexfoundry/device-virtual-arm64:2.1.1 -edgexfoundry/support-scheduler:2.1.1 edgexfoundry/support-scheduler-arm64:2.1.1 -edgexfoundry/edgex-ui:2.1.0 edgexfoundry/edgex-ui-arm64:2.1.0 -edgexfoundry/security-secretstore-setup:2.1.1 edgexfoundry/security-secretstore-setup-arm64:2.1.1 -edgexfoundry/core-data:2.1.1 edgexfoundry/core-data-arm64:2.1.1 -edgexfoundry/sys-mgmt-agent:2.1.1 edgexfoundry/sys-mgmt-agent-arm64:2.1.1 +edgexfoundry/core-metadata:2.1.1 edgexfoundry/core-metadata-arm64:2.1.1 edgexfoundry/security-proxy-setup:2.1.1 edgexfoundry/security-proxy-setup-arm64:2.1.1 +edgexfoundry/sys-mgmt-agent:2.1.1 edgexfoundry/sys-mgmt-agent-arm64:2.1.1 edgexfoundry/device-rest:2.1.1 edgexfoundry/device-rest-arm64:2.1.1 +edgexfoundry/core-data:2.1.1 edgexfoundry/core-data-arm64:2.1.1 +edgexfoundry/edgex-ui:2.1.0 edgexfoundry/edgex-ui-arm64:2.1.0 +edgexfoundry/device-virtual:2.1.1 edgexfoundry/device-virtual-arm64:2.1.1 +edgexfoundry/app-service-configurable:2.1.1 edgexfoundry/app-service-configurable-arm64:2.1.1 +edgexfoundry/support-scheduler:2.2.0 edgexfoundry/support-scheduler-arm64:2.2.0 +edgexfoundry/core-data:2.2.0 edgexfoundry/core-data-arm64:2.2.0 edgexfoundry/core-command:2.2.0 edgexfoundry/core-command-arm64:2.2.0 edgexfoundry/edgex-ui:2.2.0 edgexfoundry/edgex-ui-arm64:2.2.0 -edgexfoundry/app-service-configurable:2.2.0 edgexfoundry/app-service-configurable-arm64:2.2.0 -edgexfoundry/device-rest:2.2.0 edgexfoundry/device-rest-arm64:2.2.0 -edgexfoundry/security-bootstrapper:2.2.0 edgexfoundry/security-bootstrapper-arm64:2.2.0 -edgexfoundry/core-metadata:2.2.0 edgexfoundry/core-metadata-arm64:2.2.0 edgexfoundry/security-secretstore-setup:2.2.0 edgexfoundry/security-secretstore-setup-arm64:2.2.0 -edgexfoundry/support-scheduler:2.2.0 edgexfoundry/support-scheduler-arm64:2.2.0 -edgexfoundry/core-data:2.2.0 edgexfoundry/core-data-arm64:2.2.0 -edgexfoundry/support-notifications:2.2.0 edgexfoundry/support-notifications-arm64:2.2.0 edgexfoundry/device-virtual:2.2.0 edgexfoundry/device-virtual-arm64:2.2.0 -edgexfoundry/sys-mgmt-agent:2.2.0 edgexfoundry/sys-mgmt-agent-arm64:2.2.0 edgexfoundry/security-proxy-setup:2.2.0 edgexfoundry/security-proxy-setup-arm64:2.2.0 +edgexfoundry/core-metadata:2.2.0 edgexfoundry/core-metadata-arm64:2.2.0 +edgexfoundry/security-bootstrapper:2.2.0 edgexfoundry/security-bootstrapper-arm64:2.2.0 +edgexfoundry/device-rest:2.2.0 edgexfoundry/device-rest-arm64:2.2.0 +edgexfoundry/support-notifications:2.2.0 edgexfoundry/support-notifications-arm64:2.2.0 +edgexfoundry/sys-mgmt-agent:2.2.0 edgexfoundry/sys-mgmt-agent-arm64:2.2.0 +edgexfoundry/app-service-configurable:2.2.0 edgexfoundry/app-service-configurable-arm64:2.2.0 edgexfoundry/support-scheduler:2.0.0 edgexfoundry/support-scheduler-arm64:2.0.0 -edgexfoundry/security-secretstore-setup:2.0.0 edgexfoundry/security-secretstore-setup-arm64:2.0.0 -edgexfoundry/core-metadata:2.0.0 edgexfoundry/core-metadata-arm64:2.0.0 -edgexfoundry/support-notifications:2.0.0 edgexfoundry/support-notifications-arm64:2.0.0 -edgexfoundry/security-bootstrapper:2.0.0 edgexfoundry/security-bootstrapper-arm64:2.0.0 -edgexfoundry/app-service-configurable:2.0.1 edgexfoundry/app-service-configurable-arm64:2.0.1 -edgexfoundry/core-data:2.0.0 edgexfoundry/core-data-arm64:2.0.0 edgexfoundry/security-proxy-setup:2.0.0 edgexfoundry/security-proxy-setup-arm64:2.0.0 edgexfoundry/sys-mgmt-agent:2.0.0 edgexfoundry/sys-mgmt-agent-arm64:2.0.0 +edgexfoundry/security-bootstrapper:2.0.0 edgexfoundry/security-bootstrapper-arm64:2.0.0 +edgexfoundry/app-service-configurable:2.0.1 edgexfoundry/app-service-configurable-arm64:2.0.1 edgexfoundry/core-command:2.0.0 edgexfoundry/core-command-arm64:2.0.0 -edgexfoundry/device-rest:2.0.0 edgexfoundry/device-rest-arm64:2.0.0 +edgexfoundry/security-secretstore-setup:2.0.0 edgexfoundry/security-secretstore-setup-arm64:2.0.0 edgexfoundry/device-virtual:2.0.0 edgexfoundry/device-virtual-arm64:2.0.0 -edgexfoundry/docker-device-virtual-go:1.3.1 edgexfoundry/docker-device-virtual-go-arm64:1.3.1 -edgexfoundry/docker-core-metadata-go:1.3.1 edgexfoundry/docker-core-metadata-go-arm64:1.3.1 +edgexfoundry/core-metadata:2.0.0 edgexfoundry/core-metadata-arm64:2.0.0 +edgexfoundry/device-rest:2.0.0 edgexfoundry/device-rest-arm64:2.0.0 +edgexfoundry/support-notifications:2.0.0 edgexfoundry/support-notifications-arm64:2.0.0 +edgexfoundry/core-data:2.0.0 edgexfoundry/core-data-arm64:2.0.0 +edgexfoundry/docker-device-rest-go:1.2.1 edgexfoundry/docker-device-rest-go-arm64:1.2.1 +edgexfoundry/docker-core-command-go:1.3.1 edgexfoundry/docker-core-command-go-arm64:1.3.1 +edgexfoundry/docker-support-scheduler-go:1.3.1 edgexfoundry/docker-support-scheduler-go-arm64:1.3.1 edgexfoundry/docker-support-notifications-go:1.3.1 edgexfoundry/docker-support-notifications-go-arm64:1.3.1 -edgexfoundry/docker-security-secretstore-setup-go:1.3.1 edgexfoundry/docker-security-secretstore-setup-go-arm64:1.3.1 -edgexfoundry/docker-security-bootstrap-redis-go:1.3.1 edgexfoundry/docker-security-bootstrap-redis-go-arm64:1.3.1 +edgexfoundry/docker-security-secrets-setup-go:1.3.1 edgexfoundry/docker-security-secrets-setup-go-arm64:1.3.1 +edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 +edgexfoundry/docker-core-metadata-go:1.3.1 edgexfoundry/docker-core-metadata-go-arm64:1.3.1 edgexfoundry/docker-app-service-configurable:1.3.1 edgexfoundry/docker-app-service-configurable-arm64:1.3.1 +edgexfoundry/docker-security-secretstore-setup-go:1.3.1 edgexfoundry/docker-security-secretstore-setup-go-arm64:1.3.1 edgexfoundry/docker-core-data-go:1.3.1 edgexfoundry/docker-core-data-go-arm64:1.3.1 -edgexfoundry/docker-support-scheduler-go:1.3.1 edgexfoundry/docker-support-scheduler-go-arm64:1.3.1 edgexfoundry/docker-sys-mgmt-agent-go:1.3.1 edgexfoundry/docker-sys-mgmt-agent-go-arm64:1.3.1 edgexfoundry/docker-security-proxy-setup-go:1.3.1 edgexfoundry/docker-security-proxy-setup-go-arm64:1.3.1 edgexfoundry/docker-security-secrets-setup-go:1.3.1 edgexfoundry/docker-security-secrets-setup-go-arm64:1.3.1 edgexfoundry/docker-core-command-go:1.3.1 edgexfoundry/docker-core-command-go-arm64:1.3.1 edgexfoundry/docker-device-rest-go:1.2.1 edgexfoundry/docker-device-rest-go-arm64:1.2.1 -edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 \ No newline at end of file +edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 diff --git a/tools/collector/edgex/collect.go b/tools/collector/edgex/collect.go index 5e06db0..6460670 100644 --- a/tools/collector/edgex/collect.go +++ b/tools/collector/edgex/collect.go @@ -143,7 +143,7 @@ func ModifyImagesName(edgexConfig *EdgeXConfig, repo string) { } -func CollectVersionToManifest(versionList []Version, oldManifest *Manifest) *Manifest { +func CollectVersionToManifest(versionList []*Version, oldManifest *Manifest) *Manifest { versions := make([]string, 0) for _, v := range versionList { versions = append(versions, v.Name) diff --git a/tools/collector/main.go b/tools/collector/main.go index 141131e..d02b5ad 100644 --- a/tools/collector/main.go +++ b/tools/collector/main.go @@ -18,12 +18,11 @@ package main import ( "flag" - "io/ioutil" - "os" - "github.com/openyurtio/yurt-edgex-manager/tools/collector/edgex" "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" + "io/ioutil" + "os" ) var ( From ffbaa81c9453948561be3da4c47dc8bf0027ecce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=91=B8=E9=B1=BC=E5=96=B5?= <33485524+LavenderQAQ@users.noreply.github.com> Date: Tue, 21 Feb 2023 12:56:46 +0800 Subject: [PATCH 3/3] Changed the code structure and pr description (#89) changed the code structure and pr description --- .github/workflows/auto-submit-pr.yaml | 20 ++++++++++---------- EdgeXConfig/manifest.yaml | 5 ++--- tools/collector/edgex/component.go | 17 ----------------- tools/collector/edgex/{def.go => error.go} | 0 tools/collector/edgex/manifest.go | 18 ++++++++++++++++++ 5 files changed, 30 insertions(+), 30 deletions(-) rename tools/collector/edgex/{def.go => error.go} (100%) create mode 100644 tools/collector/edgex/manifest.go diff --git a/.github/workflows/auto-submit-pr.yaml b/.github/workflows/auto-submit-pr.yaml index d43457b..52832ae 100644 --- a/.github/workflows/auto-submit-pr.yaml +++ b/.github/workflows/auto-submit-pr.yaml @@ -1,17 +1,17 @@ on: push: branches: - - action-dev + - main schedule: - - cron: '10 * * * *' + - cron: '0 2 * * *' -name: auto collect info and create pull request +name: auto-collector jobs: auto-createPR: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: auto collect periodically + - uses: actions/checkout@v3 + - name: Launch auto-collector periodically run: make collect - name: Run read-yaml action id: yaml-data @@ -24,12 +24,12 @@ jobs: echo "${{ steps.yaml-data.outputs.updated }}" - name: Create Pull Request - if: ${{steps.yaml-data.outputs.updated == 'true' }} + if: ${{ steps.yaml-data.outputs.updated == 'true' }} uses: peter-evans/create-pull-request@v3 with: - commit-message: update config file - title: The edgeX has been updated + commit-message: discover edgex new version + title: "[auto-collector] Discover edgex new version" body: > This PR is auto-generated by github action,please check and merge the config file in time. - labels: update file, automated pr - branch: auto-generated-branch \ No newline at end of file + labels: auto-collector, automated pr + branch: auto-collector-generated-branch \ No newline at end of file diff --git a/EdgeXConfig/manifest.yaml b/EdgeXConfig/manifest.yaml index 220cfdd..aa556fb 100644 --- a/EdgeXConfig/manifest.yaml +++ b/EdgeXConfig/manifest.yaml @@ -1,8 +1,7 @@ updated: "false" -count: 5 -latestVersion: levski +count: 4 +latestVersion: kamakura versions: - - levski - jakarta - kamakura - ireland diff --git a/tools/collector/edgex/component.go b/tools/collector/edgex/component.go index 7d281b2..99bd4d5 100644 --- a/tools/collector/edgex/component.go +++ b/tools/collector/edgex/component.go @@ -33,23 +33,6 @@ const ( parseIntBaseBitSize = 32 ) -type Manifest struct { - Updated string `yaml:"updated"` - Count int `yaml:"count"` - LatestVersion string `yaml:"latestVersion"` - Versions []string `yaml:"versions"` -} - -func NewManifest() *Manifest { - manifest := &Manifest{ - Updated: "false", - Count: 0, - LatestVersion: "", - Versions: make([]string, 0), - } - return manifest -} - type Component struct { logger *logrus.Entry Name string `yaml:"name"` diff --git a/tools/collector/edgex/def.go b/tools/collector/edgex/error.go similarity index 100% rename from tools/collector/edgex/def.go rename to tools/collector/edgex/error.go diff --git a/tools/collector/edgex/manifest.go b/tools/collector/edgex/manifest.go new file mode 100644 index 0000000..9fc6eb0 --- /dev/null +++ b/tools/collector/edgex/manifest.go @@ -0,0 +1,18 @@ +package edgex + +type Manifest struct { + Updated string `yaml:"updated"` + Count int `yaml:"count"` + LatestVersion string `yaml:"latestVersion"` + Versions []string `yaml:"versions"` +} + +func NewManifest() *Manifest { + manifest := &Manifest{ + Updated: "false", + Count: 0, + LatestVersion: "", + Versions: make([]string, 0), + } + return manifest +}