diff --git a/EdgeXConfig/config-nosecty.yaml b/EdgeXConfig/config-nosecty.yaml index e2fb863..f65b3a7 100644 --- a/EdgeXConfig/config-nosecty.yaml +++ b/EdgeXConfig/config-nosecty.yaml @@ -150,7 +150,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -291,7 +291,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -318,20 +318,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-redis service: ports: - - name: tcp-4000 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 4000 + port: 6379 targetport: type: 0 - intval: 4000 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -353,7 +353,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -368,24 +368,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + 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-ui-go - image: openyurt/edgex-ui:2.3.0 + - name: edgex-redis + image: openyurt/redis:7.0.5-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-6379 hostport: 0 - containerport: 4000 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -395,15 +428,18 @@ versions: name: common-variable-levski optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-ui-go - 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 @@ -432,7 +468,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -459,20 +495,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - 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: "" @@ -494,7 +530,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -509,90 +545,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.13.2 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59900 hostport: 0 - containerport: 8500 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -602,24 +572,15 @@ versions: name: common-variable-levski 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 @@ -648,7 +609,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -675,20 +636,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-ui-go service: ports: - - name: tcp-59986 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59986 + port: 4000 targetport: type: 0 - intval: 59986 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -710,7 +671,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -725,57 +686,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-ui-go 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-device-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-4000 hostport: 0 - containerport: 59986 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -787,19 +715,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-ui-go valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -828,7 +750,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -855,20 +777,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: "" @@ -890,7 +812,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -905,57 +827,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-core-command 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-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59882 hostport: 0 - containerport: 59720 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -966,50 +855,20 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + - name: MESSAGEQUEUE_INTERNAL_HOST value: edgex-redis valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: MESSAGEQUEUE_EXTERNAL_URL + value: tcp://edgex-mqtt-broker:1883 valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis + - name: SERVICE_HOST + value: edgex-core-command 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 @@ -1038,7 +897,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -1065,20 +924,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-consul service: ports: - - name: tcp-6379 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 6379 + port: 8500 targetport: type: 0 - intval: 6379 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -1100,7 +959,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -1115,14 +974,47 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: db-data + - 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: @@ -1157,15 +1049,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:7.0.5-alpine + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-8500 hostport: 0 - containerport: 6379 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -1181,9 +1073,15 @@ versions: requests: {} claims: [] volumemounts: - - name: db-data + - name: consul-config readonly: false - mountpath: /data + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data subpath: "" mountpropagation: null subpathexpr: "" @@ -1215,7 +1113,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -1242,20 +1140,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: "" @@ -1277,7 +1175,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -1292,24 +1190,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + 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-support-scheduler - image: openyurt/support-scheduler:2.3.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59720 hostport: 0 - containerport: 59861 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -1320,32 +1251,62 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: KUIPER__BASIC__CONSOLELOG + value: "true" valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: EDGEX__DEFAULT__TOPIC + value: rules-events valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis 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 + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: 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__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/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 @@ -1362,7 +1323,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -1389,20 +1350,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-support-scheduler service: ports: - - name: tcp-58890 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 58890 + port: 59861 targetport: type: 0 - intval: 58890 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -1424,7 +1385,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -1439,57 +1400,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler 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-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59861 hostport: 0 - containerport: 58890 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -1500,26 +1428,20 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: SERVICE_HOST + value: edgex-support-scheduler 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 @@ -1548,7 +1470,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -1575,20 +1497,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59701 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59701 + port: 58890 targetport: type: 0 - intval: 59701 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -1610,7 +1532,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -1625,24 +1547,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + 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-app-rules-engine - image: openyurt/app-service-configurable:2.3.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-58890 hostport: 0 - containerport: 59701 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -1653,23 +1608,26 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - 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 @@ -1698,7 +1656,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -1725,20 +1683,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-core-data service: ports: - - name: tcp-59900 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59900 + port: 5563 targetport: type: 0 - intval: 59900 + 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-device-virtual + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -1760,7 +1727,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -1775,7 +1742,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -1784,15 +1751,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.3.0 + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-5563 hostport: 0 - containerport: 59900 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -1804,7 +1776,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-core-data valuefrom: null resources: limits: {} @@ -1839,7 +1811,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -1866,20 +1838,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: "" @@ -1901,7 +1873,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -1916,90 +1888,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-app-rules-engine 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-command - image: openyurt/core-command:2.3.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59701 hostport: 0 - containerport: 59882 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -2011,31 +1917,22 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-app-rules-engine valuefrom: null - - name: MESSAGEQUEUE_EXTERNAL_URL - value: tcp://edgex-mqtt-broker:1883 + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null - - name: MESSAGEQUEUE_INTERNAL_HOST + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST value: edgex-redis valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + 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 @@ -2064,7 +1961,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -2091,29 +1988,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: "" @@ -2135,7 +2023,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -2150,7 +2038,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -2159,20 +2047,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.3.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.3.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: @@ -2184,7 +2067,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -2219,7 +2102,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -2280,20 +2163,29 @@ versions: REGISTRY_HOST: edgex-core-consul binarydata: {} components: - - name: edgex-device-rest + - name: edgex-core-data service: ports: - - name: tcp-59986 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59986 + port: 5563 targetport: type: 0 - intval: 59986 + 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-device-rest + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -2315,7 +2207,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -2330,7 +2222,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -2339,15 +2231,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.1.1 + - name: edgex-core-data + image: openyurt/core-data:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-5563 hostport: 0 - containerport: 59986 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -2359,7 +2256,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2373,7 +2270,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -2394,7 +2291,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -2421,20 +2318,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - 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: "" @@ -2456,7 +2353,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -2471,7 +2368,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -2480,15 +2377,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine + - name: edgex-device-rest + image: openyurt/device-rest:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59986 hostport: 0 - containerport: 59701 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -2499,38 +2396,8 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis + - name: SERVICE_HOST + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -2565,7 +2432,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -2592,20 +2459,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: "" @@ -2627,7 +2494,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -2642,90 +2509,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-metadata 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-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: @@ -2736,26 +2537,17 @@ 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: {} 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 @@ -2784,7 +2576,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -2811,20 +2603,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-support-scheduler service: ports: - - name: tcp-59900 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59900 + port: 59861 targetport: type: 0 - intval: 59900 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -2846,7 +2638,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -2861,7 +2653,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -2870,15 +2662,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59861 hostport: 0 - containerport: 59900 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -2889,8 +2681,14 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2925,7 +2723,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -2952,20 +2750,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - 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: "" @@ -2987,7 +2785,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -3002,7 +2800,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -3011,15 +2809,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59860 hostport: 0 - containerport: 59881 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -3030,11 +2828,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-support-notifications valuefrom: null resources: limits: {} @@ -3096,20 +2891,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: "" @@ -3131,7 +2926,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -3146,57 +2941,24 @@ 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.1.1 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59882 hostport: 0 - containerport: 58890 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -3208,25 +2970,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + 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 @@ -3255,7 +3005,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -3282,20 +3032,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-device-virtual service: ports: - - name: tcp-59882 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59882 + port: 59900 targetport: type: 0 - intval: 59882 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -3317,7 +3067,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -3332,7 +3082,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -3341,15 +3091,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.1.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59900 hostport: 0 - containerport: 59882 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -3361,7 +3111,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -3396,7 +3146,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -3423,20 +3173,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-kuiper service: ports: - - name: tcp-59701 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59701 + port: 59720 targetport: type: 0 - intval: 59701 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -3458,7 +3208,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -3473,7 +3223,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -3515,15 +3265,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59720 hostport: 0 - containerport: 59701 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -3534,18 +3284,39 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER value: edgex-redis valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null resources: limits: {} requests: {} @@ -3612,20 +3383,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-6379 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 6379 + port: 58890 targetport: type: 0 - intval: 6379 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -3647,7 +3418,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -3662,19 +3433,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: db-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 @@ -3704,15 +3475,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-58890 hostport: 0 - containerport: 6379 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -3722,15 +3493,24 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null + - name: METRICSMECHANISM + value: executor + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: db-data + - name: anonymous-volume1 readonly: false - mountpath: /data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -3762,7 +3542,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -3789,20 +3569,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: "" @@ -3824,7 +3604,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -3839,57 +3619,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-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - 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: @@ -3900,26 +3647,23 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -3948,7 +3692,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -3975,20 +3719,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-consul service: ports: - - name: tcp-59860 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59860 + port: 8500 targetport: type: 0 - intval: 59860 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -4010,7 +3754,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -4025,58 +3769,133 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59860 - hostport: 0 - containerport: 59860 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-support-notifications - 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 + 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-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: [] + 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: "" + 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: "" @@ -4089,7 +3908,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -4116,20 +3935,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: "" @@ -4151,7 +3970,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -4166,47 +3985,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: @@ -4241,15 +4027,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - 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: @@ -4259,24 +4045,15 @@ 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: - - 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: "" @@ -4308,7 +4085,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -4335,29 +4112,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-ui-go service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59880 + port: 4000 targetport: type: 0 - intval: 59880 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -4379,7 +4147,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -4394,7 +4162,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] @@ -4403,20 +4171,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.1.1 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.1.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-4000 hostport: 0 - containerport: 59880 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -4426,16 +4189,7 @@ 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-core-data - valuefrom: null + env: [] resources: limits: {} requests: {} @@ -4469,7 +4223,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -4530,20 +4284,20 @@ versions: REGISTRY_HOST: edgex-core-consul binarydata: {} components: - - 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: "" @@ -4565,7 +4319,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -4580,7 +4334,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -4589,15 +4343,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: @@ -4609,7 +4363,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-command valuefrom: null resources: limits: {} @@ -4644,7 +4398,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -4671,20 +4425,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: "" @@ -4706,7 +4460,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -4721,7 +4475,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -4730,15 +4484,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59986 hostport: 0 - containerport: 59701 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -4749,17 +4503,8 @@ versions: optional: null secretref: null env: - - 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 - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -4794,7 +4539,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -4821,20 +4566,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: "" @@ -4856,7 +4601,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -4871,52 +4616,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 @@ -4946,15 +4658,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: @@ -4964,21 +4676,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: "" @@ -5010,7 +4725,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -5037,20 +4752,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-device-virtual service: ports: - - name: tcp-58890 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 58890 + port: 59900 targetport: type: 0 - intval: 58890 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -5072,7 +4787,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -5087,57 +4802,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-virtual 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-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59900 hostport: 0 - containerport: 58890 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -5149,25 +4831,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - - name: METRICSMECHANISM - value: executor + value: edgex-device-virtual 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 @@ -5196,7 +4866,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -5223,20 +4893,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-support-scheduler service: ports: - - name: tcp-6379 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 6379 + port: 59861 targetport: type: 0 - intval: 6379 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -5258,7 +4928,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -5273,57 +4943,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-support-scheduler 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-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59861 hostport: 0 - containerport: 6379 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -5333,18 +4970,21 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + 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: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -5373,7 +5013,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -5400,20 +5040,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - 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: "" @@ -5435,7 +5075,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -5450,7 +5090,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -5459,15 +5099,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.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: @@ -5478,14 +5118,17 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - 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-support-scheduler + value: edgex-app-rules-engine valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} @@ -5547,20 +5190,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: "" @@ -5582,7 +5225,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -5597,7 +5240,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -5606,15 +5249,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59881 hostport: 0 - containerport: 59882 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -5626,7 +5269,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -5688,20 +5334,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-ui-go service: ports: - - name: tcp-59900 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59900 + port: 4000 targetport: type: 0 - intval: 59900 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -5723,7 +5369,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -5738,7 +5384,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] @@ -5747,15 +5393,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-4000 hostport: 0 - containerport: 59900 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -5765,10 +5411,7 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - valuefrom: null + env: [] resources: limits: {} requests: {} @@ -5802,7 +5445,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -5829,20 +5472,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-redis service: ports: - - name: tcp-4000 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 4000 + port: 6379 targetport: type: 0 - intval: 4000 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -5864,7 +5507,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -5879,24 +5522,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + 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-ui-go - image: openyurt/edgex-ui:2.2.0 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-6379 hostport: 0 - containerport: 4000 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -5911,7 +5587,13 @@ versions: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5940,7 +5622,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -5967,20 +5649,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: "" @@ -6002,7 +5684,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -6017,57 +5699,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-support-notifications 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-support-notifications + image: openyurt/support-notifications:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59860 hostport: 0 - containerport: 59720 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -6078,50 +5727,14 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis + - 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 @@ -6150,7 +5763,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -6242,40 +5855,7 @@ versions: 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-core-data @@ -6309,13 +5889,7 @@ versions: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -6344,7 +5918,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -6371,20 +5945,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-kuiper service: ports: - - name: tcp-59881 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59881 + port: 59720 targetport: type: 0 - intval: 59881 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -6406,7 +5980,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -6421,24 +5995,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + 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-core-metadata - image: openyurt/core-metadata:2.2.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59720 hostport: 0 - containerport: 59881 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -6449,17 +6056,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-metadata + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + 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__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" 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 @@ -6467,7 +6107,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -6488,7 +6128,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -6515,20 +6155,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: "" @@ -6550,7 +6190,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -6565,71 +6205,146 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.2.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59986 - hostport: 0 - containerport: 59986 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura - 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: "" - 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: "" + 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-core-consul + image: openyurt/consul:1.10.10 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura + optional: null + secretref: null + env: [] + 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: "" + 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-consul subdomain: "" affinity: null schedulername: "" @@ -6690,20 +6405,20 @@ versions: REGISTRY_HOST: edgex-core-consul binarydata: {} components: - - name: edgex-support-scheduler + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59861 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59861 + port: 58890 targetport: type: 0 - intval: 59861 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -6725,7 +6440,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -6740,24 +6455,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/support-scheduler:2.0.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-58890 hostport: 0 - containerport: 59861 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -6768,20 +6516,26 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_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 @@ -6810,7 +6564,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -6837,20 +6591,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - 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: "" @@ -6872,7 +6626,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -6887,90 +6641,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.9.5 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59900 hostport: 0 - containerport: 8500 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -6980,24 +6668,15 @@ versions: name: common-variable-ireland 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 @@ -7026,7 +6705,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -7053,20 +6732,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - 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: "" @@ -7088,7 +6767,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -7103,7 +6782,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -7112,15 +6791,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.0.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59861 hostport: 0 - containerport: 59701 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -7131,17 +6810,14 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - 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: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: SERVICE_HOST + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -7176,7 +6852,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -7203,20 +6879,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-data service: ports: - - name: tcp-59860 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59860 + port: 5563 targetport: type: 0 - intval: 59860 + 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-support-notifications + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -7238,7 +6923,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -7253,7 +6938,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -7262,15 +6947,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-core-data + image: openyurt/core-data:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-5563 hostport: 0 - containerport: 59860 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -7282,7 +6972,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-data valuefrom: null resources: limits: {} @@ -7317,7 +7007,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -7344,20 +7034,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-core-command service: ports: - - name: tcp-6379 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 6379 + port: 59882 targetport: type: 0 - intval: 6379 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -7379,7 +7069,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -7394,57 +7084,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-command 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-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59882 hostport: 0 - containerport: 6379 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -7454,18 +7111,15 @@ versions: name: common-variable-ireland optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-command + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -7494,7 +7148,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -7602,9 +7256,6 @@ versions: - name: SERVICE_HOST value: edgex-device-rest valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null resources: limits: {} requests: {} @@ -7638,7 +7289,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -7665,20 +7316,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-consul service: ports: - - name: tcp-59881 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59881 + port: 8500 targetport: type: 0 - intval: 59881 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -7700,7 +7351,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -7715,24 +7366,90 @@ 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 initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.0.0 + - name: edgex-core-consul + image: openyurt/consul:1.9.5 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-8500 hostport: 0 - containerport: 59881 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -7742,18 +7459,24 @@ versions: name: common-variable-ireland 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: {} 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 @@ -7782,7 +7505,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -7809,20 +7532,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: "" @@ -7844,7 +7567,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -7859,57 +7582,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-support-notifications 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.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: @@ -7920,38 +7610,14 @@ versions: optional: null secretref: null env: - - 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" - 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 + - 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 @@ -7980,7 +7646,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -8007,20 +7673,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: "" @@ -8042,7 +7708,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -8057,57 +7723,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.0.0 + containers: + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59701 hostport: 0 - containerport: 58890 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -8118,26 +7751,23 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + 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 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 @@ -8166,7 +7796,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -8193,20 +7823,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: "" @@ -8228,7 +7858,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -8243,24 +7873,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: @@ -8271,14 +7934,38 @@ 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__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" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-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 @@ -8307,7 +7994,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -8334,29 +8021,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-redis service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59880 + port: 6379 targetport: type: 0 - intval: 59880 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -8378,7 +8056,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -8393,29 +8071,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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-data - image: openyurt/core-data:2.0.0 + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-6379 hostport: 0 - containerport: 59880 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -8425,15 +8131,18 @@ versions: name: common-variable-ireland optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-data - 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 @@ -8462,7 +8171,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -8489,20 +8198,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: "" @@ -8524,7 +8233,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -8539,57 +8248,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + 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 + spec: + volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59881 hostport: 0 - containerport: 59882 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -8601,19 +8277,16 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + 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 @@ -8642,7 +8315,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -8707,29 +8380,29 @@ versions: SERVICE_SERVERBINDADDR: 0.0.0.0 binarydata: {} components: - - name: edgex-core-data + - name: edgex-kuiper service: ports: - - name: tcp-5563 + - name: tcp-20498 protocol: TCP appprotocol: null - port: 5563 + port: 20498 targetport: type: 0 - intval: 5563 + intval: 20498 strval: "" nodeport: 0 - - name: tcp-48080 + - name: tcp-48075 protocol: TCP appprotocol: null - port: 48080 + port: 48075 targetport: type: 0 - intval: 48080 + intval: 48075 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -8751,7 +8424,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -8766,7 +8439,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -8775,20 +8448,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-kuiper + image: openyurt/kuiper:1.1.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 + - name: tcp-20498 hostport: 0 - containerport: 5563 + containerport: 20498 protocol: TCP hostip: "" - - name: tcp-48080 + - name: tcp-48075 hostport: 0 - containerport: 48080 + containerport: 48075 protocol: TCP hostip: "" envfrom: @@ -8799,8 +8472,26 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - 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 + - 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 resources: limits: {} @@ -8835,7 +8526,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -9012,7 +8703,148 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + 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-rest + service: + ports: + - name: tcp-49986 + protocol: TCP + appprotocol: null + port: 49986 + targetport: + type: 0 + intval: 49986 + strval: "" + nodeport: 0 + selector: + app: edgex-device-rest + 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-rest + 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-rest + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + 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: "" @@ -9153,7 +8985,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -9258,20 +9090,20 @@ versions: optional: null secretref: null env: + - name: SERVICE_HOST + value: edgex-app-service-configurable-rules + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null - name: BINDING_PUBLISHTOPIC value: events valuefrom: null - - name: SERVICE_PORT - value: "48100" - valuefrom: null - name: MESSAGEBUS_SUBSCRIBEHOST_HOST value: edgex-core-data valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: SERVICE_HOST - value: edgex-app-service-configurable-rules + - name: SERVICE_PORT + value: "48100" valuefrom: null resources: limits: {} @@ -9306,7 +9138,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-app-service-configurable-rules subdomain: "" affinity: null schedulername: "" @@ -9333,20 +9165,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-metadata service: ports: - - name: tcp-49986 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 49986 + port: 48081 targetport: type: 0 - intval: 49986 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -9368,7 +9200,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -9383,7 +9215,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -9392,15 +9224,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/docker-device-rest-go:1.2.1 + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-49986 + - name: tcp-48081 hostport: 0 - containerport: 49986 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -9412,7 +9244,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -9447,7 +9282,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -9687,179 +9522,6 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" - 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-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: edgex-kuiper - image: openyurt/kuiper:1.1.1-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-20498 - hostport: 0 - containerport: 20498 - protocol: TCP - hostip: "" - - name: tcp-48075 - hostport: 0 - containerport: 48075 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - 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 - 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 - resources: - limits: {} - requests: {} - claims: [] - volumemounts: [] - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" imagepullpolicy: IfNotPresent securitycontext: null stdin: false @@ -9908,20 +9570,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-core-command service: ports: - - name: tcp-48090 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 48090 + port: 48082 targetport: type: 0 - intval: 48090 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -9943,7 +9605,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -9958,57 +9620,24 @@ 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/docker-sys-mgmt-agent-go:1.3.1 + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48090 + - name: tcp-48082 hostport: 0 - containerport: 48090 + containerport: 48082 protocol: TCP hostip: "" envfrom: @@ -10019,29 +9648,14 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + 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 @@ -10070,7 +9684,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -10097,20 +9711,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: "" @@ -10132,7 +9746,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -10147,24 +9761,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: @@ -10175,20 +9822,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 @@ -10217,7 +9870,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-service-configurable-rules + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -10244,20 +9897,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-data service: ports: - - name: tcp-48081 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 48081 + port: 5563 targetport: type: 0 - intval: 48081 + 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-metadata + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -10279,7 +9941,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -10294,57 +9956,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-core-data 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-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-5563 hostport: 0 - containerport: 48081 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 protocol: TCP hostip: "" envfrom: @@ -10355,29 +9989,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-core-metadata - valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + 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 @@ -10406,7 +10025,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -10489,40 +10108,7 @@ versions: 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-support-notifications @@ -10551,13 +10137,7 @@ versions: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -10586,7 +10166,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -10613,20 +10193,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-support-scheduler service: ports: - - name: tcp-48082 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 48082 + port: 48085 targetport: type: 0 - intval: 48082 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -10648,7 +10228,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -10663,7 +10243,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -10672,15 +10252,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48082 + - name: tcp-48085 hostport: 0 - containerport: 48082 + containerport: 48085 protocol: TCP hostip: "" envfrom: @@ -10691,8 +10271,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: {} @@ -10727,7 +10313,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" diff --git a/EdgeXConfig/config.yaml b/EdgeXConfig/config.yaml index 328d1a6..3f79353 100644 --- a/EdgeXConfig/config.yaml +++ b/EdgeXConfig/config.yaml @@ -56,20 +56,20 @@ versions: STAGEGATE_WAITFOR_TIMEOUT: 60s binarydata: {} components: - - 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: "" @@ -91,7 +91,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -106,13 +106,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 @@ -146,7 +212,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: redis-config volumesource: hostpath: null emptydir: @@ -182,7 +248,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -214,15 +280,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: @@ -233,38 +299,44 @@ 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 + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent + - 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: 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/support-scheduler + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -296,7 +368,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -323,12 +395,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - 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-bootstrapper + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -343,7 +445,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -383,14 +485,85 @@ versions: storageos: null csi: null ephemeral: null + - 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 + 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-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: @@ -399,11 +572,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_USER - value: "2002" + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: METRICSMECHANISM + value: executor valuefrom: null resources: limits: {} @@ -416,14 +592,26 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" + - 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 + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -444,7 +632,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -471,20 +659,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-device-virtual service: ports: - - name: tcp-59882 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59882 + port: 59900 targetport: type: 0 - intval: 59882 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -506,7 +694,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -521,7 +709,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -564,7 +752,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -596,15 +784,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.3.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59900 hostport: 0 - containerport: 59882 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -615,14 +803,8 @@ versions: optional: null secretref: null env: - - name: MESSAGEQUEUE_EXTERNAL_URL - value: tcp://edgex-mqtt-broker:1883 - valuefrom: null - - name: MESSAGEQUEUE_INTERNAL_HOST - value: edgex-redis - valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -637,7 +819,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -696,20 +878,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: "" @@ -731,7 +913,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -746,47 +928,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: @@ -819,7 +968,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: consul-data volumesource: hostpath: null emptydir: @@ -885,7 +1034,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -918,12 +1067,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 @@ -953,15 +1102,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.8-alpine + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-8500 hostport: 0 - containerport: 5432 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -972,35 +1121,38 @@ versions: optional: null secretref: null env: - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: POSTGRES_DB - value: kong + - name: ADD_REGISTRY_ACL_ROLES + value: "" valuefrom: null - - name: POSTGRES_USER - value: kong + - 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: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + valuefrom: null + - name: EDGEX_USER + value: "2002" 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: "" @@ -1010,15 +1162,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: "" @@ -1050,7 +1202,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -1077,12 +1229,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-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-secretstore-setup + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -1097,7 +1279,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] @@ -1170,7 +1352,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: tmpfs-volume3 volumesource: hostpath: null emptydir: @@ -1203,40 +1385,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 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -1269,7 +1418,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: postgres-config volumesource: hostpath: null emptydir: @@ -1302,40 +1451,7 @@ versions: 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 + - name: postgres-data volumesource: hostpath: null emptydir: @@ -1370,12 +1486,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.3.0 + - name: edgex-kong-db + image: openyurt/postgres:13.8-alpine command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-5432 + hostport: 0 + containerport: 5432 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -1384,20 +1505,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" - valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],message-bus[device-rest],redisdb[device-virtual],message-bus[device-virtual] + - name: POSTGRES_USER + value: kong valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: POSTGRES_DB + value: kong valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} @@ -1406,49 +1521,37 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run + mountpath: /var/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 + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: tmpfs-volume3 readonly: false - mountpath: /tmp/kong + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: edgex-init readonly: false - mountpath: /tmp/kuiper + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: postgres-config readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: postgres-data readonly: false - mountpath: /vault/config + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -1480,7 +1583,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -1507,20 +1610,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: "" @@ -1542,7 +1645,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -1557,14 +1660,164 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-ui-go + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] + initcontainers: [] + containers: + - name: edgex-ui-go + image: openyurt/edgex-ui:2.3.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-4000 + hostport: 0 + containerport: 4000 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-levski + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-ui-go + 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-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-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-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: tmpfs-volume1 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -1597,76 +1850,10 @@ versions: 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: 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 + - name: anonymous-volume1 volumesource: hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -1698,15 +1885,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.3.0 + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-5563 hostport: 0 - containerport: 58890 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -1717,14 +1909,11 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-core-data valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} @@ -1739,13 +1928,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-data subpath: "" mountpropagation: null subpathexpr: "" @@ -1756,7 +1939,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -1777,7 +1960,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -1804,20 +1987,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: "" @@ -1839,7 +2022,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -1854,7 +2037,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -1894,78 +2077,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/device-rest + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1995,15 +2112,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.7.1-alpine + - name: edgex-device-rest + image: openyurt/device-rest:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59986 hostport: 0 - containerport: 59720 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -2014,38 +2131,8 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - 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__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" + - name: SERVICE_HOST + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -2058,21 +2145,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/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -2104,7 +2179,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -2131,183 +2206,12 @@ versions: 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-device-virtual - image: openyurt/device-virtual:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-4000 - hostport: 0 - containerport: 4000 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-ui-go - 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-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-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-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -2322,13 +2226,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + 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 @@ -2365,7 +2335,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -2395,44 +2365,186 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59701 - hostport: 0 - containerport: 59701 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: + - 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.3.0 + command: [] + args: [] + workingdir: "" + ports: [] + envfrom: + - prefix: "" + configmapref: localobjectreference: name: common-variable-levski optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: SECUREMESSAGEBUS_TYPE + value: redis valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - 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: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: EDGEX_USER + value: "2002" 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 @@ -2441,7 +2553,31 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + 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: "" @@ -2473,7 +2609,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -2500,29 +2636,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: "" @@ -2544,7 +2671,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -2559,7 +2686,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -2602,7 +2729,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -2634,20 +2761,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.3.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.3.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: @@ -2658,11 +2780,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -2677,7 +2799,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -2736,42 +2858,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest - service: - ports: - - name: tcp-59986 - protocol: TCP - appprotocol: null - port: 59986 - targetport: - type: 0 - intval: 59986 - strval: "" - nodeport: 0 - selector: - app: edgex-device-rest - 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-rest + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -2786,7 +2878,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -2826,52 +2918,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/device-rest - 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-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.3.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59986 - hostport: 0 - containerport: 59986 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -2880,8 +2934,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: EDGEX_USER + value: "2002" valuefrom: null resources: limits: {} @@ -2894,12 +2951,6 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/device-rest - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -2928,7 +2979,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -2955,20 +3006,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-support-scheduler service: ports: - - name: tcp-58890 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 58890 + port: 59861 targetport: type: 0 - intval: 58890 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -2990,7 +3041,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -3005,7 +3056,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -3048,40 +3099,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/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -3113,15 +3131,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.3.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59861 hostport: 0 - containerport: 58890 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -3132,14 +3150,14 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-support-scheduler valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -3154,13 +3172,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/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -3192,7 +3204,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -3219,20 +3231,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-core-command service: ports: - - name: tcp-4000 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 4000 + port: 59882 targetport: type: 0 - intval: 4000 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -3254,7 +3266,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -3269,24 +3281,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-core-command 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/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-ui-go - image: openyurt/edgex-ui:2.3.0 + - name: edgex-core-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59882 hostport: 0 - containerport: 4000 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -3297,14 +3375,32 @@ 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-ui-go + value: edgex-core-command 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/core-command + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -3312,7 +3408,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -3333,7 +3429,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -3360,20 +3456,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-support-notifications service: ports: - - name: tcp-8200 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 8200 + port: 59860 targetport: type: 0 - intval: 8200 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -3395,7 +3491,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -3410,46 +3506,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + 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: edgex-init volumesource: hostpath: null @@ -3483,45 +3546,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/support-notifications + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -3551,15 +3581,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.11.4 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59860 hostport: 0 - containerport: 8200 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -3570,41 +3600,23 @@ versions: optional: null secretref: null env: - - name: VAULT_UI - value: "true" - valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config - valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: SERVICE_HOST + value: edgex-support-notifications 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/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -3636,7 +3648,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -3663,20 +3675,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-kuiper service: ports: - - name: tcp-6379 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 6379 + port: 59720 targetport: type: 0 - intval: 6379 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -3698,7 +3710,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -3713,14 +3725,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -3753,7 +3765,7 @@ versions: storageos: null csi: null ephemeral: null - - name: db-data + - name: kuiper-data volumesource: hostpath: null emptydir: @@ -3786,7 +3798,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -3819,7 +3831,7 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -3852,50 +3864,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:7.0.5-alpine + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59720 hostport: 0 - containerport: 6379 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -3906,44 +3885,65 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: EDGEX__DEFAULT__PROTOCOL + value: redis valuefrom: null - - name: DATABASECONFIG_NAME - value: redis.conf + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 + - name: edgex-init readonly: false - mountpath: /run + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: db-data + - name: kuiper-data readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: edgex-init - readonly: false - mountpath: /edgex-init + mountpath: /kuiper/data subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config + - name: kuiper-connections readonly: false - mountpath: /run/redis/conf + mountpath: /kuiper/etc/connections subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-sources readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -3975,7 +3975,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -4002,20 +4002,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-app-rules-engine service: ports: - - name: tcp-59720 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59720 + port: 59701 targetport: type: 0 - intval: 59720 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -4037,7 +4037,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -4052,7 +4052,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -4092,78 +4092,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/app-rules-engine + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -4193,15 +4127,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.3.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59701 hostport: 0 - containerport: 59720 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -4212,39 +4146,18 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST value: edgex-redis valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: SERVICE_HOST + value: edgex-app-rules-engine valuefrom: null - - name: EDGEX__DEFAULT__SERVER + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST value: edgex-redis valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null resources: limits: {} requests: {} @@ -4256,21 +4169,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/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -4302,7 +4203,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -4329,20 +4230,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: "" @@ -4364,7 +4265,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -4379,80 +4280,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-vault 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: 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 + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -4518,7 +4353,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: vault-file volumesource: hostpath: null emptydir: @@ -4551,7 +4386,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: vault-logs volumesource: hostpath: null emptydir: @@ -4586,15 +4421,15 @@ versions: 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-5432 + - name: tcp-8200 hostport: 0 - containerport: 5432 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -4605,23 +4440,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" - valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: VAULT_UI + value: "true" valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/mgmt_token.json + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null resources: limits: {} @@ -4630,19 +4456,7 @@ versions: 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 + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -4652,15 +4466,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: vault-file readonly: false - mountpath: /tmp/postgres-config + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: vault-logs readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -4692,7 +4506,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -4719,29 +4533,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: "" @@ -4763,7 +4586,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -4778,13 +4601,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 @@ -4821,7 +4710,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 @@ -4851,22 +4740,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-security-proxy-setup - image: openyurt/security-proxy-setup:2.3.0 + - name: edgex-kong + image: openyurt/kong:2.8.1 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: @@ -4877,44 +4837,62 @@ versions: optional: null secretref: null env: - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul + - name: KONG_PG_HOST + value: edgex-kong-db valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler + - name: KONG_DATABASE + value: postgres valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong + - name: KONG_SSL_CIPHER_SUITE + value: modern valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" 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 @@ -4923,7 +4901,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: "" @@ -4955,7 +4945,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -4982,60 +4972,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong - 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 - protocol: TCP - appprotocol: null - port: 8443 - targetport: - type: 0 - intval: 8443 - strval: "" - nodeport: 0 - selector: - app: edgex-kong - 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-kong + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -5050,47 +4992,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + 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: @@ -5123,7 +5032,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -5189,95 +5098,14 @@ 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.8.1 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup: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 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -5286,83 +5114,59 @@ versions: optional: null secretref: null env: - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern + - name: KONGURL_SERVER + value: edgex-kong valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db + - name: ADD_PROXY_ROUTE + value: "" 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: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - 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: kong + - name: anonymous-volume1 readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -5394,7 +5198,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -5475,12 +5279,42 @@ versions: STAGEGATE_WAITFOR_TIMEOUT: 60s binarydata: {} components: - - name: edgex-security-proxy-setup + - name: edgex-device-rest + service: + ports: + - name: tcp-59986 + protocol: TCP + appprotocol: null + port: 59986 + targetport: + type: 0 + intval: 59986 + strval: "" + nodeport: 0 + selector: + app: edgex-device-rest + 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-device-rest matchexpressions: [] template: objectmeta: @@ -5495,46 +5329,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + 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: edgex-init volumesource: hostpath: null @@ -5568,43 +5369,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/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -5636,12 +5404,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.1.1 + - name: edgex-device-rest + image: openyurt/device-rest:2.1.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59986 + hostport: 0 + containerport: 59986 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -5650,65 +5423,23 @@ versions: optional: null secretref: null env: - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - 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_DATA_HOST - value: edgex-core-data - valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong + - name: SERVICE_HOST + value: edgex-device-rest 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 - 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/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -5740,7 +5471,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -5767,20 +5498,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-kong service: ports: - - name: tcp-59861 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59861 + port: 8000 targetport: type: 0 - intval: 59861 + 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-support-scheduler + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -5802,7 +5551,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -5817,14 +5566,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -5857,10 +5606,76 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/support-scheduler + 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/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -5890,17 +5705,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-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - name: edgex-kong + image: openyurt/kong:2.5.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-8000 hostport: 0 - containerport: 59861 + 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: @@ -5911,20 +5802,62 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - 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_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" 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 @@ -5933,7 +5866,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + 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: "" @@ -5965,7 +5910,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -5992,20 +5937,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: "" @@ -6027,7 +5972,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -6042,7 +5987,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -6115,83 +6060,17 @@ versions: storageos: null csi: null ephemeral: null - - 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 - 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/sys-mgmt-agent:2.1.1 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59882 hostport: 0 - containerport: 58890 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -6203,13 +6082,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + value: edgex-core-command valuefrom: null resources: limits: {} @@ -6224,13 +6097,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-command subpath: "" mountpropagation: null subpathexpr: "" @@ -6289,20 +6156,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-vault service: ports: - - name: tcp-59881 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 59881 + port: 8200 targetport: type: 0 - intval: 59881 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -6324,7 +6191,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -6339,13 +6206,46 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + 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 @@ -6379,12 +6279,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-file volumesource: - hostpath: - path: /tmp/edgex/secrets/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: vault-logs + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6414,15 +6347,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.1.0 + - name: edgex-vault + image: openyurt/vault:1.8.4 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-8200 hostport: 0 - containerport: 59881 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -6433,26 +6366,41 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata + - name: VAULT_ADDR + value: http://edgex-vault:8200 + 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/core-metadata + mountpath: /vault/file + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-logs + readonly: false + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -6484,7 +6432,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -6511,20 +6459,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-core-metadata service: ports: - - name: tcp-5432 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 5432 + port: 59881 targetport: type: 0 - intval: 5432 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -6546,7 +6494,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -6561,47 +6509,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + 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: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -6634,111 +6549,12 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - 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: 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: 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 + hostpath: + path: /tmp/edgex/secrets/core-metadata + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6768,15 +6584,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.4-alpine + - name: edgex-core-metadata + image: openyurt/core-metadata:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-59881 hostport: 0 - containerport: 5432 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -6787,53 +6603,26 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong - valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: POSTGRES_DB - value: kong + - name: SERVICE_HOST + value: edgex-core-metadata 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/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -6865,7 +6654,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -6892,20 +6681,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59900 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59900 + port: 58890 targetport: type: 0 - intval: 59900 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -6927,7 +6716,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -6942,7 +6731,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -6985,7 +6774,40 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + 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 @@ -7017,15 +6839,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-58890 hostport: 0 - containerport: 59900 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -7036,8 +6858,14 @@ 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-device-virtual + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} @@ -7052,7 +6880,13 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + 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: "" @@ -7084,7 +6918,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -7111,20 +6945,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: "" @@ -7146,7 +6980,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -7161,14 +6995,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: @@ -7201,7 +7035,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-data + - name: db-data volumesource: hostpath: null emptydir: @@ -7267,7 +7101,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: redis-config volumesource: hostpath: null emptydir: @@ -7303,7 +7137,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 @@ -7335,15 +7169,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - 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: @@ -7354,35 +7188,26 @@ versions: optional: null secretref: null env: - - name: ADD_REGISTRY_ACL_ROLES - value: "" - 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 - valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: DATABASECONFIG_PATH + value: /run/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: "" @@ -7392,15 +7217,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: "" @@ -7432,7 +7257,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -7459,12 +7284,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - 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 deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -7479,14 +7334,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -7519,7 +7374,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: kuiper-data volumesource: hostpath: null emptydir: @@ -7552,7 +7407,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -7585,12 +7440,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-sources volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -7618,7 +7473,202 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + 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: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-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: + - name: edgex-init + readonly: false + mountpath: /edgex-init + 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 + readonly: false + mountpath: /kuiper/etc/sources + 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-kuiper + 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: + - name: edgex-init volumesource: hostpath: null emptydir: @@ -7651,12 +7701,12 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/support-notifications + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -7684,7 +7734,169 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + initcontainers: [] + containers: + - name: edgex-support-notifications + image: openyurt/support-notifications:2.1.1 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59860 + hostport: 0 + containerport: 59860 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-jakarta + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-support-notifications + 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-notifications + 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-notifications + 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-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-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: edgex-init volumesource: hostpath: null emptydir: @@ -7717,12 +7929,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/core-data + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -7752,12 +7964,22 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.1.1 + - name: edgex-core-data + image: openyurt/core-data:2.1.1 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: @@ -7766,71 +7988,26 @@ versions: optional: null secretref: null env: - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: SERVICE_HOST + value: edgex-core-data 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 - 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 - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-config + - name: anonymous-volume1 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -7862,7 +8039,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -8027,20 +8204,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-support-scheduler service: ports: - - name: tcp-8200 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 8200 + port: 59861 targetport: type: 0 - intval: 8200 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -8062,7 +8239,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -8077,46 +8254,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-support-scheduler 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 @@ -8150,45 +8294,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/support-scheduler + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -8218,15 +8329,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.4 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59861 hostport: 0 - containerport: 8200 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -8237,41 +8348,29 @@ versions: optional: null secretref: null env: - - name: VAULT_UI - value: "true" + - name: SERVICE_HOST + value: edgex-support-scheduler valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data 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/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -8303,7 +8402,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -8330,20 +8429,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: "" @@ -8365,7 +8464,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -8380,79 +8479,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + 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: edgex-init volumesource: hostpath: null @@ -8489,73 +8522,7 @@ versions: - 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: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -8587,15 +8554,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59701 hostport: 0 - containerport: 59860 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -8606,8 +8573,17 @@ versions: optional: null secretref: null env: + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null - 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: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} @@ -8622,7 +8598,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: "" @@ -8633,7 +8609,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -8654,7 +8630,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -8681,29 +8657,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-kong-db service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59880 + port: 5432 targetport: type: 0 - intval: 59880 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -8725,7 +8692,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -8740,13 +8707,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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 @@ -8780,12 +8846,45 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-config + - name: postgres-config volumesource: - hostpath: - path: /tmp/edgex/secrets/core-data - 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 @@ -8815,20 +8914,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.1.1 + - name: edgex-kong-db + image: openyurt/postgres:13.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-5432 hostport: 0 - containerport: 59880 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -8839,11 +8933,14 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: POSTGRES_DB + value: kong valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: POSTGRES_USER + value: kong + valuefrom: null + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} @@ -8852,49 +8949,37 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run + mountpath: /var/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 + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: tmpfs-volume3 readonly: false - mountpath: /tmp/kong + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: edgex-init readonly: false - mountpath: /tmp/kuiper + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: postgres-config readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: postgres-data readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -8926,7 +9011,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -8953,20 +9038,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: "" @@ -8988,7 +9073,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -9003,14 +9088,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: @@ -9043,7 +9128,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: consul-data volumesource: hostpath: null emptydir: @@ -9076,7 +9161,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: edgex-init volumesource: hostpath: null emptydir: @@ -9109,7 +9194,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -9142,17 +9227,50 @@ 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 + - name: edgex-core-consul + image: openyurt/consul:1.10.3 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-8500 hostport: 0 - containerport: 59720 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -9163,65 +9281,53 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events + - name: ADD_REGISTRY_ACL_ROLES + value: "" valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done 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: "" @@ -9253,7 +9359,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -9280,42 +9386,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - 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-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -9330,7 +9406,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -9370,52 +9446,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/app-rules-engine - 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-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59701 - hostport: 0 - containerport: 59701 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -9424,17 +9462,11 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: EDGEX_USER + value: "2002" valuefrom: null resources: limits: {} @@ -9447,12 +9479,6 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -9481,7 +9507,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -9508,60 +9534,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong - 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 - protocol: TCP - appprotocol: null - port: 8443 - targetport: - type: 0 - intval: 8443 - strval: "" - nodeport: 0 - selector: - app: edgex-kong - 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-kong + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -9576,80 +9554,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + 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 + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -9682,12 +9594,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 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 @@ -9715,7 +9627,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: edgex-init volumesource: hostpath: null emptydir: @@ -9748,12 +9660,12 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + - 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 @@ -9777,234 +9689,11 @@ versions: 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 - 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-jakarta - optional: null - secretref: null - env: - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - 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: consul-acl-token - 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 - 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-consul - 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-rest - service: - ports: - - name: tcp-59986 - protocol: TCP - appprotocol: null - port: 59986 - targetport: - type: 0 - intval: 59986 - strval: "" - nodeport: 0 - selector: - app: edgex-device-rest - 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-rest - 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-rest - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: edgex-init + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kong volumesource: hostpath: null emptydir: @@ -10037,7 +9726,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -10070,12 +9759,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-connections 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-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -10105,17 +9827,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.1.1 + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59986 - hostport: 0 - containerport: 59986 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -10124,32 +9841,71 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications + - 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: ADD_SECRETSTORE_TOKENS + value: "" + valuefrom: null + - name: EDGEX_USER + value: "2002" 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: consul-acl-token + - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kong readonly: false - mountpath: /tmp/edgex/secrets/device-rest + 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: "" @@ -10181,7 +9937,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -10208,20 +9964,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-device-virtual service: ports: - - name: tcp-6379 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 6379 + port: 59900 targetport: type: 0 - intval: 6379 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -10237,134 +9993,35 @@ versions: 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 - 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 - 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: redis-config + 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 emptydir: @@ -10400,7 +10057,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10432,15 +10089,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59900 hostport: 0 - containerport: 6379 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -10451,44 +10108,23 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_PATH - value: /run/redis/conf - valuefrom: null - - name: DATABASECONFIG_NAME - value: redis.conf + - 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: 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/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -10520,7 +10156,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -10547,42 +10183,12 @@ versions: 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 + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -10597,7 +10203,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -10637,10 +10243,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/core-metadata + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10672,17 +10311,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59881 - hostport: 0 - containerport: 59881 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -10691,12 +10325,39 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data valuefrom: null - - name: SERVICE_HOST + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul + valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST value: edgex-core-metadata valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null resources: limits: {} requests: {} @@ -10708,9 +10369,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/core-metadata + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -10742,7 +10409,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -10769,20 +10436,77 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - 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-vault service: ports: - - name: tcp-59882 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 59882 + port: 8200 targetport: type: 0 - intval: 59882 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -10804,7 +10528,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -10819,14 +10543,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -10859,12 +10583,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: edgex-init volumesource: - hostpath: - path: /tmp/edgex/secrets/core-command - 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-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 @@ -10894,42 +10684,60 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.1.1 + - name: edgex-vault + image: openyurt/vault:1.8.9 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-8200 hostport: 0 - containerport: 59882 + containerport: 8200 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-kamakura optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-command + - name: VAULT_UI + value: "true" + valuefrom: null + - name: VAULT_ADDR + value: http://edgex-vault:8200 + valuefrom: null + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config + - name: tmpfs-volume1 readonly: false - mountpath: /consul/config + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: edgex-init readonly: false - mountpath: /tmp/edgex/secrets/core-command + 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: "" @@ -10961,7 +10769,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -11051,7 +10859,7 @@ versions: initcontainers: [] containers: - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.1.1 + image: openyurt/security-bootstrapper:2.2.0 command: [] args: [] workingdir: "" @@ -11060,16 +10868,16 @@ versions: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-kamakura optional: null secretref: null env: - - name: EDGEX_USER - value: "2002" - valuefrom: null - name: EDGEX_GROUP value: "2001" valuefrom: null + - name: EDGEX_USER + value: "2002" + valuefrom: null resources: limits: {} requests: {} @@ -11109,7 +10917,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -11136,69 +10944,60 @@ 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: - 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-security-bootstrapper + - name: edgex-kong + 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 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 + strval: "" + nodeport: 0 + selector: + app: edgex-kong + 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 matchexpressions: [] template: objectmeta: @@ -11213,13 +11012,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + 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 @@ -11253,14 +11118,128 @@ versions: 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 + 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 + image: openyurt/kong:2.6.1 command: [] args: [] workingdir: "" - ports: [] + 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: @@ -11269,23 +11248,86 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: KONG_DNS_VALID_TTL + value: "1" + 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_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_PROXY_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 + 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_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + valuefrom: null + - name: KONG_DATABASE + value: postgres 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: 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 + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -11314,7 +11356,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -11341,20 +11383,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: "" @@ -11376,7 +11418,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -11391,7 +11433,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] @@ -11431,6 +11473,39 @@ versions: 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 @@ -11464,10 +11539,43 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - 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 @@ -11499,180 +11607,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59861 - hostport: 0 - containerport: 59861 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura - 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 - 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: /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-vault - 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 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-6379 hostport: 0 - containerport: 4000 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -11682,12 +11625,48 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: DATABASECONFIG_PATH + value: /run/redis/conf + valuefrom: null + - name: DATABASECONFIG_NAME + value: redis.conf + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + 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 @@ -11716,7 +11695,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -11743,20 +11722,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: "" @@ -11778,7 +11757,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -11793,14 +11772,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: consul-config volumesource: hostpath: null emptydir: @@ -11833,7 +11812,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: consul-data volumesource: hostpath: null emptydir: @@ -11866,7 +11845,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: edgex-init volumesource: hostpath: null emptydir: @@ -11899,10 +11878,43 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - 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/core-command + path: /tmp/edgex/secrets/edgex-consul type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -11934,15 +11946,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.2.0 + - name: edgex-core-consul + image: openyurt/consul:1.10.10 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-8500 hostport: 0 - containerport: 59882 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -11953,23 +11965,53 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-command + - name: ADD_REGISTRY_ACL_ROLES + value: "" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + 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 + valuefrom: null + - name: EDGEX_USER + value: "2002" 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: kuiper-data + - name: consul-acl-token readonly: false - mountpath: /tmp/edgex/secrets/core-command + 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: "" @@ -12001,7 +12043,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -12028,20 +12070,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: "" @@ -12063,7 +12105,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -12078,79 +12120,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + 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: edgex-init volumesource: hostpath: null @@ -12187,7 +12163,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 @@ -12219,15 +12195,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.2.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59860 hostport: 0 - containerport: 59986 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -12239,25 +12215,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest - 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: "" + value: edgex-support-notifications + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: - name: edgex-init readonly: false mountpath: /edgex-init @@ -12266,7 +12230,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -12298,7 +12262,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -12325,20 +12289,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-kuiper service: ports: - - name: tcp-5432 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 5432 + port: 59720 targetport: type: 0 - intval: 5432 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -12360,7 +12324,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -12375,80 +12339,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + 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 - - 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 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -12481,7 +12379,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: kuiper-data volumesource: hostpath: null emptydir: @@ -12514,7 +12412,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kuiper-connections volumesource: hostpath: null emptydir: @@ -12547,7 +12445,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -12582,15 +12480,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.5-alpine + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-59720 hostport: 0 - containerport: 5432 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -12601,53 +12499,65 @@ versions: optional: null secretref: null env: - - name: POSTGRES_DB - value: kong + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" valuefrom: null - - name: POSTGRES_USER - value: kong + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - 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: 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: KUIPER__BASIC__CONSOLELOG + value: "true" 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 + - name: edgex-init readonly: false - mountpath: /run + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: edgex-init + - name: kuiper-data readonly: false - mountpath: /edgex-init + mountpath: /kuiper/data subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: kuiper-connections readonly: false - mountpath: /tmp/postgres-config + mountpath: /kuiper/etc/connections subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: kuiper-sources readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -12679,7 +12589,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -12706,67 +12616,64 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - 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: name: "" generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-security-proxy-setup - 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: consul-acl-token + 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 volumesource: hostpath: null emptydir: @@ -12802,7 +12709,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -12834,12 +12741,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.2.0 + - name: edgex-core-command + image: openyurt/core-command:2.2.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59882 + hostport: 0 + containerport: 59882 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -12848,37 +12760,7 @@ versions: optional: null secretref: null env: - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - 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: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ROUTES_DEVICE_VIRTUAL_HOST - value: device-virtual - valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - valuefrom: null - - name: ROUTES_CORE_COMMAND_HOST + - name: SERVICE_HOST value: edgex-core-command valuefrom: null resources: @@ -12892,15 +12774,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: "" @@ -12911,7 +12787,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -12932,7 +12808,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -12959,12 +12835,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-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-secretstore-setup + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -12979,7 +12885,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] @@ -13052,73 +12958,7 @@ versions: 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 - 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 + - name: tmpfs-volume3 volumesource: hostpath: null emptydir: @@ -13151,7 +12991,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: edgex-init volumesource: hostpath: null emptydir: @@ -13184,7 +13024,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: postgres-config volumesource: hostpath: null emptydir: @@ -13217,7 +13057,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-config + - name: postgres-data volumesource: hostpath: null emptydir: @@ -13252,12 +13092,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup: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: @@ -13266,20 +13111,14 @@ versions: optional: null secretref: null env: - - 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_USER - value: "2002" + - name: POSTGRES_USER + value: kong valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: POSTGRES_DB + value: kong valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} @@ -13294,43 +13133,31 @@ versions: 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 + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: tmpfs-volume3 readonly: false - mountpath: /tmp/kong + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: edgex-init readonly: false - mountpath: /tmp/kuiper + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: postgres-config readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: postgres-data readonly: false - mountpath: /vault/config + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -13389,20 +13216,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-device-rest service: ports: - - name: tcp-59881 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59881 + port: 59986 targetport: type: 0 - intval: 59881 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -13424,7 +13251,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -13439,7 +13266,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -13479,10 +13306,10 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-metadata + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -13514,15 +13341,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59986 hostport: 0 - containerport: 59881 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -13533,11 +13360,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-rest valuefrom: null resources: limits: {} @@ -13552,7 +13376,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-metadata + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -13584,7 +13408,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -13611,42 +13435,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-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -13661,7 +13455,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -13701,6 +13495,39 @@ versions: 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 @@ -13734,7 +13561,40 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - 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: @@ -13767,7 +13627,73 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - 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: @@ -13802,17 +13728,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.9 + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-8200 - hostport: 0 - containerport: 8200 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -13821,14 +13742,20 @@ versions: optional: null secretref: null env: - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null - - name: VAULT_UI - value: "true" + - name: ADD_SECRETSTORE_TOKENS + value: "" + valuefrom: null + - name: SECUREMESSAGEBUS_TYPE + value: redis + valuefrom: null + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -13837,7 +13764,13 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /vault/config + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -13847,15 +13780,33 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: anonymous-volume1 readonly: false - mountpath: /vault/file + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-logs + - name: kong readonly: false - mountpath: /vault/logs + 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: "" @@ -13887,7 +13838,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -13914,20 +13865,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-support-scheduler service: ports: - - name: tcp-58890 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 58890 + port: 59861 targetport: type: 0 - intval: 58890 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -13949,7 +13900,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -13964,7 +13915,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -14007,40 +13958,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/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14072,15 +13990,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.2.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59861 hostport: 0 - containerport: 58890 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -14092,13 +14010,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-support-scheduler valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -14113,13 +14031,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/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -14130,7 +14042,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -14151,7 +14063,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -14178,20 +14090,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-metadata service: ports: - - name: tcp-59860 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59860 + port: 59881 targetport: type: 0 - intval: 59860 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -14213,7 +14125,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -14228,7 +14140,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -14271,7 +14183,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14303,15 +14215,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59881 hostport: 0 - containerport: 59860 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -14322,8 +14234,11 @@ versions: optional: null secretref: null env: + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata + valuefrom: null - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -14338,7 +14253,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -14370,7 +14285,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -14397,20 +14312,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-app-rules-engine service: ports: - - name: tcp-59900 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59900 + port: 59701 targetport: type: 0 - intval: 59900 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -14432,7 +14347,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -14447,7 +14362,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -14490,7 +14405,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14522,15 +14437,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59701 hostport: 0 - containerport: 59900 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -14541,8 +14456,17 @@ versions: optional: null secretref: null env: + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-app-rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} @@ -14557,7 +14481,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -14568,7 +14492,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -14589,7 +14513,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -14616,51 +14540,12 @@ versions: 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-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 + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -14675,7 +14560,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -14715,10 +14600,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/core-data + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14750,22 +14668,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.2.0 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.2.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: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -14774,11 +14682,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST + - 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: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + 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_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_CORE_DATA_HOST value: edgex-core-data valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual + valuefrom: null + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null resources: limits: {} @@ -14791,9 +14726,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/core-data + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -14825,7 +14766,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -14852,38 +14793,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: "" @@ -14905,7 +14837,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -14920,79 +14852,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 @@ -15029,73 +14895,7 @@ versions: - 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: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15127,25 +14927,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.6.1 + - name: edgex-core-data + image: openyurt/core-data:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 + - name: tcp-5563 hostport: 0 - containerport: 8100 + containerport: 5563 protocol: TCP hostip: "" - - name: tcp-8443 + - name: tcp-59880 hostport: 0 - containerport: 8443 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -15156,62 +14951,17 @@ versions: optional: null secretref: null env: - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json + valuefrom: null + - name: SERVICE_HOST + value: edgex-core-data 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 @@ -15220,19 +14970,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: "" @@ -15264,7 +15002,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -15291,20 +15029,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - 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: "" @@ -15326,7 +15064,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -15341,79 +15079,13 @@ 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 - name: edgex-init volumesource: hostpath: null @@ -15450,40 +15122,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: /tmp/edgex/secrets/edgex-consul + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15515,15 +15154,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.10 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59900 hostport: 0 - containerport: 8500 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -15534,38 +15173,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - 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 - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" - valuefrom: null - - name: EDGEX_USER - value: "2002" + - 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: edgex-init readonly: false mountpath: /edgex-init @@ -15574,13 +15189,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: /tmp/edgex/secrets/edgex-consul + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -15612,7 +15221,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -15639,20 +15248,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59720 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59720 + port: 58890 targetport: type: 0 - intval: 59720 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -15674,7 +15283,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -15689,7 +15298,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -15729,45 +15338,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 + - 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 @@ -15795,12 +15371,12 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + - name: anonymous-volume2 + volumesource: + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -15830,15 +15406,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-58890 hostport: 0 - containerport: 59720 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -15849,38 +15425,14 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis - valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: 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__SERVER - value: edgex-redis + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} @@ -15893,21 +15445,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/etc/connections + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: anonymous-volume2 readonly: false - mountpath: /kuiper/etc/sources + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -15939,7 +15485,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -15966,20 +15512,212 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - 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 + 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 + - 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-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: "" @@ -16001,7 +15739,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -16016,7 +15754,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -16059,7 +15797,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 @@ -16091,36 +15829,27 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59986 hostport: 0 - containerport: 59701 + containerport: 59986 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-ireland optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -16135,7 +15864,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: "" @@ -16167,7 +15896,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -16194,20 +15923,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-device-virtual service: ports: - - name: tcp-6379 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 6379 + port: 59900 targetport: type: 0 - intval: 6379 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -16229,7 +15958,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -16244,79 +15973,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-device-virtual 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 @@ -16350,43 +16013,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/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -16418,63 +16048,42 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-device-virtual + image: openyurt/device-virtual:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59900 hostport: 0 - containerport: 6379 + containerport: 59900 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-ireland optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf - valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - 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: 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/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -16506,7 +16115,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -16533,74 +16142,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-device-rest + - name: edgex-app-rules-engine service: ports: - - name: tcp-59986 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 59986 + port: 59701 targetport: type: 0 - intval: 59986 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -16622,7 +16177,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -16637,79 +16192,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + 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: edgex-init volumesource: hostpath: null @@ -16746,7 +16235,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + path: /tmp/edgex/secrets/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -16778,15 +16267,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.0.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59701 hostport: 0 - containerport: 59986 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -16797,32 +16286,23 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine 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 @@ -16831,7 +16311,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -16863,7 +16343,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -16890,20 +16370,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-kong service: ports: - - name: tcp-59881 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59881 + port: 8000 targetport: type: 0 - intval: 59881 + 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-core-metadata + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -16925,7 +16423,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -16940,7 +16438,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] @@ -16980,12 +16478,144 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - 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 + 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: - path: /tmp/edgex/secrets/core-metadata - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -17015,15 +16645,25 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.0.0 + - name: edgex-kong + image: openyurt/kong:2.4.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-8000 hostport: 0 - containerport: 59881 + 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: @@ -17034,17 +16674,56 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: KONG_DATABASE + value: postgres + 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_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl 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 @@ -17053,7 +16732,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-metadata + 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: "" @@ -17064,7 +16755,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -17085,7 +16776,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -17112,12 +16803,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-security-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -17132,7 +16823,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -17172,167 +16863,39 @@ 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-proxy-setup - image: openyurt/security-proxy-setup:2.0.0 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: localobjectreference: name: common-variable-ireland optional: null - secretref: null - env: - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: ROUTES_CORE_CONSUL_HOST - value: edgex-core-consul - valuefrom: null - - name: ROUTES_RULES_ENGINE_HOST - value: edgex-kuiper - 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: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler - valuefrom: null - - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST - value: edgex-support-notifications - valuefrom: null - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - 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: "" + secretref: null + env: + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: - 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 @@ -17361,7 +16924,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -17598,15 +17161,15 @@ versions: optional: null secretref: null env: + - name: VAULT_UI + value: "true" + valuefrom: null - 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: {} @@ -17691,38 +17254,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-core-metadata 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-59881 protocol: TCP appprotocol: null - port: 8443 + port: 59881 targetport: type: 0 - intval: 8443 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -17744,7 +17289,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -17759,79 +17304,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + 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: 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 @@ -17866,72 +17345,6 @@ versions: 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: path: /tmp/edgex/secrets/core-metadata @@ -17966,85 +17379,36 @@ versions: 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_DNS_ORDER - value: LAST,A,CNAME - 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_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db + - name: edgex-core-metadata + image: openyurt/core-metadata:2.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59881 + hostport: 0 + containerport: 59881 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: SERVICE_HOST + value: edgex-core-metadata 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 @@ -18053,19 +17417,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-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -18361,7 +17713,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -18565,8 +17917,8 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__TYPE - value: redis + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis valuefrom: null - name: KUIPER__BASIC__RESTPORT value: "59720" @@ -18577,14 +17929,14 @@ versions: - name: EDGEX__DEFAULT__TOPIC value: rules-events valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL + - name: EDGEX__DEFAULT__TYPE value: redis valuefrom: null - name: EDGEX__DEFAULT__PORT value: "6379" valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis + - name: EDGEX__DEFAULT__PROTOCOL + value: redis valuefrom: null resources: limits: {} @@ -18664,20 +18016,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-support-scheduler service: ports: - - name: tcp-8500 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 8500 + port: 59861 targetport: type: 0 - intval: 8500 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -18699,7 +18051,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -18714,47 +18066,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-support-scheduler 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: edgex-init volumesource: hostpath: null emptydir: @@ -18787,12 +18106,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/support-scheduler + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -18820,7 +18139,166 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + 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_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 + 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-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 volumesource: hostpath: null emptydir: @@ -18856,7 +18334,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-consul + path: /tmp/edgex/secrets/core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18888,15 +18366,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.9.5 + - name: edgex-core-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59882 hostport: 0 - containerport: 8500 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -18907,53 +18385,23 @@ versions: optional: null secretref: null env: - - name: ADD_REGISTRY_ACL_ROLES - value: "" - valuefrom: null - - 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: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: SERVICE_HOST + value: edgex-core-command 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-command subpath: "" mountpropagation: null subpathexpr: "" @@ -18985,7 +18433,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -19012,12 +18460,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: @@ -19032,14 +18480,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 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -19072,7 +18520,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -19105,6 +18553,232 @@ versions: 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 + initcontainers: [] + containers: + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.0.0 + command: [] + args: [] + workingdir: "" + ports: [] + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - 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_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command + 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_CORE_CONSUL_HOST + value: edgex-core-consul + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_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: 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 + 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-security-proxy-setup + 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-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-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: edgex-init volumesource: hostpath: null @@ -19141,7 +18815,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19171,113 +18845,24 @@ 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-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: 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.0.0 + - name: edgex-core-data + image: openyurt/core-data:2.0.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: @@ -19286,38 +18871,17 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - 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: /vault - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -19326,25 +18890,7 @@ 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-config - readonly: false - mountpath: /tmp/kuiper - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-config - readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -19398,47 +18944,17 @@ versions: 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 + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -19453,7 +18969,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -19493,7 +19009,7 @@ versions: storageos: null csi: null ephemeral: null - - name: db-data + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -19559,7 +19075,40 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config + - 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: @@ -19592,12 +19141,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-config volumesource: - hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis - 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-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -19627,17 +19209,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.4-alpine + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-6379 - hostport: 0 - containerport: 6379 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -19646,11 +19223,20 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: DATABASECONFIG_NAME - value: redis.conf + - name: EDGEX_USER + value: "2002" + valuefrom: null + - 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: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null resources: limits: {} @@ -19663,9 +19249,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: db-data + - name: tmpfs-volume2 readonly: false - mountpath: /data + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -19675,15 +19261,27 @@ 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-config + readonly: false + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -19715,7 +19313,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -19742,29 +19340,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-support-notifications service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59880 + port: 59860 targetport: type: 0 - intval: 59880 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -19786,7 +19375,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -19801,7 +19390,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -19844,7 +19433,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/support-notifications type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19876,20 +19465,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.0.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59860 hostport: 0 - containerport: 59880 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -19900,11 +19484,8 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json - valuefrom: null - name: SERVICE_HOST - value: edgex-core-data + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -19919,7 +19500,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -19951,7 +19532,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -19978,20 +19559,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-kong-db service: ports: - - name: tcp-59900 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59900 + port: 5432 targetport: type: 0 - intval: 59900 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -20013,7 +19594,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -20028,13 +19609,112 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + 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 @@ -20068,12 +19748,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: postgres-config volumesource: - hostpath: - path: /tmp/edgex/secrets/device-virtual - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -20101,130 +19781,7 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.0.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59900 - hostport: 0 - containerport: 59900 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-ireland - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - 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/device-virtual - 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-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 + - name: postgres-data volumesource: hostpath: null emptydir: @@ -20259,12 +19816,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper: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: @@ -20273,23 +19835,56 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" + - name: POSTGRES_USER + value: kong valuefrom: null - - name: EDGEX_USER - value: "2002" + - 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 @@ -20297,7 +19892,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -20318,7 +19913,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -20345,20 +19940,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-redis service: ports: - - name: tcp-5432 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 5432 + port: 6379 targetport: type: 0 - intval: 5432 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -20380,7 +19975,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -20395,7 +19990,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] @@ -20435,7 +20030,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: db-data volumesource: hostpath: null emptydir: @@ -20468,7 +20063,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -20501,7 +20096,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: redis-config volumesource: hostpath: null emptydir: @@ -20537,7 +20132,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -20569,15 +20164,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:12.3-alpine + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-6379 hostport: 0 - containerport: 59986 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -20588,23 +20183,44 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - 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/device-rest + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -20636,7 +20252,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -20663,20 +20279,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: "" @@ -20698,7 +20314,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -20713,13 +20329,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + 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 @@ -20753,10 +20435,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/edgex-consul type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -20788,15 +20503,15 @@ versions: 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: @@ -20807,32 +20522,53 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: ADD_REGISTRY_ACL_ROLES + value: "" + 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/app-rules-engine + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -20864,7 +20600,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -20891,20 +20627,61 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - 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: "true" + LOGGING_ENABLEREMOTE: "false" + REGISTRY_HOST: edgex-core-consul + SECRETSTORE_HOST: edgex-vault + SECRETSTORE_ROOTCACERTPATH: /tmp/edgex/secrets/ca/ca.pem + SECRETSTORE_SERVERNAME: edgex-vault + SERVICE_SERVERBINDADDR: 0.0.0.0 + binarydata: {} + components: + - name: edgex-app-service-configurable-rules service: ports: - - name: tcp-59861 + - name: tcp-48100 protocol: TCP appprotocol: null - port: 59861 + port: 48100 targetport: type: 0 - intval: 59861 + intval: 48100 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-app-service-configurable-rules clusterip: "" clusterips: [] type: "" @@ -20926,7 +20703,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-app-service-configurable-rules matchexpressions: [] template: objectmeta: @@ -20941,225 +20718,54 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-app-service-configurable-rules 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 - 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: - 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 + volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.0.0 + - name: edgex-app-service-configurable-rules + image: openyurt/docker-app-service-configurable:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-48100 hostport: 0 - containerport: 59861 + containerport: 48100 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-hanoi optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST + - name: MESSAGEBUS_SUBSCRIBEHOST_HOST value: edgex-core-data valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: BINDING_PUBLISHTOPIC + value: events + valuefrom: null + - name: SERVICE_PORT + value: "48100" + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-service-configurable-rules 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: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -21167,7 +20773,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -21188,7 +20794,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-app-service-configurable-rules subdomain: "" affinity: null schedulername: "" @@ -21215,20 +20821,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-support-scheduler service: ports: - - name: tcp-59882 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 59882 + port: 48085 targetport: type: 0 - intval: 59882 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -21250,7 +20856,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -21265,19 +20871,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - 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 @@ -21305,10 +20911,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/edgex-support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -21340,42 +20946,51 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-48085 hostport: 0 - containerport: 59882 + containerport: 48085 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-hanoi optional: null secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-support-scheduler + valuefrom: null + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: edgex-init + - name: anonymous-volume1 readonly: false - mountpath: /edgex-init + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets/edgex-support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -21407,7 +21022,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -21434,20 +21049,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-data service: ports: - - name: tcp-59860 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59860 + port: 5563 targetport: type: 0 - intval: 59860 + 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-support-notifications + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -21469,7 +21093,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -21484,19 +21108,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - 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 @@ -21524,10 +21148,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/edgex-core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -21559,42 +21183,50 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-5563 hostport: 0 - containerport: 59860 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-hanoi optional: null secretref: null env: + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json + valuefrom: null - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-data valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: edgex-init + - name: anonymous-volume1 readonly: false - mountpath: /edgex-init + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/edgex/secrets/edgex-core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -21626,7 +21258,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: kong-db + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -21653,83 +21285,12 @@ 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: "true" - LOGGING_ENABLEREMOTE: "false" - REGISTRY_HOST: edgex-core-consul - SECRETSTORE_HOST: edgex-vault - SECRETSTORE_ROOTCACERTPATH: /tmp/edgex/secrets/ca/ca.pem - SECRETSTORE_SERVERNAME: edgex-vault - SERVICE_SERVERBINDADDR: 0.0.0.0 - binarydata: {} - components: - - 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-secrets-setup deployment: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-secrets-setup matchexpressions: [] template: objectmeta: @@ -21744,7 +21305,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-secrets-setup annotations: {} ownerreferences: [] finalizers: [] @@ -21784,12 +21345,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 @@ -21817,7 +21378,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - name: secrets-setup-cache volumesource: hostpath: null emptydir: @@ -21850,12 +21411,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 @@ -21883,7 +21444,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - name: vault-init volumesource: hostpath: null emptydir: @@ -21918,17 +21479,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.5.3 + - name: edgex-secrets-setup + image: openyurt/docker-security-secrets-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-8200 - hostport: 0 - containerport: 8200 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -21936,16 +21492,7 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: - - 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 + env: [] resources: limits: {} requests: {} @@ -21953,31 +21500,31 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /vault/config + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: tmpfs-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-vault + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: secrets-setup-cache readonly: false - mountpath: /vault/file + mountpath: /etc/edgex/pki 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-init readonly: false - mountpath: /vault/logs + mountpath: /vault/init subpath: "" mountpropagation: null subpathexpr: "" @@ -21988,7 +21535,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -22009,7 +21556,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-secrets-setup subdomain: "" affinity: null schedulername: "" @@ -22036,12 +21583,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-secrets-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-secrets-setup + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -22056,7 +21633,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-secrets-setup + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] @@ -22096,12 +21673,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/edgex-vault + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22129,7 +21706,7 @@ versions: storageos: null csi: null ephemeral: null - - name: secrets-setup-cache + - name: vault-file volumesource: hostpath: null emptydir: @@ -22162,12 +21739,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-init volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22195,7 +21772,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-init + - name: vault-logs volumesource: hostpath: null emptydir: @@ -22230,12 +21807,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-secrets-setup - image: openyurt/docker-security-secrets-setup-go:1.3.1 + - name: edgex-vault + image: openyurt/vault:1.5.3 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-8200 + hostport: 0 + containerport: 8200 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -22243,7 +21825,16 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: [] + env: + - 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: {} @@ -22251,31 +21842,31 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /tmp + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume2 + - name: anonymous-volume1 readonly: false - mountpath: /run + mountpath: /tmp/edgex/secrets/edgex-vault subpath: "" mountpropagation: null subpathexpr: "" - - name: secrets-setup-cache + - name: vault-file readonly: false - mountpath: /etc/edgex/pki + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: vault-init readonly: false - mountpath: /tmp/edgex/secrets + mountpath: /vault/init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-init + - name: vault-logs readonly: false - mountpath: /vault/init + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -22307,166 +21898,7 @@ versions: 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-kuiper - image: openyurt/kuiper:1.1.1-alpine - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-49990 - hostport: 0 - containerport: 49990 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - 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 - 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 - 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-virtual + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -22493,29 +21925,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-48080 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 48080 + port: 48081 targetport: type: 0 - intval: 48080 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -22537,7 +21960,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -22552,7 +21975,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -22595,7 +22018,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-data + path: /tmp/edgex/secrets/edgex-core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -22627,20 +22050,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-48080 + - name: tcp-48081 hostport: 0 - containerport: 48080 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -22651,11 +22069,14 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json + value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json + valuefrom: null + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -22670,7 +22091,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-data + mountpath: /tmp/edgex/secrets/edgex-core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -22681,7 +22102,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -22702,7 +22123,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -22729,12 +22150,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault-worker + - 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 deployment: replicas: null selector: matchlabels: - app: edgex-vault-worker + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -22749,14 +22200,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault-worker + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: consul-config volumesource: hostpath: null emptydir: @@ -22789,7 +22240,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: consul-data volumesource: hostpath: null emptydir: @@ -22858,7 +22309,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets + path: /tmp/edgex/secrets/ca type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -22888,12 +22339,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-consul + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22914,183 +22365,17 @@ versions: 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-worker - image: openyurt/docker-security-secretstore-setup-go:1.3.1 - command: [] - args: [] - workingdir: "" - ports: [] - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - optional: null - secretref: null - env: - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done - 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 - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-config - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: "" - 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-support-scheduler - service: - ports: - - name: tcp-48085 - protocol: TCP - appprotocol: null - port: 48085 - targetport: - type: 0 - intval: 48085 - strval: "" - nodeport: 0 - selector: - app: edgex-support-scheduler - 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-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: anonymous-volume1 + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume3 volumesource: hostpath: - path: /tmp/edgex/secrets/ca + path: /tmp/edgex/secrets/edgex-kong type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23120,10 +22405,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: anonymous-volume4 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-support-scheduler + path: /tmp/edgex/secrets/edgex-vault type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23155,15 +22440,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/docker-support-scheduler-go:1.3.1 + - name: edgex-core-consul + image: openyurt/docker-edgex-consul:1.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-48085 + - name: tcp-8500 hostport: 0 - containerport: 48085 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -23174,23 +22459,38 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: EDGEX_SECURE + value: "true" valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler + - name: SECRETSTORE_SETUP_DONE_FLAG + value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json + - name: EDGEX_DB + value: redis 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 @@ -23199,7 +22499,19 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-support-scheduler + 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: "" @@ -23231,7 +22543,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -23258,20 +22570,47 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: kong service: ports: - - name: tcp-48060 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 48060 + port: 8000 targetport: type: 0 - intval: 48060 + 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-support-notifications + app: kong clusterip: "" clusterips: [] type: "" @@ -23293,7 +22632,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: kong matchexpressions: [] template: objectmeta: @@ -23308,19 +22647,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + 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 @@ -23348,12 +22687,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: tmpfs-volume2 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 + 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 @@ -23383,15 +22788,30 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/docker-support-notifications-go:1.3.1 + - name: kong + image: openyurt/kong:2.0.5 command: [] args: [] workingdir: "" ports: - - name: tcp-48060 + - name: tcp-8000 hostport: 0 - containerport: 48060 + 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: @@ -23402,26 +22822,56 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-notifications/secrets-token.json + - name: KONG_DATABASE + value: postgres valuefrom: null - - name: SERVICE_HOST - value: edgex-support-notifications + - 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 + - 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 valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: anonymous-volume1 + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: kong readonly: false - mountpath: /tmp/edgex/secrets/edgex-support-notifications + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -23453,7 +22903,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: kong subdomain: "" affinity: null schedulername: "" @@ -23480,42 +22930,12 @@ versions: 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 + - name: edgex-proxy deployment: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-proxy matchexpressions: [] template: objectmeta: @@ -23530,26 +22950,120 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-proxy annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + 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: + 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-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 initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/docker-device-virtual-go:1.3.1 + - name: edgex-proxy + image: openyurt/docker-security-proxy-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-49990 - hostport: 0 - containerport: 49990 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -23558,14 +23072,44 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: SECRETSERVICE_SERVER + value: edgex-vault + valuefrom: null + - name: SECRETSERVICE_CACERTPATH + value: /tmp/edgex/secrets/ca/ca.pem + valuefrom: null + - name: KONGURL_SERVER + value: kong + valuefrom: null + - name: SECRETSERVICE_TOKENPATH + value: /tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json + valuefrom: null + - name: SECRETSERVICE_SNIS + value: edgex-kong valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/ca + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume2 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -23573,7 +23117,7 @@ versions: lifecycle: null terminationmessagepath: "" terminationmessagepolicy: "" - imagepullpolicy: "" + imagepullpolicy: IfNotPresent securitycontext: null stdin: false stdinonce: false @@ -23594,69 +23138,39 @@ versions: 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-command - service: - ports: - - name: tcp-48082 - protocol: TCP - appprotocol: null - port: 48082 - targetport: - type: 0 - intval: 48082 - 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 + hostname: edgex-proxy + 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-bootstrap-database deployment: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-security-bootstrap-database matchexpressions: [] template: objectmeta: @@ -23671,13 +23185,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-security-bootstrap-database 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: anonymous-volume1 volumesource: hostpath: @@ -23714,7 +23294,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-command + path: /tmp/edgex/secrets/edgex-security-bootstrap-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23746,17 +23326,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + - name: edgex-security-bootstrap-database + image: openyurt/docker-security-bootstrap-redis-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-48082 - hostport: 0 - containerport: 48082 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -23766,16 +23341,28 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-security-bootstrap-database valuefrom: null - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-command/secrets-token.json + value: /tmp/edgex/secrets/edgex-security-bootstrap-redis/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: /vault + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false mountpath: /tmp/edgex/secrets/ca @@ -23784,7 +23371,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-command + mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -23816,7 +23403,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault-worker + hostname: edgex-security-bootstrap-database subdomain: "" affinity: null schedulername: "" @@ -23843,20 +23430,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-command service: ports: - - name: tcp-49986 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 49986 + port: 48082 targetport: type: 0 - intval: 49986 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -23867,129 +23454,18 @@ versions: 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-rest - 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-rest - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - 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: "" - 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-proxy + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-proxy + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -24004,46 +23480,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-proxy + app: edgex-core-command 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: @@ -24080,7 +23523,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-security-proxy-setup + path: /tmp/edgex/secrets/edgex-core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -24112,12 +23555,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-proxy - image: openyurt/docker-security-proxy-setup-go:1.3.1 + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-48082 + hostport: 0 + containerport: 48082 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -24126,32 +23574,17 @@ versions: optional: null secretref: null env: - - name: SECRETSERVICE_SNIS - value: edgex-kong - valuefrom: null - - name: SECRETSERVICE_CACERTPATH - value: /tmp/edgex/secrets/ca/ca.pem - valuefrom: null - - name: SECRETSERVICE_SERVER - value: edgex-vault - valuefrom: null - - name: KONGURL_SERVER - value: kong + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null - - name: SECRETSERVICE_TOKENPATH - value: /tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-command/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 @@ -24160,7 +23593,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup + mountpath: /tmp/edgex/secrets/edgex-core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -24192,7 +23625,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-service-configurable-rules + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -24219,20 +23652,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: kong-db + - name: edgex-kuiper service: ports: - - name: tcp-5432 + - name: tcp-20498 protocol: TCP appprotocol: null - port: 5432 + port: 20498 targetport: type: 0 - intval: 5432 + intval: 20498 + strval: "" + nodeport: 0 + - name: tcp-48075 + protocol: TCP + appprotocol: null + port: 48075 + targetport: + type: 0 + intval: 48075 strval: "" nodeport: 0 selector: - app: kong-db + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -24254,7 +23696,7 @@ versions: replicas: null selector: matchlabels: - app: kong-db + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -24269,156 +23711,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong-db + 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 - - 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: 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: @@ -24429,44 +23744,32 @@ versions: optional: null secretref: null env: - - name: POSTGRES_PASSWORD - value: kong + - 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: POSTGRES_USER - value: kong + - name: EDGEX__DEFAULT__SERVER + value: edgex-app-service-configurable-rules valuefrom: null - - name: POSTGRES_DB - value: kong + - 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 @@ -24495,7 +23798,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -24633,12 +23936,12 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - name: SERVICE_HOST value: edgex-sys-mgmt-agent valuefrom: null + - name: METRICSMECHANISM + value: executor + valuefrom: null - name: EXECUTORPATH value: /sys-mgmt-executor valuefrom: null @@ -24681,7 +23984,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -24708,20 +24011,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-device-rest service: ports: - - name: tcp-48081 + - name: tcp-49986 protocol: TCP appprotocol: null - port: 48081 + port: 49986 targetport: type: 0 - intval: 48081 + intval: 49986 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -24743,7 +24046,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -24758,90 +24061,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - 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-core-metadata - 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-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: edgex-device-rest + image: openyurt/docker-device-rest-go:1.2.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-49986 hostport: 0 - containerport: 48081 + containerport: 49986 protocol: TCP hostip: "" envfrom: @@ -24852,32 +24089,14 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json + value: edgex-device-rest valuefrom: null resources: limits: {} requests: {} claims: [] - 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-core-metadata - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -24906,7 +24125,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -24933,99 +24152,63 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrap-database - deployment: - replicas: null - selector: - matchlabels: - app: edgex-security-bootstrap-database - 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-bootstrap-database - 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: - 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 + - 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-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: - name: anonymous-volume1 volumesource: hostpath: @@ -25062,7 +24245,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-security-bootstrap-redis + path: /tmp/edgex/secrets/edgex-support-notifications type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -25094,15 +24277,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrap-database - image: openyurt/docker-security-bootstrap-redis-go:1.3.1 + - name: edgex-support-notifications + image: openyurt/docker-support-notifications-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48090 + - name: tcp-48060 hostport: 0 - containerport: 48090 + containerport: 48060 protocol: TCP hostip: "" envfrom: @@ -25113,29 +24296,17 @@ versions: 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 + 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: anonymous-volume1 readonly: false mountpath: /tmp/edgex/secrets/ca @@ -25144,7 +24315,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis + mountpath: /tmp/edgex/secrets/edgex-support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -25176,7 +24347,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -25203,47 +24374,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: kong + - name: edgex-device-virtual 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-49990 protocol: TCP appprotocol: null - port: 8444 + port: 49990 targetport: type: 0 - intval: 8444 + intval: 49990 strval: "" nodeport: 0 selector: - app: kong + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -25265,7 +24409,7 @@ versions: replicas: null selector: matchlabels: - app: kong + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -25280,138 +24424,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong + app: edgex-device-virtual 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: 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 - 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: kong - image: openyurt/kong:2.0.5 - 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: edgex-device-virtual + image: openyurt/docker-device-virtual-go:1.3.1 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-49990 hostport: 0 - containerport: 8444 + containerport: 49990 protocol: TCP hostip: "" envfrom: @@ -25422,53 +24452,14 @@ versions: optional: null secretref: null env: - - 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 - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: SERVICE_HOST + value: edgex-device-virtual valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: consul-scripts - readonly: false - 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: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -25497,7 +24488,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-proxy + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -25524,20 +24515,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-service-configurable-rules + - name: edgex-redis service: ports: - - name: tcp-48100 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 48100 + port: 6379 targetport: type: 0 - intval: 48100 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-app-service-configurable-rules + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -25559,7 +24550,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-service-configurable-rules + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -25574,24 +24565,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-service-configurable-rules + 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-service-configurable-rules - image: openyurt/docker-app-service-configurable:1.3.1 + - name: edgex-redis + image: openyurt/redis:6.0.9-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-48100 + - name: tcp-6379 hostport: 0 - containerport: 48100 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -25601,27 +24625,18 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-app-service-configurable-rules - valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - - name: MESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-core-data - valuefrom: null - - name: BINDING_PUBLISHTOPIC - value: events - valuefrom: null - - name: SERVICE_PORT - value: "48100" - 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 @@ -25650,7 +24665,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-secrets-setup + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -25677,20 +24692,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: kong-db service: ports: - - name: tcp-8500 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 8500 + port: 5432 targetport: type: 0 - intval: 8500 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: kong-db clusterip: "" clusterips: [] type: "" @@ -25712,7 +24727,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: kong-db matchexpressions: [] template: objectmeta: @@ -25727,47 +24742,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: kong-db 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: @@ -25800,7 +24782,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -25833,78 +24815,12 @@ versions: storageos: null csi: null ephemeral: null - - 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-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 + - name: tmpfs-volume3 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-kong - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -25932,12 +24848,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume4 + - name: postgres-data volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-vault - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -25967,15 +24883,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/docker-edgex-consul:1.3.0 + - name: kong-db + image: openyurt/postgres:12.3-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-5432 hostport: 0 - containerport: 8500 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -25986,59 +24902,41 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done + - name: POSTGRES_USER + value: kong valuefrom: null - - name: EDGEX_DB - value: redis + - name: POSTGRES_DB + value: kong valuefrom: null - - name: EDGEX_SECURE - value: "true" + - name: POSTGRES_PASSWORD + value: kong 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 + - name: tmpfs-volume1 readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /var/run subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: tmpfs-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume3 + - name: tmpfs-volume3 readonly: false - mountpath: /tmp/edgex/secrets/edgex-kong + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume4 + - name: postgres-data readonly: false - mountpath: /tmp/edgex/secrets/edgex-vault + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -26070,7 +24968,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: kong-db subdomain: "" affinity: null schedulername: "" @@ -26206,15 +25104,15 @@ versions: optional: null secretref: null env: + - name: KONG_PG_PASSWORD + value: kong + 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 resources: limits: {} requests: {} @@ -26260,7 +25158,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: "" subdomain: "" affinity: null schedulername: "" @@ -26287,42 +25185,12 @@ versions: 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 + - name: edgex-vault-worker deployment: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-vault-worker matchexpressions: [] template: objectmeta: @@ -26337,19 +25205,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-vault-worker annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: db-data + - name: tmpfs-volume1 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -26377,12 +25245,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume3 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-kong - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -26410,10 +25278,43 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume4 + - 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/edgex-vault + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -26443,19 +25344,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-redis - image: openyurt/redis:6.0.9-alpine + - name: edgex-vault-worker + image: openyurt/docker-security-secretstore-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-6379 - hostport: 0 - containerport: 6379 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -26464,23 +25393,41 @@ 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 valuefrom: null - - name: EDGEX_DB - value: redis - valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: db-data + - name: tmpfs-volume1 readonly: false - mountpath: /data + 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 + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -26512,7 +25459,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-vault-worker subdomain: "" affinity: null schedulername: "" diff --git a/api/v1alpha1/edgex_conversion.go b/api/v1alpha1/edgex_conversion.go index cd2dab6..585c3d2 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.AdditionalDeployment) > 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,26 @@ func (dst *EdgeX) ConvertFrom(srcRaw conversion.Hub) error { dst.Status.DeploymentReplicas = src.Status.ReadyComponentNum + src.Status.UnreadyComponentNum dst.Status.Conditions = src.Status.Conditions + // 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 + } + //TODO: AdditionalService and AdditionalDeployment 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..e09bbc2 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,52 @@ 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) + err := json.Unmarshal([]byte(annotation["AdditionalDeployments"]), &additionalDeployments) + if err != nil { + return nil, err + } + var additionalServices []devicev1alpha1.ServiceTemplateSpec = make([]devicev1alpha1.ServiceTemplateSpec, 0) + err = json.Unmarshal([]byte(annotation["AdditionalServices"]), &additionalServices) + if err != nil { + return nil, err + } + 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/tools/collector/config/multiarch_imagelist.txt b/tools/collector/config/multiarch_imagelist.txt index f1d4a05..8471f99 100644 --- a/tools/collector/config/multiarch_imagelist.txt +++ b/tools/collector/config/multiarch_imagelist.txt @@ -1,30 +1,30 @@ +redis:7.0.5-alpine +consul:1.13.2 postgres:13.8-alpine lfedge/ekuiper:1.7.1-alpine vault:1.11.4 -redis:7.0.5-alpine -consul:1.13.2 kong:2.8.1 -postgres:13.4-alpine -consul:1.10.3 -vault:1.8.4 -lfedge/ekuiper:1.4.4-alpine kong:2.5.1 +vault:1.8.4 redis:6.2.6-alpine -postgres:13.5-alpine +lfedge/ekuiper:1.4.4-alpine +postgres:13.4-alpine +consul:1.10.3 vault:1.8.9 kong:2.6.1 +redis:6.2.6-alpine consul:1.10.10 lfedge/ekuiper:1.4.4-alpine -redis:6.2.6-alpine -vault:1.7.2 +postgres:13.5-alpine kong:2.4.1-alpine +vault:1.7.2 lfedge/ekuiper:1.3.0-alpine -consul:1.9.5 -redis:6.2.4-alpine postgres:12.3-alpine +redis:6.2.4-alpine +consul:1.9.5 vault:1.5.3 +kong:2.0.5 emqx/kuiper:1.1.1-alpine +redis:6.0.9-alpine postgres:12.3-alpine kong:2.0.5 -kong:2.0.5 -redis:6.0.9-alpine diff --git a/tools/collector/config/singlearch_imagelist.txt b/tools/collector/config/singlearch_imagelist.txt index 3daa0c2..b442d91 100644 --- a/tools/collector/config/singlearch_imagelist.txt +++ b/tools/collector/config/singlearch_imagelist.txt @@ -1,65 +1,65 @@ -edgexfoundry/support-scheduler:2.3.0 edgexfoundry/support-scheduler-arm64:2.3.0 -edgexfoundry/security-bootstrapper:2.3.0 edgexfoundry/security-bootstrapper-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/sys-mgmt-agent:2.3.0 edgexfoundry/sys-mgmt-agent-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/edgex-ui:2.3.0 edgexfoundry/edgex-ui-arm64:2.3.0 edgexfoundry/core-data:2.3.0 edgexfoundry/core-data-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/edgex-ui:2.3.0 edgexfoundry/edgex-ui-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/security-bootstrapper:2.3.0 edgexfoundry/security-bootstrapper-arm64:2.3.0 +edgexfoundry/support-scheduler:2.3.0 edgexfoundry/support-scheduler-arm64:2.3.0 +edgexfoundry/core-command:2.3.0 edgexfoundry/core-command-arm64:2.3.0 +edgexfoundry/support-notifications:2.3.0 edgexfoundry/support-notifications-arm64:2.3.0 +edgexfoundry/app-service-configurable:2.3.0 edgexfoundry/app-service-configurable-arm64:2.3.0 edgexfoundry/security-proxy-setup:2.3.0 edgexfoundry/security-proxy-setup-arm64:2.3.0 -edgexfoundry/security-proxy-setup:2.1.1 edgexfoundry/security-proxy-setup-arm64:2.1.1 -edgexfoundry/support-scheduler:2.1.1 edgexfoundry/support-scheduler-arm64:2.1.1 +edgexfoundry/device-rest:2.1.1 edgexfoundry/device-rest-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/sys-mgmt-agent:2.1.1 edgexfoundry/sys-mgmt-agent-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/security-secretstore-setup:2.1.1 edgexfoundry/security-secretstore-setup-arm64:2.1.1 edgexfoundry/support-notifications:2.1.1 edgexfoundry/support-notifications-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/support-scheduler:2.1.1 edgexfoundry/support-scheduler-arm64:2.1.1 edgexfoundry/app-service-configurable:2.1.1 edgexfoundry/app-service-configurable-arm64:2.1.1 -edgexfoundry/device-rest:2.1.1 edgexfoundry/device-rest-arm64:2.1.1 -edgexfoundry/core-metadata:2.1.1 edgexfoundry/core-metadata-arm64:2.1.1 -edgexfoundry/core-command:2.1.1 edgexfoundry/core-command-arm64:2.1.1 edgexfoundry/security-bootstrapper:2.1.1 edgexfoundry/security-bootstrapper-arm64:2.1.1 +edgexfoundry/security-secretstore-setup:2.1.1 edgexfoundry/security-secretstore-setup-arm64:2.1.1 +edgexfoundry/device-virtual:2.1.1 edgexfoundry/device-virtual-arm64:2.1.1 +edgexfoundry/security-proxy-setup:2.1.1 edgexfoundry/security-proxy-setup-arm64:2.1.1 edgexfoundry/security-bootstrapper:2.2.0 edgexfoundry/security-bootstrapper-arm64:2.2.0 -edgexfoundry/support-scheduler:2.2.0 edgexfoundry/support-scheduler-arm64:2.2.0 -edgexfoundry/edgex-ui:2.2.0 edgexfoundry/edgex-ui-arm64:2.2.0 +edgexfoundry/support-notifications:2.2.0 edgexfoundry/support-notifications-arm64:2.2.0 edgexfoundry/core-command:2.2.0 edgexfoundry/core-command-arm64:2.2.0 edgexfoundry/device-rest:2.2.0 edgexfoundry/device-rest-arm64:2.2.0 -edgexfoundry/security-proxy-setup:2.2.0 edgexfoundry/security-proxy-setup-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-metadata:2.2.0 edgexfoundry/core-metadata-arm64:2.2.0 -edgexfoundry/sys-mgmt-agent:2.2.0 edgexfoundry/sys-mgmt-agent-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/core-data:2.2.0 edgexfoundry/core-data-arm64:2.2.0 edgexfoundry/app-service-configurable:2.2.0 edgexfoundry/app-service-configurable-arm64:2.2.0 +edgexfoundry/security-proxy-setup:2.2.0 edgexfoundry/security-proxy-setup-arm64:2.2.0 +edgexfoundry/core-data:2.2.0 edgexfoundry/core-data-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/edgex-ui:2.2.0 edgexfoundry/edgex-ui-arm64:2.2.0 edgexfoundry/device-rest:2.0.0 edgexfoundry/device-rest-arm64:2.0.0 -edgexfoundry/core-metadata:2.0.0 edgexfoundry/core-metadata-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-secretstore-setup:2.0.0 edgexfoundry/security-secretstore-setup-arm64:2.0.0 -edgexfoundry/core-data:2.0.0 edgexfoundry/core-data-arm64:2.0.0 edgexfoundry/device-virtual:2.0.0 edgexfoundry/device-virtual-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/security-bootstrapper:2.0.0 edgexfoundry/security-bootstrapper-arm64:2.0.0 +edgexfoundry/core-metadata:2.0.0 edgexfoundry/core-metadata-arm64:2.0.0 +edgexfoundry/sys-mgmt-agent:2.0.0 edgexfoundry/sys-mgmt-agent-arm64:2.0.0 edgexfoundry/support-scheduler:2.0.0 edgexfoundry/support-scheduler-arm64:2.0.0 edgexfoundry/core-command:2.0.0 edgexfoundry/core-command-arm64:2.0.0 +edgexfoundry/security-proxy-setup:2.0.0 edgexfoundry/security-proxy-setup-arm64:2.0.0 +edgexfoundry/core-data:2.0.0 edgexfoundry/core-data-arm64:2.0.0 +edgexfoundry/security-secretstore-setup:2.0.0 edgexfoundry/security-secretstore-setup-arm64:2.0.0 edgexfoundry/support-notifications:2.0.0 edgexfoundry/support-notifications-arm64:2.0.0 -edgexfoundry/docker-security-secrets-setup-go:1.3.1 edgexfoundry/docker-security-secrets-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-security-secretstore-setup-go:1.3.1 edgexfoundry/docker-security-secretstore-setup-go-arm64:1.3.1 +edgexfoundry/docker-app-service-configurable:1.3.1 edgexfoundry/docker-app-service-configurable-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-device-virtual-go:1.3.1 edgexfoundry/docker-device-virtual-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-security-proxy-setup-go:1.3.1 edgexfoundry/docker-security-proxy-setup-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-core-data-go:1.3.1 edgexfoundry/docker-core-data-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-metadata-go:1.3.1 edgexfoundry/docker-core-metadata-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-app-service-configurable:1.3.1 edgexfoundry/docker-app-service-configurable-arm64:1.3.1 edgexfoundry/docker-edgex-consul:1.3.0 edgexfoundry/docker-edgex-consul-arm64:1.3.0 +edgexfoundry/docker-security-proxy-setup-go:1.3.1 edgexfoundry/docker-security-proxy-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-core-command-go:1.3.1 edgexfoundry/docker-core-command-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-device-rest-go:1.2.1 edgexfoundry/docker-device-rest-go-arm64:1.2.1 +edgexfoundry/docker-support-notifications-go:1.3.1 edgexfoundry/docker-support-notifications-go-arm64:1.3.1 +edgexfoundry/docker-device-virtual-go:1.3.1 edgexfoundry/docker-device-virtual-go-arm64:1.3.1 +edgexfoundry/docker-security-secretstore-setup-go:1.3.1 edgexfoundry/docker-security-secretstore-setup-go-arm64:1.3.1