diff --git a/EdgeXConfig/config-nosecty.yaml b/EdgeXConfig/config-nosecty.yaml index f65b3a7..13901e2 100644 --- a/EdgeXConfig/config-nosecty.yaml +++ b/EdgeXConfig/config-nosecty.yaml @@ -33,20 +33,20 @@ versions: REGISTRY_HOST: edgex-core-consul binarydata: {} components: - - name: edgex-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: "" @@ -68,7 +68,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -83,7 +83,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -92,15 +92,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.3.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59860 hostport: 0 - containerport: 59881 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -111,11 +111,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: {} @@ -150,7 +147,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -177,20 +174,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: "" @@ -212,7 +209,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -227,7 +224,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -236,15 +233,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.3.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59701 hostport: 0 - containerport: 59860 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -256,7 +253,16 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-app-rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} @@ -291,7 +297,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -318,20 +324,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-device-rest service: ports: - - name: tcp-6379 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 6379 + port: 59986 targetport: type: 0 - intval: 6379 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -353,7 +359,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -368,57 +374,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:7.0.5-alpine + - name: edgex-device-rest + image: openyurt/device-rest:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59986 hostport: 0 - containerport: 6379 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -428,18 +401,15 @@ versions: name: common-variable-levski optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-device-rest + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -468,7 +438,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -636,20 +606,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-core-data service: ports: - - name: tcp-4000 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 4000 + port: 5563 targetport: type: 0 - intval: 4000 + 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-ui-go + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -671,7 +650,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -686,7 +665,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -695,15 +674,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.3.0 + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-5563 hostport: 0 - containerport: 4000 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -715,7 +699,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-ui-go + value: edgex-core-data valuefrom: null resources: limits: {} @@ -750,7 +734,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -777,20 +761,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: "" @@ -812,7 +796,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -827,7 +811,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -836,15 +820,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.3.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59881 hostport: 0 - containerport: 59882 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -855,14 +839,11 @@ 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 + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -897,7 +878,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -924,20 +905,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-core-command service: ports: - - name: tcp-8500 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 8500 + port: 59882 targetport: type: 0 - intval: 8500 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -959,7 +940,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -974,90 +955,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-core-command 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-core-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59882 hostport: 0 - containerport: 8500 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -1067,24 +982,21 @@ versions: name: common-variable-levski optional: null secretref: null - env: [] + 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-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: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -1113,7 +1025,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -1140,20 +1052,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-ui-go service: ports: - - name: tcp-59720 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59720 + port: 4000 targetport: type: 0 - intval: 59720 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -1175,7 +1087,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -1190,14 +1102,188 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + 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-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-core-consul + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: kuiper-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: @@ -1232,66 +1318,39 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.7.1-alpine + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] - workingdir: "" - ports: - - name: tcp-59720 - hostport: 0 - containerport: 59720 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - 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 + workingdir: "" + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-levski + optional: null + secretref: null + env: [] resources: limits: {} requests: {} claims: [] volumemounts: - - name: kuiper-data + - name: consul-config readonly: false - mountpath: /kuiper/data + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data subpath: "" mountpropagation: null subpathexpr: "" @@ -1323,7 +1382,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -1350,20 +1409,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: "" @@ -1385,7 +1444,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -1400,24 +1459,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.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: @@ -1427,21 +1519,18 @@ versions: name: common-variable-levski optional: null secretref: null - env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -1470,7 +1559,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -1683,29 +1772,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-kuiper service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59880 + port: 59720 targetport: type: 0 - intval: 59880 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -1727,7 +1807,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -1742,29 +1822,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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-data - image: openyurt/core-data:2.3.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59720 hostport: 0 - containerport: 59880 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -1775,14 +1883,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -1811,7 +1955,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -1838,20 +1982,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: "" @@ -1873,7 +2017,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -1888,7 +2032,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -1897,15 +2041,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.3.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59861 hostport: 0 - containerport: 59701 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -1916,17 +2060,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 - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: SERVICE_HOST + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -1961,7 +2102,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -1988,20 +2129,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - versionName: jakarta + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-jakarta + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-device-virtual service: ports: - - name: tcp-59986 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59986 + port: 59900 targetport: type: 0 - intval: 59986 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -2023,7 +2198,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -2038,7 +2213,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -2047,27 +2222,27 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59900 hostport: 0 - containerport: 59986 + containerport: 59900 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-levski + name: common-variable-jakarta optional: null secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -2102,7 +2277,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -2129,63 +2304,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: jakarta - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-jakarta - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - - name: edgex-core-data + - name: edgex-kuiper service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59880 + port: 59720 targetport: type: 0 - intval: 59880 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -2207,7 +2339,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -2222,29 +2354,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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-data - image: openyurt/core-data:2.1.1 + - name: edgex-kuiper + image: openyurt/ekuiper:1.4.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59720 hostport: 0 - containerport: 59880 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -2255,14 +2415,50 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -2291,7 +2487,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -2318,20 +2514,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-support-scheduler service: ports: - - name: tcp-59986 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59986 + port: 59861 targetport: type: 0 - intval: 59986 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -2353,7 +2549,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -2368,7 +2564,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -2377,15 +2573,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-59861 hostport: 0 - containerport: 59986 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -2396,8 +2592,14 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2432,7 +2634,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -2459,20 +2661,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-command service: ports: - - name: tcp-59881 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59881 + port: 59882 targetport: type: 0 - intval: 59881 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -2494,7 +2696,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -2509,7 +2711,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -2518,15 +2720,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-59882 hostport: 0 - containerport: 59881 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -2537,11 +2739,8 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-core-command valuefrom: null resources: limits: {} @@ -2576,7 +2775,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -2603,20 +2802,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-core-metadata service: ports: - - name: tcp-59861 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59861 + port: 59881 targetport: type: 0 - intval: 59861 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -2638,7 +2837,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -2653,7 +2852,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -2662,15 +2861,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59881 hostport: 0 - containerport: 59861 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -2681,14 +2880,11 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -2723,7 +2919,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -2750,20 +2946,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: "" @@ -2785,7 +2990,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -2800,7 +3005,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -2809,15 +3014,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 + - name: edgex-core-data + image: openyurt/core-data:2.1.1 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: @@ -2829,7 +3039,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-data valuefrom: null resources: limits: {} @@ -2864,7 +3074,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -2891,20 +3101,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-device-rest service: ports: - - name: tcp-59882 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59882 + port: 59986 targetport: type: 0 - intval: 59882 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -2926,7 +3136,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -2941,7 +3151,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -2950,15 +3160,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.1.1 + - name: edgex-device-rest + image: openyurt/device-rest:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59986 hostport: 0 - containerport: 59882 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -2970,7 +3180,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -3005,7 +3215,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -3032,20 +3242,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: "" @@ -3067,7 +3277,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -3082,7 +3292,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -3091,15 +3301,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59701 hostport: 0 - containerport: 59900 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -3110,8 +3320,17 @@ versions: optional: null secretref: null env: + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-app-rules-engine + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null resources: limits: {} @@ -3146,7 +3365,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -3173,20 +3392,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: "" @@ -3208,7 +3427,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -3223,19 +3442,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: kuiper-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 @@ -3265,15 +3484,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.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-58890 hostport: 0 - containerport: 59720 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -3284,47 +3503,23 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - 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__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 + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER - value: edgex-redis + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: kuiper-data + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -3356,7 +3551,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -3383,20 +3578,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-core-consul service: ports: - - name: tcp-58890 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 58890 + port: 8500 targetport: type: 0 - intval: 58890 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -3418,7 +3613,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -3433,19 +3628,52 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: anonymous-volume1 + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -3475,15 +3703,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.1.1 + - name: edgex-core-consul + image: openyurt/consul:1.10.3 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-8500 hostport: 0 - containerport: 58890 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -3493,24 +3721,21 @@ versions: name: common-variable-jakarta optional: null 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 - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] volumemounts: - - name: anonymous-volume1 + - name: consul-config readonly: false - mountpath: /var/run/docker.sock + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data subpath: "" mountpropagation: null subpathexpr: "" @@ -3542,7 +3767,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -3569,20 +3794,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-redis service: ports: - - name: tcp-59701 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59701 + port: 6379 targetport: type: 0 - intval: 59701 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -3604,7 +3829,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -3619,24 +3844,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-6379 hostport: 0 - containerport: 59701 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -3646,24 +3904,18 @@ versions: name: common-variable-jakarta 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-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis - 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 @@ -3692,7 +3944,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -3719,20 +3971,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-ui-go service: ports: - - name: tcp-8500 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 8500 + port: 4000 targetport: type: 0 - intval: 8500 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -3754,7 +4006,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -3769,117 +4021,39 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.1.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-4000 hostport: 0 - containerport: 8500 + containerport: 4000 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: "" + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-jakarta + optional: null + secretref: null + env: [] + resources: + limits: {} + requests: {} + claims: [] + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -3908,7 +4082,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -3935,20 +4109,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-support-notifications service: ports: - - name: tcp-6379 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 6379 + port: 59860 targetport: type: 0 - intval: 6379 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -3970,7 +4144,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -3985,57 +4159,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-support-notifications 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-notifications + image: openyurt/support-notifications:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59860 hostport: 0 - containerport: 6379 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -4045,18 +4186,15 @@ versions: name: common-variable-jakarta optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-support-notifications + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -4085,7 +4223,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -4112,20 +4250,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - versionName: kamakura + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-kamakura + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-app-rules-engine service: ports: - - name: tcp-4000 + - name: tcp-59701 protocol: TCP appprotocol: null - port: 4000 + port: 59701 targetport: type: 0 - intval: 4000 + intval: 59701 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-app-rules-engine clusterip: "" clusterips: [] type: "" @@ -4147,7 +4319,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -4162,7 +4334,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -4171,25 +4343,37 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.1.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59701 hostport: 0 - containerport: 4000 + containerport: 59701 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-jakarta + name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null resources: limits: {} requests: {} @@ -4223,7 +4407,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -4250,40 +4434,6 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: kamakura - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-kamakura - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - name: edgex-core-command service: ports: @@ -4425,20 +4575,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: "" @@ -4460,7 +4610,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -4475,24 +4625,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.2.0 + - name: edgex-core-consul + image: openyurt/consul:1.10.10 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-8500 hostport: 0 - containerport: 59986 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -4502,15 +4718,24 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-rest - 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 @@ -4539,7 +4764,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -4566,20 +4791,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-device-rest service: ports: - - name: tcp-58890 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 58890 + port: 59986 targetport: type: 0 - intval: 58890 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -4601,7 +4826,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -4616,57 +4841,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59986 hostport: 0 - containerport: 58890 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -4677,26 +4869,14 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-device-rest valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: anonymous-volume1 - readonly: false - mountpath: /var/run/docker.sock - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -4725,7 +4905,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -4752,20 +4932,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-core-metadata service: ports: - - name: tcp-59900 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59900 + port: 59881 targetport: type: 0 - intval: 59900 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -4787,7 +4967,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -4802,7 +4982,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -4811,15 +4991,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59881 hostport: 0 - containerport: 59900 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -4831,7 +5011,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -4866,7 +5049,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -4893,20 +5076,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: "" @@ -4928,7 +5111,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -4943,24 +5126,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: db-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.0 + - name: edgex-redis + image: openyurt/redis:6.2.6-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-6379 hostport: 0 - containerport: 59861 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -4970,21 +5186,18 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5013,7 +5226,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -5040,20 +5253,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: "" @@ -5075,7 +5288,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -5090,24 +5303,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + 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-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - 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: @@ -5118,23 +5364,50 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER value: edgex-redis valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__SERVER value: edgex-redis valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: KUIPER__BASIC__CONSOLELOG + value: "true" valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5163,7 +5436,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -5190,20 +5463,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-ui-go service: ports: - - name: tcp-59881 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 59881 + port: 4000 targetport: type: 0 - intval: 59881 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -5225,7 +5498,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -5240,7 +5513,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] @@ -5249,15 +5522,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.2.0 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-4000 hostport: 0 - containerport: 59881 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -5267,13 +5540,7 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null + env: [] resources: limits: {} requests: {} @@ -5307,7 +5574,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -5334,20 +5601,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-4000 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 4000 + port: 58890 targetport: type: 0 - intval: 4000 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -5369,7 +5636,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -5384,24 +5651,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + 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-ui-go - image: openyurt/edgex-ui:2.2.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-58890 hostport: 0 - containerport: 4000 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -5411,12 +5711,27 @@ 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: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -5445,7 +5760,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -5472,20 +5787,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: "" @@ -5507,7 +5822,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -5522,57 +5837,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-device-virtual 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-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59900 hostport: 0 - containerport: 6379 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -5582,18 +5864,15 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-device-virtual + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -5622,7 +5901,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -5649,20 +5928,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-support-scheduler service: ports: - - name: tcp-59860 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59860 + port: 59861 targetport: type: 0 - intval: 59860 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -5684,7 +5963,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -5699,7 +5978,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -5708,15 +5987,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.2.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59861 hostport: 0 - containerport: 59860 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -5727,8 +6006,14 @@ versions: optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -5763,7 +6048,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -5945,20 +6230,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: "" @@ -5980,7 +6265,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -5995,57 +6280,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: @@ -6056,50 +6308,14 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - 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" + - 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 @@ -6128,7 +6344,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -6155,20 +6371,54 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - versionName: ireland + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-ireland + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis + REGISTRY_HOST: edgex-core-consul + binarydata: {} + components: + - name: edgex-device-rest service: ports: - - name: tcp-8500 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 8500 + port: 59986 targetport: type: 0 - intval: 8500 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -6190,7 +6440,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -6202,120 +6452,45 @@ versions: resourceversion: "" generation: 0 creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-core-consul - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: consul-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-device-rest + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.10 + - name: edgex-device-rest + image: openyurt/device-rest:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59986 hostport: 0 - containerport: 8500 + containerport: 59986 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-ireland optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-device-rest + 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 @@ -6344,7 +6519,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -6371,54 +6546,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: ireland - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-ireland - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - MESSAGEQUEUE_HOST: edgex-redis - REGISTRY_HOST: edgex-core-consul - binarydata: {} - components: - - name: edgex-sys-mgmt-agent + - name: edgex-redis service: ports: - - name: tcp-58890 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 58890 + port: 6379 targetport: type: 0 - intval: 58890 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -6440,7 +6581,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -6455,19 +6596,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: anonymous-volume1 + - name: db-data volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6497,15 +6638,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.0.0 + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-6379 hostport: 0 - containerport: 58890 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -6515,24 +6656,15 @@ versions: name: common-variable-ireland optional: null secretref: null - env: - - name: METRICSMECHANISM - value: executor - valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null + env: [] resources: limits: {} requests: {} claims: [] volumemounts: - - name: anonymous-volume1 + - name: db-data readonly: false - mountpath: /var/run/docker.sock + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -6564,7 +6696,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -6591,20 +6723,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: "" @@ -6626,7 +6758,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -6641,7 +6773,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -6650,15 +6782,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.0.0 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59861 hostport: 0 - containerport: 59900 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -6670,7 +6802,13 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -6705,7 +6843,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -6732,20 +6870,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-core-command service: ports: - - name: tcp-59861 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59861 + port: 59882 targetport: type: 0 - intval: 59861 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -6767,7 +6905,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -6782,7 +6920,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -6791,15 +6929,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.0.0 + - name: edgex-core-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59882 hostport: 0 - containerport: 59861 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -6810,14 +6948,8 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler + value: edgex-core-command valuefrom: null resources: limits: {} @@ -6852,7 +6984,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -6879,29 +7011,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-core-consul service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-59880 + - name: tcp-8500 protocol: TCP appprotocol: null - port: 59880 + port: 8500 targetport: type: 0 - intval: 59880 + intval: 8500 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-core-consul clusterip: "" clusterips: [] type: "" @@ -6923,7 +7046,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -6938,29 +7061,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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-data - image: openyurt/core-data:2.0.0 + - name: edgex-core-consul + image: openyurt/consul:1.9.5 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-8500 hostport: 0 - containerport: 59880 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -6970,15 +7154,24 @@ 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: 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 @@ -7007,7 +7200,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -7034,20 +7227,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-core-data service: ports: - - name: tcp-59882 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 59882 + port: 5563 targetport: type: 0 - intval: 59882 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -7069,7 +7271,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -7084,7 +7286,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -7093,15 +7295,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-core-data + image: openyurt/core-data:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-5563 hostport: 0 - containerport: 59882 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -7113,7 +7320,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-command + value: edgex-core-data valuefrom: null resources: limits: {} @@ -7148,7 +7355,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -7175,20 +7382,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59986 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59986 + port: 58890 targetport: type: 0 - intval: 59986 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -7210,7 +7417,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -7225,24 +7432,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + 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-device-rest - image: openyurt/device-rest:2.0.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-58890 hostport: 0 - containerport: 59986 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -7253,14 +7493,26 @@ versions: optional: null secretref: null env: + - name: EXECUTORPATH + value: /sys-mgmt-executor + valuefrom: null - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-sys-mgmt-agent + valuefrom: null + - name: METRICSMECHANISM + value: executor valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: anonymous-volume1 + readonly: false + mountpath: /var/run/docker.sock + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7289,7 +7541,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -7316,20 +7568,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-core-metadata service: ports: - - name: tcp-8500 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 8500 + port: 59881 targetport: type: 0 - intval: 8500 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -7351,7 +7603,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -7366,90 +7618,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + 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 + finalizers: [] + managedfields: [] + spec: + volumes: [] initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.9.5 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59881 hostport: 0 - containerport: 8500 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -7459,24 +7645,18 @@ versions: name: common-variable-ireland optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: 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 @@ -7505,7 +7685,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -7532,20 +7712,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-kuiper service: ports: - - name: tcp-59860 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59860 + port: 59720 targetport: type: 0 - intval: 59860 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -7567,7 +7747,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -7582,24 +7762,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + 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-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.3.0-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59720 hostport: 0 - containerport: 59860 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -7610,14 +7823,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: kuiper-data + readonly: false + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7646,7 +7883,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -7673,20 +7910,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-rules-engine + - name: edgex-device-virtual service: ports: - - name: tcp-59701 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59701 + port: 59900 targetport: type: 0 - intval: 59701 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-app-rules-engine + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -7708,7 +7945,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -7723,7 +7960,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -7732,15 +7969,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.0.1 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59701 + - name: tcp-59900 hostport: 0 - containerport: 59701 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -7751,17 +7988,8 @@ versions: optional: null secretref: null env: - - name: EDGEX_PROFILE - value: rules-engine - valuefrom: null - name: SERVICE_HOST - value: edgex-app-rules-engine - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis - valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -7796,7 +8024,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -7823,20 +8051,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-support-notifications service: ports: - - name: tcp-59720 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 59720 + port: 59860 targetport: type: 0 - intval: 59720 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -7858,7 +8086,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -7873,57 +8101,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: @@ -7934,38 +8129,14 @@ versions: optional: null secretref: null env: - - 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 + - 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 @@ -7994,7 +8165,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -8021,20 +8192,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: "" @@ -8056,7 +8227,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -8071,57 +8242,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.4-alpine + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59701 hostport: 0 - containerport: 6379 + containerport: 59701 protocol: TCP hostip: "" envfrom: @@ -8131,18 +8269,24 @@ versions: name: common-variable-ireland optional: null secretref: null - env: [] + env: + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null + - 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 @@ -8171,7 +8315,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -8198,20 +8342,58 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - versionName: hanoi + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-hanoi + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + CLIENTS_COMMAND_HOST: edgex-core-command + CLIENTS_COREDATA_HOST: edgex-core-data + CLIENTS_DATA_HOST: edgex-core-data + CLIENTS_METADATA_HOST: edgex-core-metadata + CLIENTS_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_RULESENGINE_HOST: edgex-kuiper + CLIENTS_SCHEDULER_HOST: edgex-support-scheduler + CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "false" + LOGGING_ENABLEREMOTE: "false" + REGISTRY_HOST: edgex-core-consul + SERVICE_SERVERBINDADDR: 0.0.0.0 + binarydata: {} + components: + - name: edgex-support-scheduler service: ports: - - name: tcp-59881 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 59881 + port: 48085 targetport: type: 0 - intval: 59881 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -8233,7 +8415,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -8248,7 +8430,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -8257,30 +8439,33 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.0.0 + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-48085 hostport: 0 - containerport: 59881 + containerport: 48085 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-hanoi optional: null secretref: null env: + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data + valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-support-scheduler valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -8315,7 +8500,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -8342,67 +8527,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: hanoi - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-hanoi - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_COMMAND_HOST: edgex-core-command - CLIENTS_COREDATA_HOST: edgex-core-data - CLIENTS_DATA_HOST: edgex-core-data - CLIENTS_METADATA_HOST: edgex-core-metadata - CLIENTS_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_RULESENGINE_HOST: edgex-kuiper - CLIENTS_SCHEDULER_HOST: edgex-support-scheduler - CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "false" - LOGGING_ENABLEREMOTE: "false" - REGISTRY_HOST: edgex-core-consul - SERVICE_SERVERBINDADDR: 0.0.0.0 - binarydata: {} - components: - - name: edgex-kuiper + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-20498 - protocol: TCP - appprotocol: null - port: 20498 - targetport: - type: 0 - intval: 20498 - strval: "" - nodeport: 0 - - name: tcp-48075 + - name: tcp-48090 protocol: TCP appprotocol: null - port: 48075 + port: 48090 targetport: type: 0 - intval: 48075 + intval: 48090 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -8424,7 +8562,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -8439,29 +8577,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + 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-kuiper - image: openyurt/kuiper:1.1.1-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/docker-sys-mgmt-agent-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-20498 - hostport: 0 - containerport: 20498 - protocol: TCP - hostip: "" - - name: tcp-48075 + - name: tcp-48090 hostport: 0 - containerport: 48075 + containerport: 48090 protocol: TCP hostip: "" envfrom: @@ -8472,32 +8638,26 @@ versions: optional: null secretref: null env: - - 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" + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: tcp + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-app-service-configurable-rules + - 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 @@ -8526,7 +8686,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -8553,20 +8713,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-kuiper service: ports: - - name: tcp-6379 + - name: tcp-20498 protocol: TCP appprotocol: null - port: 6379 + port: 20498 targetport: type: 0 - intval: 6379 + 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-redis + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -8588,7 +8757,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -8603,57 +8772,29 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: db-data - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.0.9-alpine + - name: edgex-kuiper + image: openyurt/kuiper:1.1.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-20498 hostport: 0 - containerport: 6379 + containerport: 20498 + protocol: TCP + hostip: "" + - name: tcp-48075 + hostport: 0 + containerport: 48075 protocol: TCP hostip: "" envfrom: @@ -8663,18 +8804,33 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: [] + env: + - name: EDGEX__DEFAULT__PORT + value: "5566" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: tcp + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-app-service-configurable-rules + valuefrom: null + - name: EDGEX__DEFAULT__SERVICESERVER + value: http://edgex-core-data:48080 + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "48075" + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -8703,7 +8859,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -8730,20 +8886,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-data service: ports: - - name: tcp-49986 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 49986 + port: 5563 targetport: type: 0 - intval: 49986 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-48080 + protocol: TCP + appprotocol: null + port: 48080 + targetport: + type: 0 + intval: 48080 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -8765,7 +8930,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -8780,7 +8945,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -8789,15 +8954,20 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/docker-device-rest-go:1.2.1 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-49986 + - name: tcp-5563 hostport: 0 - containerport: 49986 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 protocol: TCP hostip: "" envfrom: @@ -8809,7 +8979,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-rest + value: edgex-core-data valuefrom: null resources: limits: {} @@ -8844,7 +9014,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -8871,20 +9041,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-redis service: ports: - - name: tcp-49990 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 49990 + port: 6379 targetport: type: 0 - intval: 49990 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -8906,7 +9076,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -8921,24 +9091,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + 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-device-virtual - image: openyurt/docker-device-virtual-go:1.3.1 + - name: edgex-redis + image: openyurt/redis:6.0.9-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-49990 + - name: tcp-6379 hostport: 0 - containerport: 49990 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -8948,15 +9151,18 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - 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 @@ -8985,7 +9191,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -9012,20 +9218,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-app-service-configurable-rules + - name: edgex-device-virtual service: ports: - - name: tcp-48100 + - name: tcp-49990 protocol: TCP appprotocol: null - port: 48100 + port: 49990 targetport: type: 0 - intval: 48100 + intval: 49990 strval: "" nodeport: 0 selector: - app: edgex-app-service-configurable-rules + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -9047,7 +9253,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-service-configurable-rules + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -9062,7 +9268,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-service-configurable-rules + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -9071,15 +9277,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-app-service-configurable-rules - image: openyurt/docker-app-service-configurable:1.3.1 + - name: edgex-device-virtual + image: openyurt/docker-device-virtual-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48100 + - name: tcp-49990 hostport: 0 - containerport: 48100 + containerport: 49990 protocol: TCP hostip: "" envfrom: @@ -9091,19 +9297,7 @@ versions: 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: MESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-core-data - valuefrom: null - - name: SERVICE_PORT - value: "48100" + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -9138,7 +9332,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-service-configurable-rules + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -9165,20 +9359,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-core-command service: ports: - - name: tcp-48081 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 48081 + port: 48082 targetport: type: 0 - intval: 48081 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -9200,7 +9394,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -9215,7 +9409,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -9224,15 +9418,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-48082 hostport: 0 - containerport: 48081 + containerport: 48082 protocol: TCP hostip: "" envfrom: @@ -9244,10 +9438,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + value: edgex-core-command valuefrom: null resources: limits: {} @@ -9282,7 +9473,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -9432,212 +9623,50 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - initcontainers: [] - containers: - - name: edgex-core-consul - image: openyurt/docker-edgex-consul:1.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-8500 - hostport: 0 - containerport: 8500 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-hanoi - optional: null - secretref: null - env: - - name: EDGEX_DB - value: redis - valuefrom: null - - name: EDGEX_SECURE - value: "false" - 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: "" - 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-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 - 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: consul-scripts + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + - name: edgex-core-consul + image: openyurt/docker-edgex-consul:1.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-48082 + - name: tcp-8500 hostport: 0 - containerport: 48082 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -9648,14 +9677,35 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-command + - name: EDGEX_DB + value: redis + valuefrom: null + - name: EDGEX_SECURE + value: "false" valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts + readonly: false + mountpath: /consul/scripts + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -9684,7 +9734,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -9711,20 +9761,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-app-service-configurable-rules service: ports: - - name: tcp-48090 + - name: tcp-48100 protocol: TCP appprotocol: null - port: 48090 + port: 48100 targetport: type: 0 - intval: 48090 + intval: 48100 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules clusterip: "" clusterips: [] type: "" @@ -9746,7 +9796,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules matchexpressions: [] template: objectmeta: @@ -9761,57 +9811,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-app-service-configurable-rules annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: anonymous-volume1 - volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/docker-sys-mgmt-agent-go:1.3.1 + - name: edgex-app-service-configurable-rules + image: openyurt/docker-app-service-configurable:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48090 + - name: tcp-48100 hostport: 0 - containerport: 48090 + containerport: 48100 protocol: TCP hostip: "" envfrom: @@ -9822,26 +9839,26 @@ versions: optional: null secretref: null env: - - name: METRICSMECHANISM - value: executor + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: SERVICE_PORT + value: "48100" valuefrom: null - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: MESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-core-data + valuefrom: null + - name: BINDING_PUBLISHTOPIC + value: events + valuefrom: null + - name: SERVICE_HOST + value: edgex-app-service-configurable-rules 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 @@ -9870,7 +9887,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-app-service-configurable-rules subdomain: "" affinity: null schedulername: "" @@ -9897,29 +9914,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-48080 + - name: tcp-49986 protocol: TCP appprotocol: null - port: 48080 + port: 49986 targetport: type: 0 - intval: 48080 + intval: 49986 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -9941,7 +9949,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -9956,7 +9964,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -9965,20 +9973,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-device-rest + image: openyurt/docker-device-rest-go:1.2.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-48080 + - name: tcp-49986 hostport: 0 - containerport: 48080 + containerport: 49986 protocol: TCP hostip: "" envfrom: @@ -9990,7 +9993,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-core-data + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -10025,7 +10028,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -10052,20 +10055,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-metadata service: ports: - - name: tcp-48060 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 48060 + port: 48081 targetport: type: 0 - intval: 48060 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -10087,7 +10090,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -10102,7 +10105,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -10111,15 +10114,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/docker-support-notifications-go:1.3.1 + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48060 + - name: tcp-48081 hostport: 0 - containerport: 48060 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -10131,7 +10134,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-metadata + valuefrom: null + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -10166,7 +10172,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -10193,20 +10199,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-support-notifications service: ports: - - name: tcp-48085 + - name: tcp-48060 protocol: TCP appprotocol: null - port: 48085 + port: 48060 targetport: type: 0 - intval: 48085 + intval: 48060 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -10228,7 +10234,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -10243,7 +10249,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -10252,15 +10258,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/docker-support-scheduler-go:1.3.1 + - name: edgex-support-notifications + image: openyurt/docker-support-notifications-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48085 + - name: tcp-48060 hostport: 0 - containerport: 48085 + containerport: 48060 protocol: TCP hostip: "" envfrom: @@ -10271,14 +10277,8 @@ 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-support-scheduler + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -10313,7 +10313,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" diff --git a/EdgeXConfig/config.yaml b/EdgeXConfig/config.yaml index 3f79353..70495be 100644 --- a/EdgeXConfig/config.yaml +++ b/EdgeXConfig/config.yaml @@ -56,20 +56,20 @@ versions: STAGEGATE_WAITFOR_TIMEOUT: 60s binarydata: {} components: - - 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: "" @@ -91,7 +91,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -106,79 +106,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-core-command 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 @@ -212,43 +146,10 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis + path: /tmp/edgex/secrets/core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -280,15 +181,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:7.0.5-alpine + - name: edgex-core-command + image: openyurt/core-command:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59882 hostport: 0 - containerport: 6379 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -299,44 +200,29 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: MESSAGEQUEUE_INTERNAL_HOST + value: edgex-redis + valuefrom: null + - name: MESSAGEQUEUE_EXTERNAL_URL + value: tcp://edgex-mqtt-broker:1883 valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config - readonly: false - mountpath: /run/redis/conf - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis + mountpath: /tmp/edgex/secrets/core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -368,7 +254,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -395,20 +281,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: "" @@ -430,7 +316,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -445,7 +331,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -488,40 +374,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume2 - volumesource: - hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -553,15 +406,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.3.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59900 hostport: 0 - containerport: 58890 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -572,14 +425,8 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: METRICSMECHANISM - value: executor + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -594,13 +441,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume2 - readonly: false - mountpath: /var/run/docker.sock + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -632,7 +473,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -659,20 +500,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-device-rest service: ports: - - name: tcp-59900 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 59900 + port: 59986 targetport: type: 0 - intval: 59900 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -694,7 +535,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -709,7 +550,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -752,7 +593,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -784,15 +625,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.3.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-59986 hostport: 0 - containerport: 59900 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -804,7 +645,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-device-virtual + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -819,7 +660,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -851,7 +692,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -878,20 +719,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-support-notifications service: ports: - - name: tcp-8500 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 8500 + port: 59860 targetport: type: 0 - intval: 8500 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -913,7 +754,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -928,79 +769,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-support-notifications 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 @@ -1034,43 +809,10 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-consul + path: /tmp/edgex/secrets/support-notifications type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -1102,15 +844,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.13.2 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59860 hostport: 0 - containerport: 8500 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -1121,56 +863,23 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - 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_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" + - name: SERVICE_HOST + value: edgex-support-notifications 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/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -1202,7 +911,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -1229,20 +938,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-core-data service: ports: - - name: tcp-5432 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 5432 + port: 5563 targetport: type: 0 - intval: 5432 + 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-kong-db + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -1264,7 +982,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -1279,47 +997,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + 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 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -1352,111 +1037,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-data + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1486,15 +1072,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.8-alpine + - name: edgex-core-data + image: openyurt/core-data:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-5563 hostport: 0 - containerport: 5432 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 protocol: TCP hostip: "" envfrom: @@ -1505,53 +1096,26 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong - valuefrom: null - - name: POSTGRES_DB - value: kong + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - 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: /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-data subpath: "" mountpropagation: null subpathexpr: "" @@ -1583,7 +1147,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -1610,20 +1174,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-kuiper service: ports: - - name: tcp-4000 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 4000 + port: 59720 targetport: type: 0 - intval: 4000 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -1645,7 +1209,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -1660,157 +1224,7 @@ versions: 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.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 + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -1850,12 +1264,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data 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: kuiper-connections + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-sources + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -1885,20 +1365,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.3.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.7.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 + - name: tcp-59720 hostport: 0 - containerport: 59880 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -1909,11 +1384,38 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: EDGEX__DEFAULT__PORT + value: "6379" valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER + value: edgex-redis valuefrom: null resources: limits: {} @@ -1926,9 +1428,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/core-data + 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: "" @@ -1960,7 +1474,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -1987,20 +1501,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-59986 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 59986 + port: 58890 targetport: type: 0 - intval: 59986 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -2022,7 +1536,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -2037,7 +1551,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -2080,7 +1594,40 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-rest + 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 @@ -2112,15 +1659,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.3.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59986 + - name: tcp-58890 hostport: 0 - containerport: 59986 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -2131,8 +1678,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-device-rest + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} @@ -2147,15 +1700,21 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-rest + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null + - 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: IfNotPresent @@ -2179,7 +1738,148 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-sys-mgmt-agent + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-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.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: "" @@ -2513,21 +2213,21 @@ versions: optional: null secretref: null env: - - name: ADD_SECRETSTORE_TOKENS - value: "" + - 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: SECUREMESSAGEBUS_TYPE value: redis 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: EDGEX_USER + value: "2002" + valuefrom: null + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - name: EDGEX_GROUP value: "2001" valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null resources: limits: {} requests: {} @@ -2636,20 +2336,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-kong-db service: ports: - - name: tcp-59881 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59881 + port: 5432 targetport: type: 0 - intval: 59881 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -2671,7 +2371,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -2686,14 +2386,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -2726,12 +2426,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 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: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -2759,132 +2492,6 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.3.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59881 - hostport: 0 - containerport: 59881 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-levski - optional: null - secretref: null - env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-metadata - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-metadata - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-security-bootstrapper - deployment: - replicas: null - selector: - matchlabels: - app: edgex-security-bootstrapper - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-security-bootstrapper - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - name: edgex-init volumesource: hostpath: null @@ -2918,14 +2525,85 @@ versions: storageos: null csi: null ephemeral: null + - name: postgres-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: postgres-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.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: @@ -2934,23 +2612,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_DB + value: kong + 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: "" - 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 @@ -2979,7 +2690,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -3006,20 +2717,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-core-metadata service: ports: - - name: tcp-59861 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 59861 + port: 59881 targetport: type: 0 - intval: 59861 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -3041,7 +2752,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -3056,7 +2767,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -3099,7 +2810,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -3131,15 +2842,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.3.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59881 hostport: 0 - containerport: 59861 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -3150,14 +2861,11 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - name: SERVICE_HOST - value: edgex-support-scheduler + value: edgex-core-metadata valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -3172,7 +2880,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -3204,7 +2912,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -3231,20 +2939,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-redis service: ports: - - name: tcp-59882 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59882 + port: 6379 targetport: type: 0 - intval: 59882 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -3266,7 +2974,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -3281,13 +2989,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + 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 @@ -3321,10 +3095,43 @@ versions: storageos: null csi: null ephemeral: null + - name: redis-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -3356,15 +3163,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.3.0 + - name: edgex-redis + image: openyurt/redis:7.0.5-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-6379 hostport: 0 - containerport: 59882 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -3375,29 +3182,44 @@ 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 + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null - - name: SERVICE_HOST - value: edgex-core-command + - 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/core-command + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -3429,7 +3251,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -3456,20 +3278,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-kong service: ports: - - name: tcp-59860 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59860 + port: 8000 targetport: type: 0 - intval: 59860 + 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-notifications + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -3491,7 +3331,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -3506,13 +3346,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + 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 @@ -3549,7 +3455,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -3579,17 +3485,93 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.3.0 + - 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 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-8000 hostport: 0 - containerport: 59860 + 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: @@ -3600,14 +3582,62 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + 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_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -3616,7 +3646,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + 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: "" @@ -3648,7 +3690,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -3675,20 +3717,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: "" @@ -3710,7 +3752,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -3725,14 +3767,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: @@ -3765,7 +3807,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: consul-data volumesource: hostpath: null emptydir: @@ -3798,7 +3840,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: edgex-init volumesource: hostpath: null emptydir: @@ -3831,7 +3873,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: consul-acl-token volumesource: hostpath: null emptydir: @@ -3864,17 +3906,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.7.1-alpine + - name: edgex-core-consul + image: openyurt/consul:1.13.2 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-8500 hostport: 0 - containerport: 59720 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -3885,65 +3960,56 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__PROTOCOL - value: redis - 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__PORT - value: "6379" - valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL - value: redis - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: STAGEGATE_REGISTRY_ACL_MANAGEMENTTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/mgmt_token.json valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis + - name: ADD_REGISTRY_ACL_ROLES + value: "" 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: "" @@ -3975,7 +4041,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -4146,8 +4212,8 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - name: SERVICE_HOST value: edgex-app-rules-engine @@ -4155,8 +4221,8 @@ versions: - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST value: edgex-redis valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} @@ -4230,20 +4296,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: "" @@ -4265,7 +4331,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -4280,46 +4346,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 @@ -4353,45 +4386,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 @@ -4421,15 +4421,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.11.4 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.3.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59861 hostport: 0 - containerport: 8200 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -4440,41 +4440,29 @@ versions: optional: null secretref: null env: - - name: VAULT_UI - value: "true" + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: SERVICE_HOST + value: edgex-support-scheduler 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: "" @@ -4506,7 +4494,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -4533,38 +4521,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-vault 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-8200 protocol: TCP appprotocol: null - port: 8443 + port: 8200 targetport: type: 0 - intval: 8443 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -4586,7 +4556,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -4601,7 +4571,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] @@ -4641,7 +4611,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -4674,7 +4644,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: vault-file volumesource: hostpath: null emptydir: @@ -4707,73 +4677,7 @@ 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 + - name: vault-logs volumesource: hostpath: null emptydir: @@ -4808,25 +4712,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.8.1 + - name: edgex-vault + image: openyurt/vault:1.11.4 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 + - name: tcp-8200 hostport: 0 - containerport: 8443 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -4837,44 +4731,14 @@ versions: optional: null secretref: null env: - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - valuefrom: null - - name: KONG_PROXY_ACCESS_LOG - value: /dev/stdout - valuefrom: null - - name: KONG_SSL_CIPHER_SUITE - value: modern - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl - valuefrom: null - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - valuefrom: null - - name: KONG_PG_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword - valuefrom: null - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout + - name: VAULT_UI + value: "true" valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null - - name: KONG_DNS_VALID_TTL - value: "1" + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null resources: limits: {} @@ -4883,13 +4747,7 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -4899,21 +4757,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config + - name: vault-file readonly: false - mountpath: /tmp/postgres-config + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: vault-logs readonly: false - mountpath: /usr/local/kong + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -4945,7 +4797,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -5114,39 +4966,39 @@ versions: optional: null secretref: null env: - - name: ROUTES_CORE_COMMAND_HOST - value: edgex-core-command - valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST - value: edgex-sys-mgmt-agent - valuefrom: null - - name: ROUTES_SUPPORT_SCHEDULER_HOST - value: edgex-support-scheduler + - name: KONGURL_SERVER + value: edgex-kong valuefrom: null - name: ROUTES_DEVICE_VIRTUAL_HOST value: device-virtual valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null - name: ROUTES_CORE_DATA_HOST value: edgex-core-data valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null - name: ROUTES_CORE_CONSUL_HOST value: edgex-core-consul 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_RULES_ENGINE_HOST value: edgex-kuiper valuefrom: null - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST value: edgex-support-notifications valuefrom: null - - name: ROUTES_CORE_METADATA_HOST - value: edgex-core-metadata - valuefrom: null - - name: KONGURL_SERVER - value: edgex-kong - valuefrom: null - - name: ADD_PROXY_ROUTE - value: "" - valuefrom: null resources: limits: {} requests: {} @@ -5225,96 +5077,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: jakarta - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-jakarta - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - API_GATEWAY_HOST: edgex-kong - API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "true" - MESSAGEQUEUE_HOST: edgex-redis - PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul - SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PORT: "8200" - STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper - STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" - STAGEGATE_DATABASE_HOST: edgex-redis - STAGEGATE_DATABASE_PORT: "6379" - STAGEGATE_DATABASE_READYPORT: "6379" - STAGEGATE_KONGDB_HOST: edgex-kong-db - STAGEGATE_KONGDB_PORT: "5432" - STAGEGATE_KONGDB_READYPORT: "54325" - STAGEGATE_READY_TORUNPORT: "54329" - STAGEGATE_REGISTRY_HOST: edgex-core-consul - STAGEGATE_REGISTRY_PORT: "8500" - STAGEGATE_REGISTRY_READYPORT: "54324" - STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup - STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" - STAGEGATE_WAITFOR_TIMEOUT: 60s - binarydata: {} - components: - - name: edgex-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: @@ -5329,7 +5097,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -5369,62 +5137,27 @@ 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.1.1 + - 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: localobjectreference: - name: common-variable-jakarta + name: common-variable-levski optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-rest + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -5437,12 +5170,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 @@ -5471,7 +5198,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-rest + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -5498,60 +5225,66 @@ 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 + - versionName: jakarta + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-jakarta + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + API_GATEWAY_HOST: edgex-kong + API_GATEWAY_STATUS_PORT: "8100" + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis + PROXY_SETUP_HOST: edgex-security-proxy-setup + REGISTRY_HOST: edgex-core-consul + SECRETSTORE_HOST: edgex-vault + SECRETSTORE_PORT: "8200" + STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper + STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" + STAGEGATE_DATABASE_HOST: edgex-redis + STAGEGATE_DATABASE_PORT: "6379" + STAGEGATE_DATABASE_READYPORT: "6379" + STAGEGATE_KONGDB_HOST: edgex-kong-db + STAGEGATE_KONGDB_PORT: "5432" + STAGEGATE_KONGDB_READYPORT: "54325" + STAGEGATE_READY_TORUNPORT: "54329" + STAGEGATE_REGISTRY_HOST: edgex-core-consul + STAGEGATE_REGISTRY_PORT: "8500" + STAGEGATE_REGISTRY_READYPORT: "54324" + STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup + STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" + STAGEGATE_WAITFOR_TIMEOUT: 60s + binarydata: {} + components: + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -5566,7 +5299,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -5675,7 +5408,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -5705,7 +5438,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kong volumesource: hostpath: null emptydir: @@ -5738,7 +5471,73 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + - 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: @@ -5773,27 +5572,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.5.1 + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -5802,44 +5586,20 @@ versions: optional: null secretref: null env: - - name: KONG_PROXY_ERROR_LOG - value: /dev/stderr - 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_PG_HOST - value: edgex-kong-db - valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 + - name: SECUREMESSAGEBUS_TYPE + value: redis valuefrom: null - - name: KONG_DNS_ORDER - value: LAST,A,CNAME + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null - - 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" + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -5854,7 +5614,7 @@ versions: subpathexpr: "" - name: tmpfs-volume2 readonly: false - mountpath: /tmp + mountpath: /vault subpath: "" mountpropagation: null subpathexpr: "" @@ -5866,19 +5626,31 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: kong readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/kong subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: kuiper-sources readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-connections + readonly: false + mountpath: /tmp/kuiper-connections + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -5910,7 +5682,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -5937,20 +5709,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-support-scheduler service: ports: - - name: tcp-59882 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59882 + port: 59861 targetport: type: 0 - intval: 59882 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -5972,7 +5744,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -5987,7 +5759,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -6030,7 +5802,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-command + path: /tmp/edgex/secrets/support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -6062,15 +5834,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.1.1 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59861 hostport: 0 - containerport: 59882 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -6081,8 +5853,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: {} @@ -6097,7 +5875,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /tmp/edgex/secrets/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -6129,7 +5907,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -6156,20 +5934,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: edgex-core-command service: ports: - - name: tcp-8200 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 8200 + port: 59882 targetport: type: 0 - intval: 8200 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-vault + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -6191,7 +5969,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -6206,46 +5984,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-core-command 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 @@ -6279,45 +6024,12 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-logs + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/core-command + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6347,15 +6059,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.4 + - name: edgex-core-command + image: openyurt/core-command:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-59882 hostport: 0 - containerport: 8200 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -6366,41 +6078,23 @@ versions: optional: null secretref: null env: - - name: VAULT_CONFIG_DIR - value: /vault/config - valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 - valuefrom: null - - name: VAULT_UI - value: "true" + - name: SERVICE_HOST + value: edgex-core-command valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file - readonly: false - mountpath: /vault/file - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: vault-logs + - name: anonymous-volume1 readonly: false - mountpath: /vault/logs + mountpath: /tmp/edgex/secrets/core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -6432,7 +6126,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -6459,20 +6153,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-kong-db service: ports: - - name: tcp-59881 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59881 + port: 5432 targetport: type: 0 - intval: 59881 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -6494,7 +6188,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -6509,14 +6203,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -6549,12 +6243,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 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: tmpfs-volume3 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6582,162 +6309,6 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.1.1 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59881 - hostport: 0 - containerport: 59881 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata - valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-metadata - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-metadata - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-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-sys-mgmt-agent - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-sys-mgmt-agent - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - name: edgex-init volumesource: hostpath: null @@ -6771,12 +6342,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: postgres-config volumesource: - hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6804,12 +6375,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: postgres-data volumesource: - hostpath: - path: /var/run/docker.sock - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -6839,15 +6410,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.1.1 + - name: edgex-kong-db + image: openyurt/postgres:13.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-5432 hostport: 0 - containerport: 58890 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -6858,35 +6429,53 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: POSTGRES_DB + value: kong valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: POSTGRES_USER + value: kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: postgres-config readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent + mountpath: /tmp/postgres-config subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: postgres-data readonly: false - mountpath: /var/run/docker.sock + mountpath: /var/lib/postgresql/data subpath: "" mountpropagation: null subpathexpr: "" @@ -6918,7 +6507,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -6945,42 +6534,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 - deployment: - replicas: null + - name: edgex-security-bootstrapper + deployment: + replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -6995,79 +6554,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: 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 @@ -7101,85 +6594,14 @@ versions: storageos: null csi: null ephemeral: null - - name: redis-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/security-bootstrapper-redis - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-6379 - hostport: 0 - containerport: 6379 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -7188,47 +6610,23 @@ versions: optional: null secretref: null env: - - name: DATABASECONFIG_NAME - value: redis.conf + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: EDGEX_USER + value: "2002" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: db-data - readonly: false - mountpath: /data - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: redis-config - readonly: false - mountpath: /run/redis/conf - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/security-bootstrapper-redis - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -7257,7 +6655,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -7494,39 +6892,39 @@ versions: 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 + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + 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: CONNECTION__EDGEX__REDISMSGBUS__TYPE - value: redis + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" + - name: KUIPER__BASIC__CONSOLELOG + value: "true" valuefrom: null - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" + - name: EDGEX__DEFAULT__PROTOCOL + value: redis valuefrom: null - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER value: edgex-redis valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null - name: EDGEX__DEFAULT__SERVER value: edgex-redis valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null resources: limits: {} requests: {} @@ -7611,20 +7009,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: "" @@ -7646,7 +7044,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -7661,14 +7059,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: consul-config volumesource: hostpath: null emptydir: @@ -7701,12 +7099,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: consul-data volumesource: - hostpath: - path: /tmp/edgex/secrets/support-notifications - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -7734,17 +7132,116 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.1.1 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59860 - hostport: 0 - containerport: 59860 + - 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 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-consul + image: openyurt/consul:1.10.3 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -7755,23 +7252,53 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-notifications + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done + valuefrom: null + - 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 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/support-notifications + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -7803,7 +7330,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -7830,29 +7357,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: "" @@ -7874,7 +7392,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -7889,7 +7407,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] @@ -7932,7 +7450,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 @@ -7964,20 +7482,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.1.1 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.1.1 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: @@ -7988,11 +7501,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: {} @@ -8007,7 +7517,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -8039,7 +7549,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -8066,20 +7576,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-core-metadata service: ports: - - name: tcp-4000 + - name: tcp-59881 protocol: TCP appprotocol: null - port: 4000 + port: 59881 targetport: type: 0 - intval: 4000 + intval: 59881 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -8101,7 +7611,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -8116,145 +7626,7 @@ versions: 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.1.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-4000 - hostport: 0 - containerport: 4000 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-jakarta - optional: null - secretref: null - env: [] - resources: - limits: {} - requests: {} - claims: [] - volumemounts: [] - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-ui-go - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-support-scheduler - service: - ports: - - name: tcp-59861 - protocol: TCP - appprotocol: null - port: 59861 - targetport: - type: 0 - intval: 59861 - 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 + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -8297,7 +7669,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -8329,15 +7701,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.1.1 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59881 hostport: 0 - containerport: 59861 + containerport: 59881 protocol: TCP hostip: "" envfrom: @@ -8349,13 +7721,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + value: edgex-core-metadata valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: NOTIFICATIONS_SENDER + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -8370,7 +7739,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -8402,7 +7771,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -8429,42 +7798,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-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -8479,7 +7818,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -8519,10 +7858,43 @@ versions: storageos: null csi: null ephemeral: null + - name: consul-acl-token + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -8554,17 +7926,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.1.1 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.1.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-59701 - hostport: 0 - containerport: 59701 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -8573,17 +7940,38 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: ADD_PROXY_ROUTE + value: "" valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul + valuefrom: null + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} @@ -8596,9 +7984,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -8630,7 +8024,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -8657,20 +8051,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-5432 + - name: tcp-58890 protocol: TCP appprotocol: null - port: 5432 + port: 58890 targetport: type: 0 - intval: 5432 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -8692,7 +8086,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -8707,112 +8101,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-sys-mgmt-agent 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 @@ -8846,12 +8141,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - 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 @@ -8879,12 +8174,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -8914,15 +8209,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.4-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5432 + - name: tcp-58890 hostport: 0 - containerport: 5432 + containerport: 58890 protocol: TCP hostip: "" envfrom: @@ -8933,53 +8228,35 @@ versions: optional: null secretref: null env: - - name: POSTGRES_DB - value: kong + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: POSTGRES_USER - value: kong + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume3 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: anonymous-volume1 readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: anonymous-volume2 readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -9011,7 +8288,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -9038,20 +8315,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-device-rest service: ports: - - name: tcp-8500 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 8500 + port: 59986 targetport: type: 0 - intval: 8500 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-core-consul + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -9073,7 +8350,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -9088,47 +8365,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-device-rest 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: @@ -9161,78 +8405,12 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null + hostpath: + path: /tmp/edgex/secrets/device-rest + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -9262,15 +8440,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.3 + - name: edgex-device-rest + image: openyurt/device-rest:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59986 hostport: 0 - containerport: 8500 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -9281,53 +8459,23 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json - valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" - valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: SERVICE_HOST + value: edgex-device-rest 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/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -9359,7 +8507,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -9386,12 +8534,51 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-core-data + service: + ports: + - name: tcp-5563 + protocol: TCP + appprotocol: null + port: 5563 + targetport: + type: 0 + intval: 5563 + strval: "" + nodeport: 0 + - name: tcp-59880 + protocol: TCP + appprotocol: null + port: 59880 + targetport: + type: 0 + intval: 59880 + strval: "" + nodeport: 0 + selector: + app: edgex-core-data + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -9406,7 +8593,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -9446,14 +8633,57 @@ versions: storageos: null csi: null ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/core-data + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.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: @@ -9462,11 +8692,11 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" + - name: SERVICE_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} @@ -9479,6 +8709,12 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-data + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -9507,7 +8743,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -9534,12 +8770,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - name: edgex-vault + service: + ports: + - name: tcp-8200 + protocol: TCP + appprotocol: null + port: 8200 + targetport: + type: 0 + intval: 8200 + strval: "" + nodeport: 0 + selector: + app: edgex-vault + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -9554,7 +8820,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] @@ -9594,7 +8860,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -9627,7 +8893,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: vault-file volumesource: hostpath: null emptydir: @@ -9660,144 +8926,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: vault-logs volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-sources - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-connections - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -9827,12 +8961,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.1.1 + - name: edgex-vault + image: openyurt/vault:1.8.4 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-8200 + hostport: 0 + containerport: 8200 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -9841,20 +8980,14 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis - valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] + - name: VAULT_UI + value: "true" valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null resources: limits: {} @@ -9863,13 +8996,7 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /vault + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -9879,33 +9006,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kong - readonly: false - mountpath: /tmp/kong - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-sources - readonly: false - mountpath: /tmp/kuiper - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-connections + - name: vault-file readonly: false - mountpath: /tmp/kuiper-connections + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: vault-logs readonly: false - mountpath: /vault/config + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -9937,7 +9046,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -9964,20 +9073,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: "" @@ -9999,7 +9108,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -10014,90 +9123,24 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-ui-go annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: - - name: edgex-init - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/device-virtual - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null + volumes: [] initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.1.1 + - name: edgex-ui-go + image: openyurt/edgex-ui:2.1.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59900 + - name: tcp-4000 hostport: 0 - containerport: 59900 + containerport: 4000 protocol: TCP hostip: "" envfrom: @@ -10107,27 +9150,12 @@ 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: 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: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -10156,7 +9184,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-ui-go subdomain: "" affinity: null schedulername: "" @@ -10183,12 +9211,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-device-virtual + service: + ports: + - name: tcp-59900 + protocol: TCP + appprotocol: null + port: 59900 + targetport: + type: 0 + intval: 59900 + strval: "" + nodeport: 0 + selector: + app: edgex-device-virtual + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -10203,7 +9261,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -10243,43 +9301,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-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -10311,12 +9336,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.1.1 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.1.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59900 + hostport: 0 + containerport: 59900 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -10325,38 +9355,8 @@ versions: optional: null secretref: null env: - - name: ROUTES_CORE_DATA_HOST - value: edgex-core-data - valuefrom: null - - 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 + - name: SERVICE_HOST + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -10369,15 +9369,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/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -10409,7 +9403,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -10436,77 +9430,38 @@ 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-vault + - name: edgex-kong service: ports: - - name: tcp-8200 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 8200 + port: 8000 targetport: type: 0 - intval: 8200 + 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-vault + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -10528,7 +9483,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -10543,7 +9498,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] @@ -10583,7 +9538,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -10616,7 +9571,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-file + - name: edgex-init volumesource: hostpath: null emptydir: @@ -10649,7 +9604,73 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - 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: @@ -10684,33 +9705,73 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.8.9 + - name: edgex-kong + image: openyurt/kong:2.5.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-8000 hostport: 0 - containerport: 8200 + 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-kamakura + name: common-variable-jakarta optional: null secretref: null env: - - name: VAULT_UI - value: "true" + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" valuefrom: null - - name: VAULT_ADDR - value: http://edgex-vault:8200 + - name: KONG_PG_HOST + value: edgex-kong-db valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME valuefrom: null resources: limits: {} @@ -10719,7 +9780,13 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /vault/config + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" @@ -10729,15 +9796,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: anonymous-volume1 readonly: false - mountpath: /vault/file + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-logs + - name: postgres-config readonly: false - mountpath: /vault/logs + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -10769,7 +9842,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -10796,12 +9869,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - name: edgex-redis + service: + ports: + - name: tcp-6379 + protocol: TCP + appprotocol: null + port: 6379 + targetport: + type: 0 + intval: 6379 + strval: "" + nodeport: 0 + selector: + app: edgex-redis + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -10816,14 +9919,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -10856,170 +9959,7 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-security-bootstrapper - image: openyurt/security-bootstrapper:2.2.0 - command: [] - args: [] - workingdir: "" - ports: [] - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura - optional: null - secretref: null - env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - 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-bootstrapper - 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-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-kong - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-kong - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 + - name: db-data volumesource: hostpath: null emptydir: @@ -11052,7 +9992,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -11085,7 +10025,7 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - name: redis-config volumesource: hostpath: null emptydir: @@ -11121,7 +10061,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -11151,141 +10091,32 @@ 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.6.1 + - name: edgex-redis + image: openyurt/redis:6.2.6-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 + - name: tcp-6379 hostport: 0 - containerport: 8443 + containerport: 6379 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-jakarta optional: null secretref: null env: - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - valuefrom: null - - 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" + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null - - name: KONG_DATABASE - value: postgres + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null resources: limits: {} @@ -11298,9 +10129,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume2 + - name: db-data readonly: false - mountpath: /tmp + mountpath: /data subpath: "" mountpropagation: null subpathexpr: "" @@ -11310,21 +10141,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: postgres-config + - name: redis-config readonly: false - mountpath: /tmp/postgres-config + mountpath: /run/redis/conf subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: anonymous-volume1 readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -11356,7 +10181,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -11383,20 +10208,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: "" @@ -11418,7 +10243,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -11433,79 +10258,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-redis + 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: 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 @@ -11539,43 +10298,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/app-rules-engine type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -11607,63 +10333,51 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.6-alpine + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.1.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-59701 hostport: 0 - containerport: 6379 + containerport: 59701 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-kamakura + name: common-variable-jakarta optional: null secretref: null env: - - name: DATABASECONFIG_PATH - value: /run/redis/conf + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: DATABASECONFIG_NAME - value: redis.conf + - name: SERVICE_HOST + value: edgex-app-rules-engine + valuefrom: null + - name: EDGEX_PROFILE + value: rules-engine + valuefrom: null + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null resources: limits: {} 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/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -11695,7 +10409,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -11722,20 +10436,77 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - versionName: kamakura + configMaps: + - typemeta: + kind: "" + apiversion: "" + objectmeta: + name: common-variable-kamakura + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: {} + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + immutable: null + data: + API_GATEWAY_HOST: edgex-kong + API_GATEWAY_STATUS_PORT: "8100" + CLIENTS_CORE_COMMAND_HOST: edgex-core-command + CLIENTS_CORE_DATA_HOST: edgex-core-data + CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications + CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler + DATABASES_PRIMARY_HOST: edgex-redis + EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis + PROXY_SETUP_HOST: edgex-security-proxy-setup + REGISTRY_HOST: edgex-core-consul + SECRETSTORE_HOST: edgex-vault + SECRETSTORE_PORT: "8200" + SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock + SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle + SPIFFE_TRUSTDOMAIN: edgexfoundry.org + STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper + STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" + STAGEGATE_DATABASE_HOST: edgex-redis + STAGEGATE_DATABASE_PORT: "6379" + STAGEGATE_DATABASE_READYPORT: "6379" + STAGEGATE_KONGDB_HOST: edgex-kong-db + STAGEGATE_KONGDB_PORT: "5432" + STAGEGATE_KONGDB_READYPORT: "54325" + STAGEGATE_READY_TORUNPORT: "54329" + STAGEGATE_REGISTRY_HOST: edgex-core-consul + STAGEGATE_REGISTRY_PORT: "8500" + STAGEGATE_REGISTRY_READYPORT: "54324" + STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup + STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" + STAGEGATE_WAITFOR_TIMEOUT: 60s + binarydata: {} + components: + - name: edgex-support-scheduler service: ports: - - name: tcp-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: "" @@ -11757,7 +10528,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -11772,14 +10543,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config + - name: edgex-init volumesource: hostpath: null emptydir: @@ -11812,111 +10583,12 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-data + - 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: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null + hostpath: + path: /tmp/edgex/secrets/support-scheduler + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -11946,15 +10618,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.10.10 + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-59861 hostport: 0 - containerport: 8500 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -11965,53 +10637,29 @@ versions: optional: null secretref: null env: - - 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 + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: SERVICE_HOST + value: edgex-support-scheduler 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/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -12043,7 +10691,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -12070,20 +10718,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: "" @@ -12105,7 +10762,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -12120,7 +10777,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -12163,7 +10820,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -12195,15 +10852,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.2.0 + - name: edgex-core-data + image: openyurt/core-data:2.2.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: @@ -12215,7 +10877,10 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-data + valuefrom: null + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json valuefrom: null resources: limits: {} @@ -12230,7 +10895,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/edgex/secrets/core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -12262,7 +10927,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -12289,20 +10954,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-vault service: ports: - - name: tcp-59720 + - name: tcp-8200 protocol: TCP appprotocol: null - port: 59720 + port: 8200 targetport: type: 0 - intval: 59720 + intval: 8200 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-vault clusterip: "" clusterips: [] type: "" @@ -12324,7 +10989,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-vault matchexpressions: [] template: objectmeta: @@ -12339,14 +11004,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -12379,7 +11044,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-data + - name: edgex-init volumesource: hostpath: null emptydir: @@ -12412,7 +11077,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-connections + - name: vault-file volumesource: hostpath: null emptydir: @@ -12445,7 +11110,7 @@ versions: storageos: null csi: null ephemeral: null - - name: kuiper-sources + - name: vault-logs volumesource: hostpath: null emptydir: @@ -12480,15 +11145,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.4.4-alpine + - name: edgex-vault + image: openyurt/vault:1.8.9 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-8200 hostport: 0 - containerport: 59720 + containerport: 8200 protocol: TCP hostip: "" envfrom: @@ -12499,37 +11164,13 @@ versions: optional: null secretref: null env: - - name: CONNECTION__EDGEX__REDISMSGBUS__PORT - value: "6379" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - 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" + - name: VAULT_ADDR + value: http://edgex-vault:8200 valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: VAULT_CONFIG_DIR + value: /vault/config valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG + - name: VAULT_UI value: "true" valuefrom: null resources: @@ -12537,27 +11178,27 @@ versions: requests: {} claims: [] volumemounts: - - name: edgex-init + - name: tmpfs-volume1 readonly: false - mountpath: /edgex-init + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data + - name: edgex-init readonly: false - mountpath: /kuiper/data + mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-connections + - name: vault-file readonly: false - mountpath: /kuiper/etc/connections + mountpath: /vault/file subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-sources + - name: vault-logs readonly: false - mountpath: /kuiper/etc/sources + mountpath: /vault/logs subpath: "" mountpropagation: null subpathexpr: "" @@ -12589,7 +11230,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -12835,20 +11476,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db + - name: edgex-ui-go service: ports: - - name: tcp-5432 + - name: tcp-4000 protocol: TCP appprotocol: null - port: 5432 + port: 4000 targetport: type: 0 - intval: 5432 + intval: 4000 strval: "" nodeport: 0 selector: - app: edgex-kong-db + app: edgex-ui-go clusterip: "" clusterips: [] type: "" @@ -12870,7 +11511,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-ui-go matchexpressions: [] template: objectmeta: @@ -12885,7 +11526,115 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-ui-go + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: [] + initcontainers: [] + containers: + - name: edgex-ui-go + image: openyurt/edgex-ui:2.2.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-4000 + hostport: 0 + containerport: 4000 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura + optional: null + secretref: null + env: [] + resources: + limits: {} + requests: {} + claims: [] + volumemounts: [] + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-ui-go + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-security-secretstore-setup + deployment: + replicas: null + selector: + matchlabels: + app: edgex-security-secretstore-setup + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -12958,7 +11707,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -12991,7 +11740,40 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - 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: @@ -13024,7 +11806,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kuiper-sources volumesource: hostpath: null emptydir: @@ -13057,7 +11839,40 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - 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: @@ -13092,17 +11907,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:13.5-alpine + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -13111,14 +11921,20 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: POSTGRES_DB - value: kong + - name: ADD_SECRETSTORE_TOKENS + value: "" valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: SECUREMESSAGEBUS_TYPE + value: redis + valuefrom: null + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null resources: limits: {} @@ -13127,42 +11943,54 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /var/run + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - name: tmpfs-volume2 readonly: false - mountpath: /tmp + mountpath: /vault 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: anonymous-volume1 readonly: false - mountpath: /edgex-init + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: kong readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/kong subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: kuiper-sources readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/kuiper subpath: "" mountpropagation: null subpathexpr: "" - volumedevices: [] - livenessprobe: null + - 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: "" + volumedevices: [] + livenessprobe: null readinessprobe: null startupprobe: null lifecycle: null @@ -13189,7 +12017,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -13216,20 +12044,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-kong-db service: ports: - - name: tcp-59986 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 59986 + port: 5432 targetport: type: 0 - intval: 59986 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -13251,7 +12079,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -13266,14 +12094,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -13306,163 +12134,7 @@ 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.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: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/device-rest - 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-device-rest - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-security-secretstore-setup - deployment: - replicas: null - selector: - matchlabels: - app: edgex-security-secretstore-setup - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-security-secretstore-setup - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - - name: tmpfs-volume1 + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -13495,7 +12167,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: tmpfs-volume3 volumesource: hostpath: null emptydir: @@ -13561,40 +12233,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: postgres-config volumesource: hostpath: null emptydir: @@ -13627,73 +12266,7 @@ versions: 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 + - name: postgres-data volumesource: hostpath: null emptydir: @@ -13728,12 +12301,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: @@ -13742,20 +12320,14 @@ versions: optional: null secretref: null env: - - 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: ADD_SECRETSTORE_TOKENS - value: "" + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: POSTGRES_USER + value: kong valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - name: POSTGRES_DB + value: kong valuefrom: null resources: limits: {} @@ -13764,49 +12336,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: "" @@ -13838,7 +12398,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-kong-db subdomain: "" affinity: null schedulername: "" @@ -13865,20 +12425,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: edgex-device-virtual service: ports: - - name: tcp-59861 + - name: tcp-59900 protocol: TCP appprotocol: null - port: 59861 + port: 59900 targetport: type: 0 - intval: 59861 + intval: 59900 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: edgex-device-virtual clusterip: "" clusterips: [] type: "" @@ -13900,7 +12460,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -13915,7 +12475,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-device-virtual annotations: {} ownerreferences: [] finalizers: [] @@ -13958,7 +12518,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-scheduler + path: /tmp/edgex/secrets/device-virtual type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -13990,15 +12550,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.2.0 + - name: edgex-device-virtual + image: openyurt/device-virtual:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59861 + - name: tcp-59900 hostport: 0 - containerport: 59861 + containerport: 59900 protocol: TCP hostip: "" envfrom: @@ -14010,13 +12570,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data - valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + value: edgex-device-virtual valuefrom: null resources: limits: {} @@ -14031,7 +12585,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-scheduler + mountpath: /tmp/edgex/secrets/device-virtual subpath: "" mountpropagation: null subpathexpr: "" @@ -14063,7 +12617,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -14090,20 +12644,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: "" @@ -14125,7 +12679,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -14140,13 +12694,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + 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 @@ -14180,10 +12800,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/edgex-consul type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14215,15 +12868,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/core-metadata:2.2.0 - command: [] + - name: edgex-core-consul + image: openyurt/consul:1.10.10 + command: [] args: [] workingdir: "" ports: - - name: tcp-59881 + - name: tcp-8500 hostport: 0 - containerport: 59881 + containerport: 8500 protocol: TCP hostip: "" envfrom: @@ -14234,26 +12887,53 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: SERVICE_HOST - value: edgex-core-metadata + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done + valuefrom: null + - name: ADD_REGISTRY_ACL_ROLES + value: "" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: 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/core-metadata + mountpath: /tmp/edgex/secrets/edgex-consul subpath: "" mountpropagation: null subpathexpr: "" @@ -14285,7 +12965,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -14312,42 +12992,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-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -14362,7 +13012,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -14402,10 +13052,43 @@ versions: storageos: null csi: null ephemeral: null + - name: consul-acl-token + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/app-rules-engine + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14437,17 +13120,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.2.0 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59701 - hostport: 0 - containerport: 59701 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -14456,17 +13134,38 @@ versions: optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST - value: edgex-redis + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: ROUTES_CORE_DATA_HOST + value: edgex-core-data + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_HOST + value: edgex-support-scheduler + valuefrom: null + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent valuefrom: null resources: limits: {} @@ -14479,9 +13178,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -14513,7 +13218,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -14540,12 +13245,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup + - name: edgex-core-metadata + service: + ports: + - name: tcp-59881 + protocol: TCP + appprotocol: null + port: 59881 + targetport: + type: 0 + intval: 59881 + strval: "" + nodeport: 0 + selector: + app: edgex-core-metadata + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null deployment: replicas: null selector: matchlabels: - app: edgex-security-proxy-setup + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -14560,7 +13295,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -14600,43 +13335,10 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14668,52 +13370,30 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.2.0 + - name: edgex-core-metadata + image: openyurt/core-metadata:2.2.0 command: [] args: [] workingdir: "" - ports: [] - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-kamakura + ports: + - name: tcp-59881 + hostport: 0 + containerport: 59881 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-kamakura optional: null secretref: null env: - - 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: ROUTES_CORE_METADATA_HOST + - name: NOTIFICATIONS_SENDER 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 + - name: SERVICE_HOST + value: edgex-core-metadata valuefrom: null resources: limits: {} @@ -14726,15 +13406,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-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -14766,7 +13440,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -14793,29 +13467,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: "" @@ -14837,7 +13502,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -14852,13 +13517,79 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + 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 @@ -14892,10 +13623,43 @@ versions: storageos: null csi: null ephemeral: null + - name: redis-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/core-data + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -14927,20 +13691,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.2.0 + - name: edgex-redis + image: openyurt/redis:6.2.6-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: @@ -14951,26 +13710,44 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: DATABASECONFIG_NAME + value: redis.conf valuefrom: null - - name: SERVICE_HOST - value: edgex-core-data + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: db-data + readonly: false + mountpath: /data + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init subpath: "" mountpropagation: null subpathexpr: "" + - name: redis-config + readonly: false + mountpath: /run/redis/conf + subpath: "" + mountpropagation: null + subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/core-data + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -15002,7 +13779,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -15029,42 +13806,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual - service: - ports: - - name: tcp-59900 - protocol: TCP - appprotocol: null - port: 59900 - targetport: - type: 0 - intval: 59900 - strval: "" - nodeport: 0 - selector: - app: edgex-device-virtual - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -15079,7 +13826,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -15119,52 +13866,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/device-virtual - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-device-virtual - image: openyurt/device-virtual:2.2.0 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.2.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59900 - hostport: 0 - containerport: 59900 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -15173,8 +13882,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -15187,12 +13899,6 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/device-virtual - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -15221,7 +13927,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -15248,20 +13954,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent + - name: edgex-device-rest service: ports: - - name: tcp-58890 + - name: tcp-59986 protocol: TCP appprotocol: null - port: 58890 + port: 59986 targetport: type: 0 - intval: 58890 + intval: 59986 strval: "" nodeport: 0 selector: - app: edgex-sys-mgmt-agent + app: edgex-device-rest clusterip: "" clusterips: [] type: "" @@ -15283,7 +13989,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest matchexpressions: [] template: objectmeta: @@ -15298,7 +14004,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-device-rest annotations: {} ownerreferences: [] finalizers: [] @@ -15341,40 +14047,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume2 - volumesource: - hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/device-rest type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -15406,15 +14079,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.2.0 + - name: edgex-device-rest + image: openyurt/device-rest:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-59986 hostport: 0 - containerport: 58890 + containerport: 59986 protocol: TCP hostip: "" envfrom: @@ -15425,14 +14098,8 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - - name: METRICSMECHANISM - value: executor - valuefrom: null - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + value: edgex-device-rest valuefrom: null resources: limits: {} @@ -15447,13 +14114,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume2 - readonly: false - mountpath: /var/run/docker.sock + mountpath: /tmp/edgex/secrets/device-rest subpath: "" mountpropagation: null subpathexpr: "" @@ -15485,7 +14146,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-device-rest subdomain: "" affinity: null schedulername: "" @@ -15512,20 +14173,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-ui-go + - name: edgex-support-notifications service: ports: - - name: tcp-4000 + - name: tcp-59860 protocol: TCP appprotocol: null - port: 4000 + port: 59860 targetport: type: 0 - intval: 4000 + intval: 59860 strval: "" nodeport: 0 selector: - app: edgex-ui-go + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -15547,7 +14208,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-ui-go + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -15562,24 +14223,90 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-ui-go + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] + volumes: + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/support-notifications + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null initcontainers: [] containers: - - name: edgex-ui-go - image: openyurt/edgex-ui:2.2.0 + - name: edgex-support-notifications + image: openyurt/support-notifications:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-4000 + - name: tcp-59860 hostport: 0 - containerport: 4000 + containerport: 59860 protocol: TCP hostip: "" envfrom: @@ -15589,12 +14316,27 @@ versions: name: common-variable-kamakura optional: null secretref: null - env: [] + env: + - name: SERVICE_HOST + value: edgex-support-notifications + valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: [] + volumemounts: + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/support-notifications + subpath: "" + mountpropagation: null + subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -15623,7 +14365,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-ui-go + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -15650,74 +14392,38 @@ 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-kong service: ports: - - name: tcp-59986 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 59986 + port: 8000 targetport: type: 0 - intval: 59986 + intval: 8000 + strval: "" + nodeport: 0 + - name: tcp-8100 + protocol: TCP + appprotocol: null + port: 8100 + targetport: + type: 0 + intval: 8100 + strval: "" + nodeport: 0 + - name: tcp-8443 + protocol: TCP + appprotocol: null + port: 8443 + targetport: + type: 0 + intval: 8443 strval: "" nodeport: 0 selector: - app: edgex-device-rest + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -15739,7 +14445,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-rest + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -15754,14 +14460,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-rest + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -15794,12 +14500,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/device-rest - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -15827,159 +14533,6 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - name: edgex-device-rest - image: openyurt/device-rest:2.0.0 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-59986 - hostport: 0 - containerport: 59986 - protocol: TCP - hostip: "" - envfrom: - - prefix: "" - configmapref: - localobjectreference: - name: common-variable-ireland - optional: null - secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-rest - 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-rest - 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-device-rest - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-device-virtual - service: - ports: - - name: tcp-59900 - protocol: TCP - appprotocol: null - port: 59900 - targetport: - type: 0 - intval: 59900 - strval: "" - nodeport: 0 - selector: - app: edgex-device-virtual - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null - deployment: - replicas: null - selector: - matchlabels: - app: edgex-device-virtual - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-device-virtual - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - name: edgex-init volumesource: hostpath: null @@ -16016,7 +14569,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/device-virtual + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -16046,35 +14599,159 @@ 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: "" + - 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.6.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-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-device-virtual + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_SSL_CIPHER_SUITE + value: modern + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + valuefrom: null + - name: KONG_PG_HOST + value: edgex-kong-db + valuefrom: null + - name: KONG_DNS_VALID_TTL + value: "1" + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" - name: edgex-init readonly: false mountpath: /edgex-init @@ -16083,7 +14760,19 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/device-virtual + mountpath: /tmp/edgex/secrets/security-proxy-setup + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -16115,7 +14804,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -16142,20 +14831,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: "" @@ -16177,7 +14866,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-rules-engine + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -16192,7 +14881,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-rules-engine + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -16232,12 +14921,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data volumesource: - hostpath: - path: /tmp/edgex/secrets/app-rules-engine - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-connections + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: kuiper-sources + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -16267,36 +15022,57 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-app-rules-engine - image: openyurt/app-service-configurable:2.0.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: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-redis + - name: KUIPER__BASIC__RESTPORT + value: "59720" valuefrom: null - - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + - name: CONNECTION__EDGEX__REDISMSGBUS__SERVER value: edgex-redis valuefrom: null - - name: SERVICE_HOST - value: edgex-app-rules-engine + - name: EDGEX__DEFAULT__TYPE + value: redis valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: CONNECTION__EDGEX__REDISMSGBUS__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis valuefrom: null resources: limits: {} @@ -16309,9 +15085,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/app-rules-engine + 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: "" @@ -16343,7 +15131,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-rules-engine + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -16370,38 +15158,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong + - name: edgex-sys-mgmt-agent 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-58890 protocol: TCP appprotocol: null - port: 8443 + port: 58890 targetport: type: 0 - intval: 8443 + intval: 58890 strval: "" nodeport: 0 selector: - app: edgex-kong + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -16423,7 +15193,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kong + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -16438,79 +15208,13 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong + app: edgex-sys-mgmt-agent 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 @@ -16547,7 +15251,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /tmp/edgex/secrets/sys-mgmt-agent type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -16577,45 +15281,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /var/run/docker.sock + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -16645,85 +15316,39 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong - image: openyurt/kong:2.4.1-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.2.0 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8100 - hostport: 0 - containerport: 8100 - protocol: TCP - hostip: "" - - name: tcp-8443 + - name: tcp-58890 hostport: 0 - containerport: 8443 + containerport: 58890 protocol: TCP hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 - valuefrom: null - - 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 + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: SERVICE_HOST + value: edgex-sys-mgmt-agent valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + - name: EXECUTORPATH + value: /sys-mgmt-executor 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 @@ -16732,19 +15357,13 @@ 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 + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: anonymous-volume2 readonly: false - mountpath: /usr/local/kong + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -16776,7 +15395,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -16803,12 +15422,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrapper + - 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 deployment: replicas: null selector: matchlabels: - app: edgex-security-bootstrapper + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -16823,7 +15472,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrapper + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] @@ -16863,27 +15512,71 @@ 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-security-bootstrapper - image: openyurt/security-bootstrapper:2.0.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.2.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59701 + hostport: 0 + containerport: 59701 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: localobjectreference: - name: common-variable-ireland + name: common-variable-kamakura optional: null secretref: null env: - - name: EDGEX_USER - value: "2002" + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: EDGEX_GROUP - value: "2001" + - 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 resources: limits: {} @@ -16896,6 +15589,12 @@ 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 @@ -16924,7 +15623,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrapper + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -16951,6 +15650,60 @@ 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-vault service: ports: @@ -17164,12 +15917,12 @@ versions: - 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_ADDR + value: http://edgex-vault:8200 + valuefrom: null resources: limits: {} requests: {} @@ -17254,20 +16007,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-redis service: ports: - - name: tcp-59881 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 59881 + port: 6379 targetport: type: 0 - intval: 59881 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -17289,7 +16042,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -17304,14 +16057,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-redis annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: edgex-init + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -17344,12 +16097,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: db-data volumesource: - hostpath: - path: /tmp/edgex/secrets/core-metadata - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -17377,162 +16130,6 @@ versions: storageos: null csi: null ephemeral: null - initcontainers: [] - containers: - - 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: SERVICE_HOST - value: edgex-core-metadata - valuefrom: null - resources: - limits: {} - requests: {} - claims: [] - volumemounts: - - name: edgex-init - readonly: false - mountpath: /edgex-init - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-metadata - subpath: "" - mountpropagation: null - subpathexpr: "" - volumedevices: [] - livenessprobe: null - readinessprobe: null - startupprobe: null - lifecycle: null - terminationmessagepath: "" - terminationmessagepolicy: "" - imagepullpolicy: IfNotPresent - securitycontext: null - stdin: false - stdinonce: false - tty: false - ephemeralcontainers: [] - restartpolicy: "" - terminationgraceperiodseconds: null - activedeadlineseconds: null - dnspolicy: "" - nodeselector: {} - serviceaccountname: "" - deprecatedserviceaccount: "" - automountserviceaccounttoken: null - nodename: "" - hostnetwork: false - hostpid: false - hostipc: false - shareprocessnamespace: null - securitycontext: null - imagepullsecrets: [] - hostname: edgex-core-metadata - subdomain: "" - affinity: null - schedulername: "" - tolerations: [] - hostaliases: [] - priorityclassname: "" - priority: null - dnsconfig: null - readinessgates: [] - runtimeclassname: null - enableservicelinks: null - preemptionpolicy: null - overhead: {} - topologyspreadconstraints: [] - sethostnameasfqdn: null - os: null - hostusers: null - schedulinggates: [] - resourceclaims: [] - strategy: - type: "" - rollingupdate: null - minreadyseconds: 0 - revisionhistorylimit: null - paused: false - progressdeadlineseconds: null - - name: edgex-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-sys-mgmt-agent - matchexpressions: [] - template: - objectmeta: - name: "" - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: - app: edgex-sys-mgmt-agent - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - spec: - volumes: - name: edgex-init volumesource: hostpath: null @@ -17566,12 +16163,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: redis-config volumesource: - hostpath: - path: /tmp/edgex/secrets/sys-mgmt-agent - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -17599,10 +16196,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: anonymous-volume1 volumesource: hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets/security-bootstrapper-redis type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -17634,15 +16231,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-sys-mgmt-agent - image: openyurt/sys-mgmt-agent:2.0.0 + - name: edgex-redis + image: openyurt/redis:6.2.4-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-58890 + - name: tcp-6379 hostport: 0 - containerport: 58890 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -17653,35 +16250,44 @@ versions: optional: null secretref: null env: - - name: EXECUTORPATH - value: /sys-mgmt-executor - valuefrom: null - - name: SERVICE_HOST - value: edgex-sys-mgmt-agent + - name: DATABASECONFIG_PATH + value: /run/redis/conf valuefrom: null - - name: METRICSMECHANISM - value: executor + - name: DATABASECONFIG_NAME + value: 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: anonymous-volume1 + - name: redis-config readonly: false - mountpath: /tmp/edgex/secrets/sys-mgmt-agent + mountpath: /run/redis/conf subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: anonymous-volume1 readonly: false - mountpath: /var/run/docker.sock + mountpath: /tmp/edgex/secrets/security-bootstrapper-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -17713,7 +16319,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -17740,20 +16346,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-support-scheduler service: ports: - - name: tcp-59720 + - name: tcp-59861 protocol: TCP appprotocol: null - port: 59720 + port: 59861 targetport: type: 0 - intval: 59720 + intval: 59861 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -17775,7 +16381,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -17790,7 +16396,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -17830,45 +16436,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-config + - 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 @@ -17898,15 +16471,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/ekuiper:1.3.0-alpine + - name: edgex-support-scheduler + image: openyurt/support-scheduler:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59720 + - name: tcp-59861 hostport: 0 - containerport: 59720 + containerport: 59861 protocol: TCP hostip: "" envfrom: @@ -17917,26 +16490,14 @@ versions: optional: null secretref: null env: - - name: EDGEX__DEFAULT__SERVER - value: edgex-redis - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "59720" - valuefrom: null - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: rules-events + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX__DEFAULT__TYPE - value: redis + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "6379" - valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: redis + - name: SERVICE_HOST + value: edgex-support-scheduler valuefrom: null resources: limits: {} @@ -17949,15 +16510,9 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: kuiper-data - readonly: false - mountpath: /kuiper/data - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: kuiper-config + - name: anonymous-volume1 readonly: false - mountpath: /kuiper/etc/sources + mountpath: /tmp/edgex/secrets/support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -17989,7 +16544,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -18016,42 +16571,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler - service: - ports: - - name: tcp-59861 - protocol: TCP - appprotocol: null - port: 59861 - targetport: - type: 0 - intval: 59861 - 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 + - name: edgex-security-proxy-setup deployment: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: edgex-security-proxy-setup matchexpressions: [] template: objectmeta: @@ -18066,7 +16591,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: edgex-security-proxy-setup annotations: {} ownerreferences: [] finalizers: [] @@ -18106,10 +16631,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/support-scheduler + path: /tmp/edgex/secrets/security-proxy-setup type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18141,17 +16699,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/support-scheduler:2.0.0 + - name: edgex-security-proxy-setup + image: openyurt/security-proxy-setup:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-59861 - hostport: 0 - containerport: 59861 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -18160,14 +16713,38 @@ versions: optional: null secretref: null env: - - name: INTERVALACTIONS_SCRUBAGED_HOST + - name: ROUTES_CORE_DATA_HOST value: edgex-core-data valuefrom: null - - name: SERVICE_HOST + - name: ADD_PROXY_ROUTE + value: "" + valuefrom: null + - name: ROUTES_SUPPORT_SCHEDULER_HOST value: edgex-support-scheduler valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: ROUTES_RULES_ENGINE_HOST + value: edgex-kuiper + valuefrom: null + - name: KONGURL_SERVER + value: edgex-kong + valuefrom: null + - name: ROUTES_SUPPORT_NOTIFICATIONS_HOST + value: edgex-support-notifications + valuefrom: null + - name: ROUTES_SYS_MGMT_AGENT_HOST + value: edgex-sys-mgmt-agent + valuefrom: null + - name: ROUTES_DEVICE_VIRTUAL_HOST + value: device-virtual + valuefrom: null + - name: ROUTES_CORE_COMMAND_HOST + value: edgex-core-command + valuefrom: null + - name: ROUTES_CORE_METADATA_HOST + value: edgex-core-metadata + valuefrom: null + - name: ROUTES_CORE_CONSUL_HOST + value: edgex-core-consul valuefrom: null resources: limits: {} @@ -18180,9 +16757,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/support-scheduler + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -18214,7 +16797,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: edgex-security-proxy-setup subdomain: "" affinity: null schedulername: "" @@ -18241,20 +16824,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-kuiper service: ports: - - name: tcp-59882 + - name: tcp-59720 protocol: TCP appprotocol: null - port: 59882 + port: 59720 targetport: type: 0 - intval: 59882 + intval: 59720 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-kuiper clusterip: "" clusterips: [] type: "" @@ -18276,7 +16859,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-kuiper matchexpressions: [] template: objectmeta: @@ -18291,7 +16874,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-kuiper annotations: {} ownerreferences: [] finalizers: [] @@ -18331,12 +16914,45 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kuiper-data 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: kuiper-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -18366,15 +16982,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/core-command:2.0.0 + - name: edgex-kuiper + image: openyurt/ekuiper:1.3.0-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-59882 + - name: tcp-59720 hostport: 0 - containerport: 59882 + containerport: 59720 protocol: TCP hostip: "" envfrom: @@ -18385,8 +17001,26 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-command + - name: EDGEX__DEFAULT__TOPIC + value: rules-events + valuefrom: null + - name: KUIPER__BASIC__CONSOLELOG + value: "true" + valuefrom: null + - name: EDGEX__DEFAULT__SERVER + value: edgex-redis + valuefrom: null + - name: KUIPER__BASIC__RESTPORT + value: "59720" + valuefrom: null + - name: EDGEX__DEFAULT__TYPE + value: redis + valuefrom: null + - name: EDGEX__DEFAULT__PORT + value: "6379" + valuefrom: null + - name: EDGEX__DEFAULT__PROTOCOL + value: redis valuefrom: null resources: limits: {} @@ -18399,9 +17033,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: kuiper-data readonly: false - mountpath: /tmp/edgex/secrets/core-command + mountpath: /kuiper/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kuiper-config + readonly: false + mountpath: /kuiper/etc/sources subpath: "" mountpropagation: null subpathexpr: "" @@ -18433,7 +17073,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -18460,13 +17100,43 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-proxy-setup - deployment: - replicas: null + - 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: - matchlabels: - app: edgex-security-proxy-setup - matchexpressions: [] + 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-sys-mgmt-agent + matchexpressions: [] template: objectmeta: name: "" @@ -18480,7 +17150,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-proxy-setup + app: edgex-sys-mgmt-agent annotations: {} ownerreferences: [] finalizers: [] @@ -18520,12 +17190,12 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - name: anonymous-volume1 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/sys-mgmt-agent + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -18553,10 +17223,10 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/security-proxy-setup + path: /var/run/docker.sock type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -18588,12 +17258,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-proxy-setup - image: openyurt/security-proxy-setup:2.0.0 + - name: edgex-sys-mgmt-agent + image: openyurt/sys-mgmt-agent:2.0.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-58890 + hostport: 0 + containerport: 58890 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -18602,38 +17277,14 @@ versions: 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: "" + - name: METRICSMECHANISM + value: executor valuefrom: null - - name: ROUTES_SYS_MGMT_AGENT_HOST + - name: SERVICE_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 + - name: EXECUTORPATH + value: /sys-mgmt-executor valuefrom: null resources: limits: {} @@ -18646,15 +17297,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /tmp/edgex/secrets/sys-mgmt-agent subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/security-proxy-setup + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -18686,7 +17337,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-proxy-setup + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -18713,51 +17364,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-bootstrapper deployment: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-security-bootstrapper matchexpressions: [] template: objectmeta: @@ -18772,7 +17384,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-security-bootstrapper annotations: {} ownerreferences: [] finalizers: [] @@ -18812,57 +17424,14 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/core-data - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/core-data:2.0.0 + - name: edgex-security-bootstrapper + image: openyurt/security-bootstrapper:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-59880 - hostport: 0 - containerport: 59880 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -18871,11 +17440,11 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-core-data + - name: EDGEX_USER + value: "2002" valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/core-data/secrets-token.json + - name: EDGEX_GROUP + value: "2001" valuefrom: null resources: limits: {} @@ -18888,12 +17457,6 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/core-data - subpath: "" - mountpropagation: null - subpathexpr: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -18922,7 +17485,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-security-bootstrapper subdomain: "" affinity: null schedulername: "" @@ -18949,12 +17512,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-secretstore-setup + - 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 deployment: replicas: null selector: matchlabels: - app: edgex-security-secretstore-setup + app: edgex-app-rules-engine matchexpressions: [] template: objectmeta: @@ -18969,14 +17562,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-secretstore-setup + app: edgex-app-rules-engine annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -19009,177 +17602,12 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - 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: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kong - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: kuiper-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-config - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/app-rules-engine + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -19209,12 +17637,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-secretstore-setup - image: openyurt/security-secretstore-setup:2.0.0 + - name: edgex-app-rules-engine + image: openyurt/app-service-configurable:2.0.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-59701 + hostport: 0 + containerport: 59701 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -19223,38 +17656,23 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" - valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: SERVICE_HOST + value: edgex-app-rules-engine valuefrom: null - - name: ADD_KNOWN_SECRETS - value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] + - name: TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST + value: edgex-redis valuefrom: null - - name: SECUREMESSAGEBUS_TYPE - value: redis + - name: TRIGGER_EDGEXMESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-redis valuefrom: null - - name: ADD_SECRETSTORE_TOKENS - value: "" + - 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 @@ -19263,25 +17681,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/app-rules-engine subpath: "" mountpropagation: null subpathexpr: "" @@ -19313,7 +17713,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-secretstore-setup + hostname: edgex-app-rules-engine subdomain: "" affinity: null schedulername: "" @@ -19340,20 +17740,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-notifications + - name: edgex-core-command service: ports: - - name: tcp-59860 + - name: tcp-59882 protocol: TCP appprotocol: null - port: 59860 + port: 59882 targetport: type: 0 - intval: 59860 + intval: 59882 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -19375,7 +17775,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -19390,7 +17790,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -19433,7 +17833,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/support-notifications + path: /tmp/edgex/secrets/core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -19465,15 +17865,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/support-notifications:2.0.0 + - name: edgex-core-command + image: openyurt/core-command:2.0.0 command: [] args: [] workingdir: "" ports: - - name: tcp-59860 + - name: tcp-59882 hostport: 0 - containerport: 59860 + containerport: 59882 protocol: TCP hostip: "" envfrom: @@ -19485,7 +17885,7 @@ versions: secretref: null env: - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-command valuefrom: null resources: limits: {} @@ -19500,7 +17900,7 @@ versions: subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/support-notifications + mountpath: /tmp/edgex/secrets/core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -19532,7 +17932,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -19559,42 +17959,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kong-db - service: - ports: - - name: tcp-5432 - protocol: TCP - appprotocol: null - port: 5432 - targetport: - type: 0 - intval: 5432 - strval: "" - nodeport: 0 - selector: - app: edgex-kong-db - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: edgex-security-secretstore-setup deployment: replicas: null selector: matchlabels: - app: edgex-kong-db + app: edgex-security-secretstore-setup matchexpressions: [] template: objectmeta: @@ -19609,7 +17979,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kong-db + app: edgex-security-secretstore-setup annotations: {} ownerreferences: [] finalizers: [] @@ -19682,7 +18052,7 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - name: edgex-init volumesource: hostpath: null emptydir: @@ -19715,7 +18085,40 @@ versions: storageos: null csi: null ephemeral: null - - name: edgex-init + - 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: @@ -19748,7 +18151,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-config + - name: kuiper-config volumesource: hostpath: null emptydir: @@ -19781,7 +18184,7 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: vault-config volumesource: hostpath: null emptydir: @@ -19816,17 +18219,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-kong-db - image: openyurt/postgres:12.3-alpine + - name: edgex-security-secretstore-setup + image: openyurt/security-secretstore-setup:2.0.0 command: [] args: [] workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -19835,14 +18233,20 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong + - name: SECUREMESSAGEBUS_TYPE + value: redis valuefrom: null - - name: POSTGRES_PASSWORD_FILE - value: /tmp/postgres-config/.pgpassword + - name: EDGEX_GROUP + value: "2001" valuefrom: null - - name: POSTGRES_DB - value: kong + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: ADD_SECRETSTORE_TOKENS + value: "" + valuefrom: null + - name: ADD_KNOWN_SECRETS + value: redisdb[app-rules-engine],redisdb[device-rest],redisdb[device-virtual] valuefrom: null resources: limits: {} @@ -19851,37 +18255,43 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /var/run + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - name: tmpfs-volume2 readonly: false - mountpath: /tmp + mountpath: /vault 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: anonymous-volume1 readonly: false - mountpath: /edgex-init + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-config + - name: kong readonly: false - mountpath: /tmp/postgres-config + mountpath: /tmp/kong subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: kuiper-config readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/kuiper + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -19913,7 +18323,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kong-db + hostname: edgex-security-secretstore-setup subdomain: "" affinity: null schedulername: "" @@ -19940,20 +18350,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: "" @@ -19975,7 +18385,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -19990,79 +18400,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 @@ -20096,43 +18440,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 @@ -20164,15 +18475,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.2.4-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: @@ -20183,44 +18494,23 @@ versions: 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: "" @@ -20252,7 +18542,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -20279,20 +18569,38 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul + - name: edgex-kong service: ports: - - name: tcp-8500 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 8500 + port: 8000 targetport: type: 0 - intval: 8500 + 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-consul + app: edgex-kong clusterip: "" clusterips: [] type: "" @@ -20314,7 +18622,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-consul + app: edgex-kong matchexpressions: [] template: objectmeta: @@ -20329,14 +18637,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: edgex-kong annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-config + - name: tmpfs-volume1 volumesource: hostpath: null emptydir: @@ -20369,7 +18677,7 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-data + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -20435,7 +18743,40 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-acl-token + - 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: @@ -20468,12 +18809,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 + - name: kong volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-consul - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -20503,15 +18844,25 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/consul:1.9.5 + - name: edgex-kong + image: openyurt/kong:2.4.1-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-8500 + - name: tcp-8000 hostport: 0 - containerport: 8500 + 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: @@ -20522,35 +18873,53 @@ versions: optional: null secretref: null env: - - name: EDGEX_GROUP - value: "2001" + - name: KONG_DNS_VALID_TTL + value: "1" valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH - value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + - name: KONG_PG_HOST + value: edgex-kong-db valuefrom: null - - name: EDGEX_USER - value: "2002" + - name: KONG_DATABASE + value: postgres valuefrom: null - - name: ADD_REGISTRY_ACL_ROLES - value: "" + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 valuefrom: null - - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH - value: /consul/config/consul_acl_done + - name: KONG_ADMIN_LISTEN + value: 127.0.0.1:8001, 127.0.0.1:8444 ssl + valuefrom: null + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_DNS_ORDER + value: LAST,A,CNAME + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr + valuefrom: null + - name: KONG_PG_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config + - name: tmpfs-volume1 readonly: false - mountpath: /consul/config + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-data + - name: tmpfs-volume2 readonly: false - mountpath: /consul/data + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" @@ -20560,15 +18929,21 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-acl-token + - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/consul-acl-token + mountpath: /tmp/edgex/secrets/security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume1 + - name: postgres-config readonly: false - mountpath: /tmp/edgex/secrets/edgex-consul + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: kong + readonly: false + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -20600,7 +18975,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: edgex-kong subdomain: "" affinity: null schedulername: "" @@ -20627,61 +19002,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - versionName: hanoi - configMaps: - - typemeta: - kind: "" - apiversion: "" - objectmeta: - name: common-variable-hanoi - generatename: "" - namespace: "" - selflink: "" - uid: "" - resourceversion: "" - generation: 0 - creationtimestamp: "0001-01-01T00:00:00Z" - deletiontimestamp: null - deletiongraceperiodseconds: null - labels: {} - annotations: {} - ownerreferences: [] - finalizers: [] - managedfields: [] - immutable: null - data: - CLIENTS_COMMAND_HOST: edgex-core-command - CLIENTS_COREDATA_HOST: edgex-core-data - CLIENTS_DATA_HOST: edgex-core-data - CLIENTS_METADATA_HOST: edgex-core-metadata - CLIENTS_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_RULESENGINE_HOST: edgex-kuiper - CLIENTS_SCHEDULER_HOST: edgex-support-scheduler - CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual - DATABASES_PRIMARY_HOST: edgex-redis - EDGEX_SECURITY_SECRET_STORE: "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 + - name: edgex-kong-db service: ports: - - name: tcp-48100 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 48100 + port: 5432 targetport: type: 0 - intval: 48100 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-app-service-configurable-rules + app: edgex-kong-db clusterip: "" clusterips: [] type: "" @@ -20703,7 +19037,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-app-service-configurable-rules + app: edgex-kong-db matchexpressions: [] template: objectmeta: @@ -20718,24 +19052,1845 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-app-service-configurable-rules + app: edgex-kong-db annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: - volumes: [] - initcontainers: [] - containers: - - name: edgex-app-service-configurable-rules - image: openyurt/docker-app-service-configurable:1.3.1 - command: [] - args: [] - workingdir: "" - ports: - - name: tcp-48100 + 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 + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: 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 + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-kong-db + image: openyurt/postgres:12.3-alpine + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-5432 + hostport: 0 + containerport: 5432 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: POSTGRES_PASSWORD_FILE + value: /tmp/postgres-config/.pgpassword + valuefrom: null + - name: POSTGRES_DB + value: kong + valuefrom: null + - name: POSTGRES_USER + value: kong + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: tmpfs-volume1 + readonly: false + mountpath: /var/run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume3 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-config + readonly: false + mountpath: /tmp/postgres-config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: postgres-data + readonly: false + mountpath: /var/lib/postgresql/data + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-kong-db + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-core-metadata + service: + ports: + - name: tcp-59881 + protocol: TCP + appprotocol: null + port: 59881 + targetport: + type: 0 + intval: 59881 + strval: "" + nodeport: 0 + selector: + app: edgex-core-metadata + clusterip: "" + clusterips: [] + type: "" + externalips: [] + sessionaffinity: "" + loadbalancerip: "" + loadbalancersourceranges: [] + externalname: "" + externaltrafficpolicy: "" + healthchecknodeport: 0 + publishnotreadyaddresses: false + sessionaffinityconfig: null + ipfamilies: [] + ipfamilypolicy: null + allocateloadbalancernodeports: null + loadbalancerclass: null + internaltrafficpolicy: null + deployment: + replicas: null + selector: + matchlabels: + app: edgex-core-metadata + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-core-metadata + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: edgex-init + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: 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 + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-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: SERVICE_HOST + value: edgex-core-metadata + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-metadata + subpath: "" + mountpropagation: null + subpathexpr: "" + volumedevices: [] + livenessprobe: null + readinessprobe: null + startupprobe: null + lifecycle: null + terminationmessagepath: "" + terminationmessagepolicy: "" + imagepullpolicy: IfNotPresent + securitycontext: null + stdin: false + stdinonce: false + tty: false + ephemeralcontainers: [] + restartpolicy: "" + terminationgraceperiodseconds: null + activedeadlineseconds: null + dnspolicy: "" + nodeselector: {} + serviceaccountname: "" + deprecatedserviceaccount: "" + automountserviceaccounttoken: null + nodename: "" + hostnetwork: false + hostpid: false + hostipc: false + shareprocessnamespace: null + securitycontext: null + imagepullsecrets: [] + hostname: edgex-core-metadata + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-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 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/device-rest + 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.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59986 + hostport: 0 + containerport: 59986 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-device-rest + 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-rest + 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-device-rest + subdomain: "" + affinity: null + schedulername: "" + tolerations: [] + hostaliases: [] + priorityclassname: "" + priority: null + dnsconfig: null + readinessgates: [] + runtimeclassname: null + enableservicelinks: null + preemptionpolicy: null + overhead: {} + topologyspreadconstraints: [] + sethostnameasfqdn: null + os: null + hostusers: null + schedulinggates: [] + resourceclaims: [] + strategy: + type: "" + rollingupdate: null + minreadyseconds: 0 + revisionhistorylimit: null + paused: false + progressdeadlineseconds: null + - name: edgex-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: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/support-notifications + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-support-notifications + image: openyurt/support-notifications:2.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-59860 + hostport: 0 + containerport: 59860 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + 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-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-core-consul + matchexpressions: [] + template: + objectmeta: + name: "" + generatename: "" + namespace: "" + selflink: "" + uid: "" + resourceversion: "" + generation: 0 + creationtimestamp: "0001-01-01T00:00:00Z" + deletiontimestamp: null + deletiongraceperiodseconds: null + labels: + app: edgex-core-consul + annotations: {} + ownerreferences: [] + finalizers: [] + managedfields: [] + spec: + volumes: + - name: consul-config + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - 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 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume1 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-consul + image: openyurt/consul:1.9.5 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: STAGEGATE_REGISTRY_ACL_SENTINELFILEPATH + value: /consul/config/consul_acl_done + valuefrom: null + - name: EDGEX_GROUP + value: "2001" + valuefrom: null + - name: EDGEX_USER + value: "2002" + valuefrom: null + - name: STAGEGATE_REGISTRY_ACL_BOOTSTRAPTOKENPATH + value: /tmp/edgex/secrets/consul-acl-token/bootstrap_token.json + valuefrom: null + - name: ADD_REGISTRY_ACL_ROLES + value: "" + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: consul-config + readonly: false + mountpath: /consul/config + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-data + readonly: false + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-acl-token + readonly: false + mountpath: /tmp/edgex/secrets/consul-acl-token + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/edgex-consul + 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-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: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: 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 + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + initcontainers: [] + containers: + - name: edgex-core-data + image: openyurt/core-data:2.0.0 + command: [] + args: [] + workingdir: "" + ports: + - name: tcp-5563 + hostport: 0 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-59880 + hostport: 0 + containerport: 59880 + protocol: TCP + hostip: "" + envfrom: + - prefix: "" + configmapref: + localobjectreference: + name: common-variable-ireland + optional: null + secretref: null + env: + - name: SERVICE_HOST + value: edgex-core-data + valuefrom: null + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/core-data/secrets-token.json + valuefrom: null + resources: + limits: {} + requests: {} + claims: [] + volumemounts: + - name: edgex-init + readonly: false + mountpath: /edgex-init + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: anonymous-volume1 + readonly: false + mountpath: /tmp/edgex/secrets/core-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-data + 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: 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-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: "" + 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: 48100 + containerport: 20498 + protocol: TCP + hostip: "" + - name: tcp-48075 + hostport: 0 + containerport: 48075 protocol: TCP hostip: "" envfrom: @@ -20746,21 +20901,27 @@ versions: optional: null secretref: null env: - - name: MESSAGEBUS_SUBSCRIBEHOST_HOST - value: edgex-core-data + - name: KUIPER__BASIC__CONSOLELOG + value: "true" valuefrom: null - - name: BINDING_PUBLISHTOPIC - value: events + - name: KUIPER__BASIC__RESTPORT + value: "48075" valuefrom: null - - name: SERVICE_PORT - value: "48100" + - name: EDGEX__DEFAULT__PORT + value: "5566" valuefrom: null - - name: EDGEX_PROFILE - value: rules-engine + - name: EDGEX__DEFAULT__PROTOCOL + value: tcp valuefrom: null - - name: SERVICE_HOST + - name: EDGEX__DEFAULT__SERVER value: edgex-app-service-configurable-rules valuefrom: null + - name: EDGEX__DEFAULT__SERVICESERVER + value: http://edgex-core-data:48080 + valuefrom: null + - name: EDGEX__DEFAULT__TOPIC + value: events + valuefrom: null resources: limits: {} requests: {} @@ -20794,7 +20955,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-app-service-configurable-rules + hostname: edgex-kuiper subdomain: "" affinity: null schedulername: "" @@ -20821,20 +20982,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-support-scheduler + - name: kong-db service: ports: - - name: tcp-48085 + - name: tcp-5432 protocol: TCP appprotocol: null - port: 48085 + port: 5432 targetport: type: 0 - intval: 48085 + intval: 5432 strval: "" nodeport: 0 selector: - app: edgex-support-scheduler + app: kong-db clusterip: "" clusterips: [] type: "" @@ -20856,7 +21017,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-scheduler + app: kong-db matchexpressions: [] template: objectmeta: @@ -20871,19 +21032,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-scheduler + app: kong-db 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 @@ -20911,12 +21072,78 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: tmpfs-volume2 volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-support-scheduler - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: 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 @@ -20946,15 +21173,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-scheduler - image: openyurt/docker-support-scheduler-go:1.3.1 + - name: kong-db + image: openyurt/postgres:12.3-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-48085 + - name: tcp-5432 hostport: 0 - containerport: 48085 + containerport: 5432 protocol: TCP hostip: "" envfrom: @@ -20965,32 +21192,41 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-support-scheduler - valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json + - name: POSTGRES_PASSWORD + value: kong valuefrom: null - - name: INTERVALACTIONS_SCRUBAGED_HOST - value: edgex-core-data + - name: POSTGRES_USER + value: kong valuefrom: null - - name: INTERVALACTIONS_SCRUBPUSHED_HOST - value: edgex-core-data + - name: POSTGRES_DB + value: kong valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - 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-support-scheduler + 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: "" @@ -21022,7 +21258,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-scheduler + hostname: kong-db subdomain: "" affinity: null schedulername: "" @@ -21049,29 +21285,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-data + - name: edgex-core-command service: ports: - - name: tcp-5563 - protocol: TCP - appprotocol: null - port: 5563 - targetport: - type: 0 - intval: 5563 - strval: "" - nodeport: 0 - - name: tcp-48080 + - name: tcp-48082 protocol: TCP appprotocol: null - port: 48080 + port: 48082 targetport: type: 0 - intval: 48080 + intval: 48082 strval: "" nodeport: 0 selector: - app: edgex-core-data + app: edgex-core-command clusterip: "" clusterips: [] type: "" @@ -21093,7 +21320,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-data + app: edgex-core-command matchexpressions: [] template: objectmeta: @@ -21108,7 +21335,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-data + app: edgex-core-command annotations: {} ownerreferences: [] finalizers: [] @@ -21151,7 +21378,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-data + path: /tmp/edgex/secrets/edgex-core-command type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -21183,20 +21410,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-data - image: openyurt/docker-core-data-go:1.3.1 + - name: edgex-core-command + image: openyurt/docker-core-command-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-5563 - hostport: 0 - containerport: 5563 - protocol: TCP - hostip: "" - - name: tcp-48080 + - name: tcp-48082 hostport: 0 - containerport: 48080 + containerport: 48082 protocol: TCP hostip: "" envfrom: @@ -21208,10 +21430,10 @@ versions: secretref: null env: - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json + value: /tmp/edgex/secrets/edgex-core-command/secrets-token.json valuefrom: null - name: SERVICE_HOST - value: edgex-core-data + value: edgex-core-command valuefrom: null resources: limits: {} @@ -21226,7 +21448,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-data + mountpath: /tmp/edgex/secrets/edgex-core-command subpath: "" mountpropagation: null subpathexpr: "" @@ -21258,7 +21480,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-data + hostname: edgex-core-command subdomain: "" affinity: null schedulername: "" @@ -21285,12 +21507,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: @@ -21305,7 +21557,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-secrets-setup + app: edgex-vault annotations: {} ownerreferences: [] finalizers: [] @@ -21345,12 +21597,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 @@ -21378,7 +21630,7 @@ versions: storageos: null csi: null ephemeral: null - - name: secrets-setup-cache + - name: vault-file volumesource: hostpath: null emptydir: @@ -21411,12 +21663,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 @@ -21444,7 +21696,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-init + - name: vault-logs volumesource: hostpath: null emptydir: @@ -21479,12 +21731,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: @@ -21492,7 +21749,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: {} @@ -21500,31 +21766,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: "" @@ -21556,7 +21822,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-secrets-setup + hostname: edgex-vault subdomain: "" affinity: null schedulername: "" @@ -21583,20 +21849,47 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault + - name: kong service: ports: - - name: tcp-8200 + - name: tcp-8000 protocol: TCP appprotocol: null - port: 8200 + port: 8000 targetport: type: 0 - intval: 8200 + 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-vault + app: kong clusterip: "" clusterips: [] type: "" @@ -21618,7 +21911,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-vault + app: kong matchexpressions: [] template: objectmeta: @@ -21633,7 +21926,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault + app: kong annotations: {} ownerreferences: [] finalizers: [] @@ -21673,40 +21966,7 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume1 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-vault - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: vault-file + - name: tmpfs-volume2 volumesource: hostpath: null emptydir: @@ -21739,7 +21999,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-init + - name: consul-scripts volumesource: hostpath: null emptydir: @@ -21772,7 +22032,7 @@ versions: storageos: null csi: null ephemeral: null - - name: vault-logs + - name: kong volumesource: hostpath: null emptydir: @@ -21807,15 +22067,30 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault - image: openyurt/vault:1.5.3 + - name: kong + image: openyurt/kong:2.0.5 command: [] args: [] workingdir: "" ports: - - name: tcp-8200 + - name: tcp-8000 hostport: 0 - containerport: 8200 + 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: @@ -21826,14 +22101,29 @@ versions: optional: null secretref: null env: - - name: VAULT_ADDR - value: https://edgex-vault:8200 + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout valuefrom: null - - name: VAULT_CONFIG_DIR - value: /vault/config + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr valuefrom: null - - name: VAULT_UI - value: "true" + - name: KONG_ADMIN_LISTEN + value: 0.0.0.0:8001, 0.0.0.0:8444 ssl + valuefrom: null + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PG_HOST + value: kong-db + valuefrom: null + - name: KONG_PG_PASSWORD + value: kong + valuefrom: null + - name: KONG_PROXY_ACCESS_LOG + value: /dev/stdout + valuefrom: null + - name: KONG_PROXY_ERROR_LOG + value: /dev/stderr valuefrom: null resources: limits: {} @@ -21842,31 +22132,25 @@ versions: volumemounts: - name: tmpfs-volume1 readonly: false - mountpath: /vault/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: anonymous-volume1 - readonly: false - mountpath: /tmp/edgex/secrets/edgex-vault + mountpath: /run subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-file + - name: tmpfs-volume2 readonly: false - mountpath: /vault/file + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-init + - name: consul-scripts readonly: false - mountpath: /vault/init + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-logs + - name: kong readonly: false - mountpath: /vault/logs + mountpath: /usr/local/kong subpath: "" mountpropagation: null subpathexpr: "" @@ -21898,7 +22182,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault + hostname: kong subdomain: "" affinity: null schedulername: "" @@ -21925,20 +22209,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-metadata + - name: edgex-support-scheduler service: ports: - - name: tcp-48081 + - name: tcp-48085 protocol: TCP appprotocol: null - port: 48081 + port: 48085 targetport: type: 0 - intval: 48081 + intval: 48085 strval: "" nodeport: 0 selector: - app: edgex-core-metadata + app: edgex-support-scheduler clusterip: "" clusterips: [] type: "" @@ -21960,7 +22244,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-metadata + app: edgex-support-scheduler matchexpressions: [] template: objectmeta: @@ -21975,7 +22259,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-metadata + app: edgex-support-scheduler annotations: {} ownerreferences: [] finalizers: [] @@ -22018,7 +22302,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-metadata + path: /tmp/edgex/secrets/edgex-support-scheduler type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -22050,15 +22334,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-metadata - image: openyurt/docker-core-metadata-go:1.3.1 + - name: edgex-support-scheduler + image: openyurt/docker-support-scheduler-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48081 + - name: tcp-48085 hostport: 0 - containerport: 48081 + containerport: 48085 protocol: TCP hostip: "" envfrom: @@ -22069,14 +22353,17 @@ versions: optional: null secretref: null env: - - name: NOTIFICATIONS_SENDER - value: edgex-core-metadata + - name: INTERVALACTIONS_SCRUBPUSHED_HOST + value: edgex-core-data valuefrom: null - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json + value: /tmp/edgex/secrets/edgex-support-scheduler/secrets-token.json valuefrom: null - name: SERVICE_HOST - value: edgex-core-metadata + value: edgex-support-scheduler + valuefrom: null + - name: INTERVALACTIONS_SCRUBAGED_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -22091,7 +22378,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-metadata + mountpath: /tmp/edgex/secrets/edgex-support-scheduler subpath: "" mountpropagation: null subpathexpr: "" @@ -22123,7 +22410,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-metadata + hostname: edgex-support-scheduler subdomain: "" affinity: null schedulername: "" @@ -22150,42 +22437,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-consul - service: - ports: - - name: tcp-8500 - protocol: TCP - appprotocol: null - port: 8500 - targetport: - type: 0 - intval: 8500 - strval: "" - nodeport: 0 - selector: - app: edgex-core-consul - clusterip: "" - clusterips: [] - type: "" - externalips: [] - sessionaffinity: "" - loadbalancerip: "" - loadbalancersourceranges: [] - externalname: "" - externaltrafficpolicy: "" - healthchecknodeport: 0 - publishnotreadyaddresses: false - sessionaffinityconfig: null - ipfamilies: [] - ipfamilypolicy: null - allocateloadbalancernodeports: null - loadbalancerclass: null - internaltrafficpolicy: null + - name: "" deployment: replicas: null selector: matchlabels: - app: edgex-core-consul + app: "" matchexpressions: [] template: objectmeta: @@ -22200,47 +22457,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-consul + app: "" 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: @@ -22306,151 +22530,14 @@ 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 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-kong - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: anonymous-volume4 - volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-vault - type: DirectoryOrCreate - emptydir: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null initcontainers: [] containers: - - name: edgex-core-consul - image: openyurt/docker-edgex-consul:1.3.0 + - name: "" + image: openyurt/kong:2.0.5 command: [] args: [] workingdir: "" - ports: - - name: tcp-8500 - hostport: 0 - containerport: 8500 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -22459,29 +22546,23 @@ versions: optional: null secretref: null env: - - name: EDGEX_SECURE - value: "true" - valuefrom: null - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done + - name: KONG_PG_PASSWORD + value: kong valuefrom: null - - name: EDGEX_DB - value: redis + - name: KONG_DATABASE + value: postgres + valuefrom: null + - name: KONG_PG_HOST + value: kong-db valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-config - readonly: false - mountpath: /consul/config - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-data + - name: tmpfs-volume1 readonly: false - mountpath: /consul/data + mountpath: /tmp subpath: "" mountpropagation: null subpathexpr: "" @@ -22491,30 +22572,6 @@ versions: 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-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: "" volumedevices: [] livenessprobe: null readinessprobe: null @@ -22543,7 +22600,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-consul + hostname: "" subdomain: "" affinity: null schedulername: "" @@ -22570,47 +22627,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: kong + - name: edgex-support-notifications service: ports: - - name: tcp-8000 - protocol: TCP - appprotocol: null - port: 8000 - targetport: - type: 0 - intval: 8000 - strval: "" - nodeport: 0 - - name: tcp-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-48060 protocol: TCP appprotocol: null - port: 8444 + port: 48060 targetport: type: 0 - intval: 8444 + intval: 48060 strval: "" nodeport: 0 selector: - app: kong + app: edgex-support-notifications clusterip: "" clusterips: [] type: "" @@ -22632,7 +22662,7 @@ versions: replicas: null selector: matchlabels: - app: kong + app: edgex-support-notifications matchexpressions: [] template: objectmeta: @@ -22647,85 +22677,19 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong + app: edgex-support-notifications annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: tmpfs-volume2 - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - - name: consul-scripts + - name: 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 @@ -22753,12 +22717,12 @@ versions: storageos: null csi: null ephemeral: null - - name: kong + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/edgex-support-notifications + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -22788,30 +22752,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: kong - image: openyurt/kong:2.0.5 + - name: edgex-support-notifications + image: openyurt/docker-support-notifications-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-8000 - hostport: 0 - containerport: 8000 - protocol: TCP - hostip: "" - - name: tcp-8001 - hostport: 0 - containerport: 8001 - protocol: TCP - hostip: "" - - name: tcp-8443 - hostport: 0 - containerport: 8443 - protocol: TCP - hostip: "" - - name: tcp-8444 + - name: tcp-48060 hostport: 0 - containerport: 8444 + containerport: 48060 protocol: TCP hostip: "" envfrom: @@ -22822,56 +22771,26 @@ versions: optional: null secretref: null env: - - name: KONG_DATABASE - value: postgres - valuefrom: null - - name: KONG_PG_HOST - value: kong-db - valuefrom: null - - name: KONG_PG_PASSWORD - value: kong - valuefrom: null - - 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: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-support-notifications/secrets-token.json valuefrom: null - - name: KONG_ADMIN_LISTEN - value: 0.0.0.0:8001, 0.0.0.0:8444 ssl + - name: SERVICE_HOST + value: edgex-support-notifications valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-scripts + - name: anonymous-volume1 readonly: false - mountpath: /consul/scripts + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: kong + - name: anonymous-volume2 readonly: false - mountpath: /usr/local/kong + mountpath: /tmp/edgex/secrets/edgex-support-notifications subpath: "" mountpropagation: null subpathexpr: "" @@ -22903,7 +22822,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: kong + hostname: edgex-support-notifications subdomain: "" affinity: null schedulername: "" @@ -22930,12 +22849,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-proxy + - name: edgex-secrets-setup deployment: replicas: null selector: matchlabels: - app: edgex-proxy + app: edgex-secrets-setup matchexpressions: [] template: objectmeta: @@ -22950,14 +22869,80 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-proxy + app: edgex-secrets-setup annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: consul-scripts + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: secrets-setup-cache volumesource: hostpath: null emptydir: @@ -22993,7 +22978,7 @@ versions: - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets/ca + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23023,12 +23008,12 @@ versions: storageos: null csi: null ephemeral: null - - name: anonymous-volume2 + - name: vault-init volumesource: - hostpath: - path: /tmp/edgex/secrets/edgex-security-proxy-setup - type: DirectoryOrCreate - emptydir: null + hostpath: null + emptydir: + medium: "" + sizelimit: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -23058,8 +23043,8 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-proxy - image: openyurt/docker-security-proxy-setup-go:1.3.1 + - name: edgex-secrets-setup + image: openyurt/docker-security-secrets-setup-go:1.3.1 command: [] args: [] workingdir: "" @@ -23071,42 +23056,39 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: - - 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 + env: [] resources: limits: {} requests: {} claims: [] volumemounts: - - name: consul-scripts + - name: tmpfs-volume1 readonly: false - mountpath: /consul/scripts + mountpath: /tmp + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: tmpfs-volume2 + readonly: false + mountpath: /run + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: secrets-setup-cache + readonly: false + mountpath: /etc/edgex/pki subpath: "" mountpropagation: null subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets/ca + mountpath: /tmp/edgex/secrets subpath: "" mountpropagation: null subpathexpr: "" - - name: anonymous-volume2 + - name: vault-init readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup + mountpath: /vault/init subpath: "" mountpropagation: null subpathexpr: "" @@ -23138,7 +23120,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-proxy + hostname: edgex-secrets-setup subdomain: "" affinity: null schedulername: "" @@ -23165,12 +23147,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-security-bootstrap-database + - 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-security-bootstrap-database + app: edgex-core-consul matchexpressions: [] template: objectmeta: @@ -23185,14 +23197,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-security-bootstrap-database + app: edgex-core-consul annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: - - name: tmpfs-volume1 + - name: consul-config volumesource: hostpath: null emptydir: @@ -23225,7 +23237,40 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume2 + - name: consul-data + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-scripts volumesource: hostpath: null emptydir: @@ -23294,7 +23339,73 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-security-bootstrap-redis + path: /tmp/edgex/secrets/edgex-consul + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume3 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-kong + type: DirectoryOrCreate + emptydir: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: anonymous-volume4 + volumesource: + hostpath: + path: /tmp/edgex/secrets/edgex-vault type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23326,12 +23437,17 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-security-bootstrap-database - image: openyurt/docker-security-bootstrap-redis-go:1.3.1 + - name: edgex-core-consul + image: openyurt/docker-edgex-consul:1.3.0 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-8500 + hostport: 0 + containerport: 8500 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -23340,26 +23456,35 @@ versions: optional: null secretref: null env: - - name: SERVICE_HOST - value: edgex-security-bootstrap-database + - name: SECRETSTORE_SETUP_DONE_FLAG + value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done valuefrom: null - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json + - name: EDGEX_DB + value: redis + valuefrom: null + - name: EDGEX_SECURE + value: "true" valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 + - name: consul-config readonly: false - mountpath: /run + mountpath: /consul/config subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume2 + - name: consul-data readonly: false - mountpath: /vault + mountpath: /consul/data + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: consul-scripts + readonly: false + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" @@ -23371,7 +23496,19 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis + 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: "" @@ -23403,7 +23540,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-security-bootstrap-database + hostname: edgex-core-consul subdomain: "" affinity: null schedulername: "" @@ -23430,20 +23567,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-core-command + - name: edgex-core-metadata service: ports: - - name: tcp-48082 + - name: tcp-48081 protocol: TCP appprotocol: null - port: 48082 + port: 48081 targetport: type: 0 - intval: 48082 + intval: 48081 strval: "" nodeport: 0 selector: - app: edgex-core-command + app: edgex-core-metadata clusterip: "" clusterips: [] type: "" @@ -23465,7 +23602,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-core-command + app: edgex-core-metadata matchexpressions: [] template: objectmeta: @@ -23480,7 +23617,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-core-command + app: edgex-core-metadata annotations: {} ownerreferences: [] finalizers: [] @@ -23523,7 +23660,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-core-command + path: /tmp/edgex/secrets/edgex-core-metadata type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23555,15 +23692,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-core-command - image: openyurt/docker-core-command-go:1.3.1 + - name: edgex-core-metadata + image: openyurt/docker-core-metadata-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48082 + - name: tcp-48081 hostport: 0 - containerport: 48082 + containerport: 48081 protocol: TCP hostip: "" envfrom: @@ -23575,10 +23712,13 @@ 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 - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-core-command/secrets-token.json + value: /tmp/edgex/secrets/edgex-core-metadata/secrets-token.json valuefrom: null resources: limits: {} @@ -23593,7 +23733,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-core-command + mountpath: /tmp/edgex/secrets/edgex-core-metadata subpath: "" mountpropagation: null subpathexpr: "" @@ -23625,7 +23765,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-core-command + hostname: edgex-core-metadata subdomain: "" affinity: null schedulername: "" @@ -23652,29 +23792,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-kuiper + - name: edgex-app-service-configurable-rules service: ports: - - name: tcp-20498 - protocol: TCP - appprotocol: null - port: 20498 - targetport: - type: 0 - intval: 20498 - strval: "" - nodeport: 0 - - name: tcp-48075 + - name: tcp-48100 protocol: TCP appprotocol: null - port: 48075 + port: 48100 targetport: type: 0 - intval: 48075 + intval: 48100 strval: "" nodeport: 0 selector: - app: edgex-kuiper + app: edgex-app-service-configurable-rules clusterip: "" clusterips: [] type: "" @@ -23696,7 +23827,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-kuiper + app: edgex-app-service-configurable-rules matchexpressions: [] template: objectmeta: @@ -23711,7 +23842,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-kuiper + app: edgex-app-service-configurable-rules annotations: {} ownerreferences: [] finalizers: [] @@ -23720,20 +23851,15 @@ versions: volumes: [] initcontainers: [] containers: - - name: edgex-kuiper - image: openyurt/kuiper:1.1.1-alpine + - name: edgex-app-service-configurable-rules + image: openyurt/docker-app-service-configurable:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-20498 - hostport: 0 - containerport: 20498 - protocol: TCP - hostip: "" - - name: tcp-48075 + - name: tcp-48100 hostport: 0 - containerport: 48075 + containerport: 48100 protocol: TCP hostip: "" envfrom: @@ -23744,26 +23870,20 @@ versions: optional: null secretref: null env: - - name: KUIPER__BASIC__CONSOLELOG - value: "true" - valuefrom: null - - name: KUIPER__BASIC__RESTPORT - value: "48075" - valuefrom: null - - name: EDGEX__DEFAULT__PORT - value: "5566" + - name: EDGEX_PROFILE + value: rules-engine valuefrom: null - - name: EDGEX__DEFAULT__PROTOCOL - value: tcp + - name: BINDING_PUBLISHTOPIC + value: events valuefrom: null - - name: EDGEX__DEFAULT__SERVER + - name: SERVICE_HOST value: edgex-app-service-configurable-rules valuefrom: null - - name: EDGEX__DEFAULT__SERVICESERVER - value: http://edgex-core-data:48080 + - name: SERVICE_PORT + value: "48100" valuefrom: null - - name: EDGEX__DEFAULT__TOPIC - value: events + - name: MESSAGEBUS_SUBSCRIBEHOST_HOST + value: edgex-core-data valuefrom: null resources: limits: {} @@ -23798,7 +23918,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-kuiper + hostname: edgex-app-service-configurable-rules subdomain: "" affinity: null schedulername: "" @@ -23825,42 +23945,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-sys-mgmt-agent - service: - ports: - - name: tcp-48090 - protocol: TCP - appprotocol: null - port: 48090 - targetport: - type: 0 - intval: 48090 - 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 + - name: edgex-vault-worker deployment: replicas: null selector: matchlabels: - app: edgex-sys-mgmt-agent + app: edgex-vault-worker matchexpressions: [] template: objectmeta: @@ -23875,17 +23965,116 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-sys-mgmt-agent + app: edgex-vault-worker annotations: {} ownerreferences: [] finalizers: [] managedfields: [] spec: volumes: + - name: tmpfs-volume1 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: tmpfs-volume2 + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null + - name: consul-scripts + volumesource: + hostpath: null + emptydir: + medium: "" + sizelimit: null + gcepersistentdisk: null + awselasticblockstore: null + gitrepo: null + secret: null + nfs: null + iscsi: null + glusterfs: null + persistentvolumeclaim: null + rbd: null + flexvolume: null + cinder: null + cephfs: null + flocker: null + downwardapi: null + fc: null + azurefile: null + configmap: null + vspherevolume: null + quobyte: null + azuredisk: null + photonpersistentdisk: null + projected: null + portworxvolume: null + scaleio: null + storageos: null + csi: null + ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /var/run/docker.sock + path: /tmp/edgex/secrets type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -23915,19 +24104,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-sys-mgmt-agent - image: openyurt/docker-sys-mgmt-agent-go:1.3.1 + - name: edgex-vault-worker + image: openyurt/docker-security-secretstore-setup-go:1.3.1 command: [] args: [] workingdir: "" - ports: - - name: tcp-48090 - hostport: 0 - containerport: 48090 - protocol: TCP - hostip: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -23936,23 +24153,41 @@ versions: optional: null 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 + - 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: /var/run/docker.sock + mountpath: /tmp/edgex/secrets + subpath: "" + mountpropagation: null + subpathexpr: "" + - name: vault-config + readonly: false + mountpath: /vault/config subpath: "" mountpropagation: null subpathexpr: "" @@ -23984,7 +24219,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-sys-mgmt-agent + hostname: edgex-vault-worker subdomain: "" affinity: null schedulername: "" @@ -24011,161 +24246,29 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-rest + - name: edgex-core-data service: ports: - - name: tcp-49986 + - name: tcp-5563 protocol: TCP appprotocol: null - port: 49986 + port: 5563 targetport: type: 0 - intval: 49986 + intval: 5563 strval: "" nodeport: 0 - 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: "" - 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-48060 + - name: tcp-48080 protocol: TCP appprotocol: null - port: 48060 + port: 48080 targetport: type: 0 - intval: 48060 + intval: 48080 strval: "" nodeport: 0 selector: - app: edgex-support-notifications + app: edgex-core-data clusterip: "" clusterips: [] type: "" @@ -24187,7 +24290,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-support-notifications + app: edgex-core-data matchexpressions: [] template: objectmeta: @@ -24202,7 +24305,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-support-notifications + app: edgex-core-data annotations: {} ownerreferences: [] finalizers: [] @@ -24245,7 +24348,7 @@ versions: - name: anonymous-volume2 volumesource: hostpath: - path: /tmp/edgex/secrets/edgex-support-notifications + path: /tmp/edgex/secrets/edgex-core-data type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -24277,15 +24380,20 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-support-notifications - image: openyurt/docker-support-notifications-go:1.3.1 + - name: edgex-core-data + image: openyurt/docker-core-data-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-48060 + - name: tcp-5563 hostport: 0 - containerport: 48060 + containerport: 5563 + protocol: TCP + hostip: "" + - name: tcp-48080 + hostport: 0 + containerport: 48080 protocol: TCP hostip: "" envfrom: @@ -24296,11 +24404,11 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_TOKENFILE - value: /tmp/edgex/secrets/edgex-support-notifications/secrets-token.json - valuefrom: null - name: SERVICE_HOST - value: edgex-support-notifications + value: edgex-core-data + valuefrom: null + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-core-data/secrets-token.json valuefrom: null resources: limits: {} @@ -24315,7 +24423,7 @@ versions: subpathexpr: "" - name: anonymous-volume2 readonly: false - mountpath: /tmp/edgex/secrets/edgex-support-notifications + mountpath: /tmp/edgex/secrets/edgex-core-data subpath: "" mountpropagation: null subpathexpr: "" @@ -24347,7 +24455,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-support-notifications + hostname: edgex-core-data subdomain: "" affinity: null schedulername: "" @@ -24374,20 +24482,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-device-virtual + - name: edgex-redis service: ports: - - name: tcp-49990 + - name: tcp-6379 protocol: TCP appprotocol: null - port: 49990 + port: 6379 targetport: type: 0 - intval: 49990 + intval: 6379 strval: "" nodeport: 0 selector: - app: edgex-device-virtual + app: edgex-redis clusterip: "" clusterips: [] type: "" @@ -24409,7 +24517,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-device-virtual + app: edgex-redis matchexpressions: [] template: objectmeta: @@ -24424,24 +24532,57 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-device-virtual + 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-device-virtual - image: openyurt/docker-device-virtual-go:1.3.1 + - name: edgex-redis + image: openyurt/redis:6.0.9-alpine command: [] args: [] workingdir: "" ports: - - name: tcp-49990 + - name: tcp-6379 hostport: 0 - containerport: 49990 + containerport: 6379 protocol: TCP hostip: "" envfrom: @@ -24451,15 +24592,18 @@ versions: name: common-variable-hanoi optional: null secretref: null - env: - - name: SERVICE_HOST - value: edgex-device-virtual - 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 @@ -24488,7 +24632,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-device-virtual + hostname: edgex-redis subdomain: "" affinity: null schedulername: "" @@ -24515,20 +24659,20 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-redis + - name: edgex-sys-mgmt-agent service: ports: - - name: tcp-6379 + - name: tcp-48090 protocol: TCP appprotocol: null - port: 6379 + port: 48090 targetport: type: 0 - intval: 6379 + intval: 48090 strval: "" nodeport: 0 selector: - app: edgex-redis + app: edgex-sys-mgmt-agent clusterip: "" clusterips: [] type: "" @@ -24550,7 +24694,7 @@ versions: replicas: null selector: matchlabels: - app: edgex-redis + app: edgex-sys-mgmt-agent matchexpressions: [] template: objectmeta: @@ -24565,19 +24709,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 @@ -24607,15 +24751,15 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-redis - image: openyurt/redis:6.0.9-alpine + - name: edgex-sys-mgmt-agent + image: openyurt/docker-sys-mgmt-agent-go:1.3.1 command: [] args: [] workingdir: "" ports: - - name: tcp-6379 + - name: tcp-48090 hostport: 0 - containerport: 6379 + containerport: 48090 protocol: TCP hostip: "" envfrom: @@ -24625,15 +24769,24 @@ versions: name: common-variable-hanoi 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: db-data + - name: anonymous-volume1 readonly: false - mountpath: /data + mountpath: /var/run/docker.sock subpath: "" mountpropagation: null subpathexpr: "" @@ -24665,7 +24818,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-redis + hostname: edgex-sys-mgmt-agent subdomain: "" affinity: null schedulername: "" @@ -24692,42 +24845,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: kong-db - service: - ports: - - name: tcp-5432 - protocol: TCP - appprotocol: null - port: 5432 - targetport: - type: 0 - intval: 5432 - strval: "" - nodeport: 0 - selector: - app: 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 + - name: edgex-proxy deployment: replicas: null selector: matchlabels: - app: kong-db + app: edgex-proxy matchexpressions: [] template: objectmeta: @@ -24742,47 +24865,14 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: kong-db + app: edgex-proxy 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-scripts volumesource: hostpath: null emptydir: @@ -24815,12 +24905,12 @@ versions: storageos: null csi: null ephemeral: null - - name: tmpfs-volume3 + - 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 @@ -24848,12 +24938,12 @@ versions: storageos: null csi: null ephemeral: null - - name: postgres-data + - name: anonymous-volume2 volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null + hostpath: + path: /tmp/edgex/secrets/edgex-security-proxy-setup + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -24883,17 +24973,12 @@ versions: ephemeral: null initcontainers: [] containers: - - name: kong-db - image: openyurt/postgres:12.3-alpine + - name: edgex-proxy + image: openyurt/docker-security-proxy-setup-go:1.3.1 command: [] - args: [] - workingdir: "" - ports: - - name: tcp-5432 - hostport: 0 - containerport: 5432 - protocol: TCP - hostip: "" + args: [] + workingdir: "" + ports: [] envfrom: - prefix: "" configmapref: @@ -24902,41 +24987,41 @@ versions: optional: null secretref: null env: - - name: POSTGRES_USER - value: kong + - name: SECRETSERVICE_CACERTPATH + value: /tmp/edgex/secrets/ca/ca.pem valuefrom: null - - name: POSTGRES_DB - value: kong + - name: SECRETSERVICE_TOKENPATH + value: /tmp/edgex/secrets/edgex-security-proxy-setup/secrets-token.json valuefrom: null - - name: POSTGRES_PASSWORD + - name: KONGURL_SERVER value: kong valuefrom: null + - name: SECRETSERVICE_SERVER + value: edgex-vault + valuefrom: null + - name: SECRETSERVICE_SNIS + value: edgex-kong + valuefrom: null resources: limits: {} requests: {} claims: [] volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /var/run - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: tmpfs-volume2 + - name: consul-scripts readonly: false - mountpath: /tmp + mountpath: /consul/scripts subpath: "" mountpropagation: null subpathexpr: "" - - name: tmpfs-volume3 + - name: anonymous-volume1 readonly: false - mountpath: /run + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: postgres-data + - name: anonymous-volume2 readonly: false - mountpath: /var/lib/postgresql/data + mountpath: /tmp/edgex/secrets/edgex-security-proxy-setup subpath: "" mountpropagation: null subpathexpr: "" @@ -24968,7 +25053,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: kong-db + hostname: edgex-proxy subdomain: "" affinity: null schedulername: "" @@ -24995,12 +25080,42 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: "" + - 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: "" + app: edgex-device-virtual matchexpressions: [] template: objectmeta: @@ -25015,87 +25130,26 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: "" + 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: 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 + volumes: [] initcontainers: [] containers: - - name: "" - image: openyurt/kong:2.0.5 + - name: edgex-device-virtual + image: openyurt/docker-device-virtual-go:1.3.1 command: [] args: [] workingdir: "" - ports: [] + ports: + - name: tcp-49990 + hostport: 0 + containerport: 49990 + protocol: TCP + hostip: "" envfrom: - prefix: "" configmapref: @@ -25104,32 +25158,14 @@ 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 + - name: SERVICE_HOST + value: edgex-device-virtual valuefrom: null resources: limits: {} requests: {} claims: [] - volumemounts: - - name: tmpfs-volume1 - readonly: false - mountpath: /tmp - subpath: "" - mountpropagation: null - subpathexpr: "" - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" + volumemounts: [] volumedevices: [] livenessprobe: null readinessprobe: null @@ -25158,7 +25194,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: "" + hostname: edgex-device-virtual subdomain: "" affinity: null schedulername: "" @@ -25185,12 +25221,12 @@ versions: revisionhistorylimit: null paused: false progressdeadlineseconds: null - - name: edgex-vault-worker + - name: edgex-security-bootstrap-database deployment: replicas: null selector: matchlabels: - app: edgex-vault-worker + app: edgex-security-bootstrap-database matchexpressions: [] template: objectmeta: @@ -25205,7 +25241,7 @@ versions: deletiontimestamp: null deletiongraceperiodseconds: null labels: - app: edgex-vault-worker + app: edgex-security-bootstrap-database annotations: {} ownerreferences: [] finalizers: [] @@ -25278,43 +25314,10 @@ versions: storageos: null csi: null ephemeral: null - - name: consul-scripts - volumesource: - hostpath: null - emptydir: - medium: "" - sizelimit: null - gcepersistentdisk: null - awselasticblockstore: null - gitrepo: null - secret: null - nfs: null - iscsi: null - glusterfs: null - persistentvolumeclaim: null - rbd: null - flexvolume: null - cinder: null - cephfs: null - flocker: null - downwardapi: null - fc: null - azurefile: null - configmap: null - vspherevolume: null - quobyte: null - azuredisk: null - photonpersistentdisk: null - projected: null - portworxvolume: null - scaleio: null - storageos: null - csi: null - ephemeral: null - name: anonymous-volume1 volumesource: hostpath: - path: /tmp/edgex/secrets + path: /tmp/edgex/secrets/ca type: DirectoryOrCreate emptydir: null gcepersistentdisk: null @@ -25344,12 +25347,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-security-bootstrap-redis + type: DirectoryOrCreate + emptydir: null gcepersistentdisk: null awselasticblockstore: null gitrepo: null @@ -25379,8 +25382,8 @@ versions: ephemeral: null initcontainers: [] containers: - - name: edgex-vault-worker - image: openyurt/docker-security-secretstore-setup-go:1.3.1 + - name: edgex-security-bootstrap-database + image: openyurt/docker-security-bootstrap-redis-go:1.3.1 command: [] args: [] workingdir: "" @@ -25393,8 +25396,11 @@ versions: optional: null secretref: null env: - - name: SECRETSTORE_SETUP_DONE_FLAG - value: /tmp/edgex/secrets/edgex-consul/.secretstore-setup-done + - name: SERVICE_HOST + value: edgex-security-bootstrap-database + valuefrom: null + - name: SECRETSTORE_TOKENFILE + value: /tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json valuefrom: null resources: limits: {} @@ -25413,21 +25419,15 @@ versions: subpath: "" mountpropagation: null subpathexpr: "" - - name: consul-scripts - readonly: false - mountpath: /consul/scripts - subpath: "" - mountpropagation: null - subpathexpr: "" - name: anonymous-volume1 readonly: false - mountpath: /tmp/edgex/secrets + mountpath: /tmp/edgex/secrets/ca subpath: "" mountpropagation: null subpathexpr: "" - - name: vault-config + - name: anonymous-volume2 readonly: false - mountpath: /vault/config + mountpath: /tmp/edgex/secrets/edgex-security-bootstrap-redis subpath: "" mountpropagation: null subpathexpr: "" @@ -25459,7 +25459,7 @@ versions: shareprocessnamespace: null securitycontext: null imagepullsecrets: [] - hostname: edgex-vault-worker + hostname: edgex-security-bootstrap-database subdomain: "" affinity: null schedulername: "" diff --git a/api/v1alpha1/edgex_conversion.go b/api/v1alpha1/edgex_conversion.go index 585c3d2..8d7d09f 100644 --- a/api/v1alpha1/edgex_conversion.go +++ b/api/v1alpha1/edgex_conversion.go @@ -51,7 +51,7 @@ func (src *EdgeX) ConvertTo(dstRaw conversion.Hub) error { } // Transform additionalservice - if len(src.Spec.AdditionalDeployment) > 0 { + if len(src.Spec.AdditionalService) > 0 { additionalService, err := json.Marshal(src.Spec.AdditionalService) if err != nil { return err @@ -105,6 +105,5 @@ func (dst *EdgeX) ConvertFrom(srcRaw conversion.Hub) error { dst.Spec.AdditionalService = additionalServices } - //TODO: AdditionalService and AdditionalDeployment return nil } diff --git a/controllers/edgex_controller.go b/controllers/edgex_controller.go index e09bbc2..7be432b 100644 --- a/controllers/edgex_controller.go +++ b/controllers/edgex_controller.go @@ -479,14 +479,21 @@ func (r *EdgeXReconciler) handleYurtAppSet(ctx context.Context, edgex *devicev1a 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 + if _, ok := annotation["AdditionalDeployments"]; ok { + err := json.Unmarshal([]byte(annotation["AdditionalDeployments"]), &additionalDeployments) + if err != nil { + return nil, err + } } var additionalServices []devicev1alpha1.ServiceTemplateSpec = make([]devicev1alpha1.ServiceTemplateSpec, 0) - err = json.Unmarshal([]byte(annotation["AdditionalServices"]), &additionalServices) - if err != nil { - return nil, err + if _, ok := annotation["AdditionalServices"]; ok { + err := json.Unmarshal([]byte(annotation["AdditionalServices"]), &additionalServices) + if err != nil { + return nil, err + } + } + if len(additionalDeployments) == 0 && len(additionalServices) == 0 { + return components, nil } var services map[string]*corev1.ServiceSpec = make(map[string]*corev1.ServiceSpec) var usedServices map[string]struct{} = make(map[string]struct{}) diff --git a/test/e2e/data/beijing.yaml b/test/e2e/data/beijing.yaml index 839d7ee..8c0035a 100644 --- a/test/e2e/data/beijing.yaml +++ b/test/e2e/data/beijing.yaml @@ -45,7 +45,7 @@ spec: containerPort: 59900 envFrom: - configMapRef: - name: common-variables + name: common-variable-jakarta env: - name: Service_Host value: "edgex-device-virtual" diff --git a/test/e2e/data/hangzhou.yaml b/test/e2e/data/hangzhou.yaml index 8a767f2..eeccdbd 100644 --- a/test/e2e/data/hangzhou.yaml +++ b/test/e2e/data/hangzhou.yaml @@ -45,7 +45,7 @@ spec: containerPort: 49990 envFrom: - configMapRef: - name: common-variables + name: common-variable-hanoi env: - name: Service_Host value: "edgex-device-virtual" diff --git a/tools/collector/config/multiarch_imagelist.txt b/tools/collector/config/multiarch_imagelist.txt index 8471f99..ca29934 100644 --- a/tools/collector/config/multiarch_imagelist.txt +++ b/tools/collector/config/multiarch_imagelist.txt @@ -1,30 +1,30 @@ +lfedge/ekuiper:1.7.1-alpine +postgres:13.8-alpine redis:7.0.5-alpine +kong:2.8.1 consul:1.13.2 -postgres:13.8-alpine -lfedge/ekuiper:1.7.1-alpine vault:1.11.4 -kong:2.8.1 -kong:2.5.1 -vault:1.8.4 -redis:6.2.6-alpine -lfedge/ekuiper:1.4.4-alpine postgres:13.4-alpine +lfedge/ekuiper:1.4.4-alpine consul:1.10.3 -vault:1.8.9 -kong:2.6.1 +vault:1.8.4 +kong:2.5.1 redis:6.2.6-alpine +vault:1.8.9 +postgres:13.5-alpine consul:1.10.10 +redis:6.2.6-alpine +kong:2.6.1 lfedge/ekuiper:1.4.4-alpine -postgres:13.5-alpine -kong:2.4.1-alpine vault:1.7.2 +redis:6.2.4-alpine lfedge/ekuiper:1.3.0-alpine +kong:2.4.1-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 +vault:1.5.3 +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 b442d91..5cb963d 100644 --- a/tools/collector/config/singlearch_imagelist.txt +++ b/tools/collector/config/singlearch_imagelist.txt @@ -1,65 +1,65 @@ -edgexfoundry/sys-mgmt-agent:2.3.0 edgexfoundry/sys-mgmt-agent-arm64:2.3.0 +edgexfoundry/core-command:2.3.0 edgexfoundry/core-command-arm64:2.3.0 edgexfoundry/device-virtual:2.3.0 edgexfoundry/device-virtual-arm64:2.3.0 -edgexfoundry/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/core-data:2.3.0 edgexfoundry/core-data-arm64:2.3.0 +edgexfoundry/sys-mgmt-agent:2.3.0 edgexfoundry/sys-mgmt-agent-arm64:2.3.0 +edgexfoundry/edgex-ui:2.3.0 edgexfoundry/edgex-ui-arm64:2.3.0 edgexfoundry/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/support-scheduler:2.3.0 edgexfoundry/support-scheduler-arm64:2.3.0 edgexfoundry/security-proxy-setup:2.3.0 edgexfoundry/security-proxy-setup-arm64:2.3.0 -edgexfoundry/device-rest:2.1.1 edgexfoundry/device-rest-arm64:2.1.1 +edgexfoundry/security-bootstrapper:2.3.0 edgexfoundry/security-bootstrapper-arm64:2.3.0 +edgexfoundry/security-secretstore-setup:2.1.1 edgexfoundry/security-secretstore-setup-arm64:2.1.1 +edgexfoundry/support-scheduler:2.1.1 edgexfoundry/support-scheduler-arm64:2.1.1 edgexfoundry/core-command:2.1.1 edgexfoundry/core-command-arm64:2.1.1 +edgexfoundry/security-bootstrapper:2.1.1 edgexfoundry/security-bootstrapper-arm64:2.1.1 +edgexfoundry/support-notifications:2.1.1 edgexfoundry/support-notifications-arm64:2.1.1 edgexfoundry/core-metadata:2.1.1 edgexfoundry/core-metadata-arm64:2.1.1 +edgexfoundry/security-proxy-setup:2.1.1 edgexfoundry/security-proxy-setup-arm64:2.1.1 edgexfoundry/sys-mgmt-agent:2.1.1 edgexfoundry/sys-mgmt-agent-arm64:2.1.1 -edgexfoundry/support-notifications:2.1.1 edgexfoundry/support-notifications-arm64:2.1.1 +edgexfoundry/device-rest:2.1.1 edgexfoundry/device-rest-arm64:2.1.1 edgexfoundry/core-data:2.1.1 edgexfoundry/core-data-arm64:2.1.1 edgexfoundry/edgex-ui:2.1.0 edgexfoundry/edgex-ui-arm64:2.1.0 -edgexfoundry/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/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-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-secretstore-setup:2.2.0 edgexfoundry/security-secretstore-setup-arm64:2.2.0 +edgexfoundry/app-service-configurable:2.1.1 edgexfoundry/app-service-configurable-arm64:2.1.1 edgexfoundry/support-scheduler:2.2.0 edgexfoundry/support-scheduler-arm64:2.2.0 -edgexfoundry/core-metadata:2.2.0 edgexfoundry/core-metadata-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/core-command:2.2.0 edgexfoundry/core-command-arm64:2.2.0 +edgexfoundry/edgex-ui:2.2.0 edgexfoundry/edgex-ui-arm64:2.2.0 +edgexfoundry/security-secretstore-setup:2.2.0 edgexfoundry/security-secretstore-setup-arm64:2.2.0 edgexfoundry/device-virtual:2.2.0 edgexfoundry/device-virtual-arm64:2.2.0 +edgexfoundry/security-proxy-setup:2.2.0 edgexfoundry/security-proxy-setup-arm64:2.2.0 +edgexfoundry/core-metadata:2.2.0 edgexfoundry/core-metadata-arm64:2.2.0 +edgexfoundry/security-bootstrapper:2.2.0 edgexfoundry/security-bootstrapper-arm64:2.2.0 +edgexfoundry/device-rest:2.2.0 edgexfoundry/device-rest-arm64:2.2.0 +edgexfoundry/support-notifications:2.2.0 edgexfoundry/support-notifications-arm64:2.2.0 edgexfoundry/sys-mgmt-agent:2.2.0 edgexfoundry/sys-mgmt-agent-arm64:2.2.0 -edgexfoundry/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/device-virtual:2.0.0 edgexfoundry/device-virtual-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/app-service-configurable:2.2.0 edgexfoundry/app-service-configurable-arm64:2.2.0 edgexfoundry/support-scheduler:2.0.0 edgexfoundry/support-scheduler-arm64:2.0.0 -edgexfoundry/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/sys-mgmt-agent:2.0.0 edgexfoundry/sys-mgmt-agent-arm64:2.0.0 +edgexfoundry/security-bootstrapper:2.0.0 edgexfoundry/security-bootstrapper-arm64:2.0.0 +edgexfoundry/app-service-configurable:2.0.1 edgexfoundry/app-service-configurable-arm64:2.0.1 +edgexfoundry/core-command:2.0.0 edgexfoundry/core-command-arm64:2.0.0 edgexfoundry/security-secretstore-setup:2.0.0 edgexfoundry/security-secretstore-setup-arm64:2.0.0 +edgexfoundry/device-virtual:2.0.0 edgexfoundry/device-virtual-arm64:2.0.0 +edgexfoundry/core-metadata:2.0.0 edgexfoundry/core-metadata-arm64:2.0.0 +edgexfoundry/device-rest:2.0.0 edgexfoundry/device-rest-arm64:2.0.0 edgexfoundry/support-notifications:2.0.0 edgexfoundry/support-notifications-arm64:2.0.0 -edgexfoundry/docker-app-service-configurable:1.3.1 edgexfoundry/docker-app-service-configurable-arm64:1.3.1 +edgexfoundry/core-data:2.0.0 edgexfoundry/core-data-arm64:2.0.0 +edgexfoundry/docker-device-rest-go:1.2.1 edgexfoundry/docker-device-rest-go-arm64:1.2.1 +edgexfoundry/docker-core-command-go:1.3.1 edgexfoundry/docker-core-command-go-arm64:1.3.1 edgexfoundry/docker-support-scheduler-go:1.3.1 edgexfoundry/docker-support-scheduler-go-arm64:1.3.1 -edgexfoundry/docker-core-data-go:1.3.1 edgexfoundry/docker-core-data-go-arm64:1.3.1 +edgexfoundry/docker-support-notifications-go:1.3.1 edgexfoundry/docker-support-notifications-go-arm64:1.3.1 edgexfoundry/docker-security-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-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-core-metadata-go:1.3.1 edgexfoundry/docker-core-metadata-go-arm64:1.3.1 +edgexfoundry/docker-app-service-configurable:1.3.1 edgexfoundry/docker-app-service-configurable-arm64:1.3.1 +edgexfoundry/docker-security-secretstore-setup-go:1.3.1 edgexfoundry/docker-security-secretstore-setup-go-arm64:1.3.1 +edgexfoundry/docker-core-data-go:1.3.1 edgexfoundry/docker-core-data-go-arm64:1.3.1 edgexfoundry/docker-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-security-proxy-setup-go:1.3.1 edgexfoundry/docker-security-proxy-setup-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 +edgexfoundry/docker-security-bootstrap-redis-go:1.3.1 edgexfoundry/docker-security-bootstrap-redis-go-arm64:1.3.1