From b27c6ac3a6b15c3ec494b03577710698159266e7 Mon Sep 17 00:00:00 2001 From: melody Date: Fri, 13 Dec 2024 09:23:41 +0000 Subject: [PATCH] feat: updated openbao to 2.1 Signed-off-by: melody --- compose-builder/.env | 3 +- docker-compose-arm64.yml | 48 ++++++++--------- docker-compose-no-secty-arm64.yml | 30 +++++------ ...compose-no-secty-with-app-sample-arm64.yml | 30 +++++------ docker-compose-no-secty-with-app-sample.yml | 30 +++++------ docker-compose-no-secty.yml | 30 +++++------ docker-compose-with-app-sample-arm64.yml | 48 ++++++++--------- docker-compose-with-app-sample.yml | 48 ++++++++--------- docker-compose-zero-trust-arm64.yml | 54 +++++++++---------- docker-compose-zero-trust.yml | 54 +++++++++---------- docker-compose.yml | 48 ++++++++--------- taf/docker-compose-taf-arm64.yml | 48 ++++++++--------- taf/docker-compose-taf-no-secty-arm64.yml | 30 +++++------ taf/docker-compose-taf-no-secty.yml | 30 +++++------ taf/docker-compose-taf-perf-arm64.yml | 48 ++++++++--------- ...docker-compose-taf-perf-no-secty-arm64.yml | 30 +++++------ taf/docker-compose-taf-perf-no-secty.yml | 30 +++++------ taf/docker-compose-taf-perf.yml | 48 ++++++++--------- taf/docker-compose-taf.yml | 48 ++++++++--------- 19 files changed, 367 insertions(+), 368 deletions(-) diff --git a/compose-builder/.env b/compose-builder/.env index 90dd5936..82e3898c 100644 --- a/compose-builder/.env +++ b/compose-builder/.env @@ -43,8 +43,7 @@ DEVICE_ONVIFCAM_VERSION=latest DEVICE_USBCAM_VERSION=latest DEVICE_S7_VERSION=latest -# Lock on OpenBao 2.0 (last MPL-2.0 version) -BAO_VERSION=2.0 +BAO_VERSION=2.1 POSTGRES_VERSION=16.3-alpine3.20 KUIPER_VERSION=v1.14.0-alpha.2 MOSQUITTO_VERSION=2.0 diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml index a46de7d3..a95fc624 100644 --- a/docker-compose-arm64.yml +++ b/docker-compose-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -889,7 +889,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -912,8 +912,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1189,12 +1189,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1217,7 +1217,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1231,15 +1231,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1259,18 +1259,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1293,7 +1293,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1307,15 +1307,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1335,8 +1335,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml index d7325643..069d55b0 100644 --- a/docker-compose-no-secty-arm64.yml +++ b/docker-compose-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -462,11 +462,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -479,16 +479,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -502,11 +502,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -519,16 +519,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml index ae5f272b..2ce4b803 100644 --- a/docker-compose-no-secty-with-app-sample-arm64.yml +++ b/docker-compose-no-secty-with-app-sample-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -506,11 +506,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -523,16 +523,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -546,11 +546,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -563,16 +563,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml index af35d1c1..029276b7 100644 --- a/docker-compose-no-secty-with-app-sample.yml +++ b/docker-compose-no-secty-with-app-sample.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -506,11 +506,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -523,16 +523,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -546,11 +546,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -563,16 +563,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml index 3654c672..8e512fde 100644 --- a/docker-compose-no-secty.yml +++ b/docker-compose-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -462,11 +462,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -479,16 +479,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -502,11 +502,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -519,16 +519,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml index 09a9ff0f..3f9a8d1c 100644 --- a/docker-compose-with-app-sample-arm64.yml +++ b/docker-compose-with-app-sample-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -966,7 +966,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -989,8 +989,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1266,12 +1266,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1294,7 +1294,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1308,15 +1308,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1336,18 +1336,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1370,7 +1370,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1384,15 +1384,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1412,8 +1412,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml index 990c7e85..91efd141 100644 --- a/docker-compose-with-app-sample.yml +++ b/docker-compose-with-app-sample.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -966,7 +966,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -989,8 +989,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1266,12 +1266,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1294,7 +1294,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1308,15 +1308,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1336,18 +1336,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1370,7 +1370,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1384,15 +1384,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1412,8 +1412,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/docker-compose-zero-trust-arm64.yml b/docker-compose-zero-trust-arm64.yml index b8dcbb7e..bc09cb59 100644 --- a/docker-compose-zero-trust-arm64.yml +++ b/docker-compose-zero-trust-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -809,7 +809,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -832,8 +832,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -972,12 +972,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1000,7 +1000,8 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: support-notifications.edgex.ziti + SERVICE_PORT: "80" STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1014,16 +1015,10 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59863 - published: "59863" - protocol: tcp read_only: true restart: always security_opt: @@ -1042,18 +1037,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1076,8 +1071,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: support-notifications.edgex.ziti - SERVICE_PORT: "80" + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1091,10 +1085,16 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null + ports: + - mode: ingress + host_ip: 127.0.0.1 + target: 59863 + published: "59863" + protocol: tcp read_only: true restart: always security_opt: @@ -1113,8 +1113,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/docker-compose-zero-trust.yml b/docker-compose-zero-trust.yml index 7a704d11..8c29c7e7 100644 --- a/docker-compose-zero-trust.yml +++ b/docker-compose-zero-trust.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -809,7 +809,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -832,8 +832,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -972,12 +972,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1000,7 +1000,8 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: support-notifications.edgex.ziti + SERVICE_PORT: "80" STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1014,16 +1015,10 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59863 - published: "59863" - protocol: tcp read_only: true restart: always security_opt: @@ -1042,18 +1037,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1076,8 +1071,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: support-notifications.edgex.ziti - SERVICE_PORT: "80" + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1091,10 +1085,16 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null + ports: + - mode: ingress + host_ip: 127.0.0.1 + target: 59863 + published: "59863" + protocol: tcp read_only: true restart: always security_opt: @@ -1113,8 +1113,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/docker-compose.yml b/docker-compose.yml index e858cb5f..85393cef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-rules-engine: @@ -889,7 +889,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -912,8 +912,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1189,12 +1189,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1217,7 +1217,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1231,15 +1231,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1259,18 +1259,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1293,7 +1293,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1307,15 +1307,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1335,8 +1335,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml index aa3f6ccc..bb4e5512 100644 --- a/taf/docker-compose-taf-arm64.yml +++ b/taf/docker-compose-taf-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-external-mqtt-trigger: @@ -1616,7 +1616,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -1639,8 +1639,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -2187,12 +2187,12 @@ services: bind: selinux: z create_host_path: true - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -2215,7 +2215,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2229,15 +2229,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -2257,18 +2257,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -2291,7 +2291,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2305,15 +2305,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -2333,8 +2333,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/taf/docker-compose-taf-no-secty-arm64.yml b/taf/docker-compose-taf-no-secty-arm64.yml index e64ba2b7..f2d49770 100644 --- a/taf/docker-compose-taf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-external-mqtt-trigger: @@ -877,11 +877,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -894,16 +894,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -917,11 +917,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -934,16 +934,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml index 96b81ddc..e2f31935 100644 --- a/taf/docker-compose-taf-no-secty.yml +++ b/taf/docker-compose-taf-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-external-mqtt-trigger: @@ -877,11 +877,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -894,16 +894,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -917,11 +917,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -934,16 +934,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml index dbc1b4cb..816cb830 100644 --- a/taf/docker-compose-taf-perf-arm64.yml +++ b/taf/docker-compose-taf-perf-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-mqtt-export: @@ -987,7 +987,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -1010,8 +1010,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1558,12 +1558,12 @@ services: bind: selinux: z create_host_path: true - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1586,7 +1586,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1600,15 +1600,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1628,18 +1628,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1662,7 +1662,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1676,15 +1676,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1704,8 +1704,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/taf/docker-compose-taf-perf-no-secty-arm64.yml b/taf/docker-compose-taf-perf-no-secty-arm64.yml index 6e2e934e..d3b703b3 100644 --- a/taf/docker-compose-taf-perf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-perf-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-mqtt-export: @@ -527,11 +527,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -544,16 +544,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -567,11 +567,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -584,16 +584,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/taf/docker-compose-taf-perf-no-secty.yml b/taf/docker-compose-taf-perf-no-secty.yml index 95a62eb8..4a72836c 100644 --- a/taf/docker-compose-taf-perf-no-secty.yml +++ b/taf/docker-compose-taf-perf-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-mqtt-export: @@ -527,11 +527,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-scheduler: + support-notifications: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -544,16 +544,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + SERVICE_HOST: edgex-support-notifications + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -567,11 +567,11 @@ services: read_only: true bind: create_host_path: true - support-notifications: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -584,16 +584,16 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml index 51097433..fc394d20 100644 --- a/taf/docker-compose-taf-perf.yml +++ b/taf/docker-compose-taf-perf.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-mqtt-export: @@ -987,7 +987,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -1010,8 +1010,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -1558,12 +1558,12 @@ services: bind: selinux: z create_host_path: true - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -1586,7 +1586,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1600,15 +1600,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -1628,18 +1628,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1662,7 +1662,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1676,15 +1676,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -1704,8 +1704,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z diff --git a/taf/docker-compose-taf.yml b/taf/docker-compose-taf.yml index bcaca29a..82607fdc 100644 --- a/taf/docker-compose-taf.yml +++ b/taf/docker-compose-taf.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.29.2 +# Generated with: Docker Compose version v2.29.7 name: edgex services: app-external-mqtt-trigger: @@ -1616,7 +1616,7 @@ services: deploy: resources: limits: - memory: "4190235525120" + memory: "2108837330944" entrypoint: - /edgex-init/secretstore_wait_install.sh environment: @@ -1639,8 +1639,8 @@ services: STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s hostname: edgex-secret-store - image: openbao/openbao:2.0 - memswap_limit: "4190235525120" + image: openbao/openbao:2.1 + memswap_limit: "2108837330944" networks: edgex-network: null ports: @@ -2187,12 +2187,12 @@ services: bind: selinux: z create_host_path: true - support-scheduler: + support-notifications: command: - - /support-scheduler + - /support-notifications - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-scheduler + container_name: edgex-support-notifications depends_on: core-common-config-bootstrapper: condition: service_started @@ -2215,7 +2215,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-scheduler + SERVICE_HOST: edgex-support-notifications STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2229,15 +2229,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-scheduler - image: nexus3.edgexfoundry.org:10004/support-scheduler:latest + hostname: edgex-support-notifications + image: nexus3.edgexfoundry.org:10004/support-notifications:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59863 - published: "59863" + target: 59860 + published: "59860" protocol: tcp read_only: true restart: always @@ -2257,18 +2257,18 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-scheduler - target: /tmp/edgex/secrets/support-scheduler + source: /tmp/edgex/secrets/support-notifications + target: /tmp/edgex/secrets/support-notifications read_only: true bind: selinux: z create_host_path: true - support-notifications: + support-scheduler: command: - - /support-notifications + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-notifications + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -2291,7 +2291,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-notifications + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2305,15 +2305,15 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-notifications - image: nexus3.edgexfoundry.org:10004/support-notifications:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: - mode: ingress host_ip: 127.0.0.1 - target: 59860 - published: "59860" + target: 59863 + published: "59863" protocol: tcp read_only: true restart: always @@ -2333,8 +2333,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-notifications - target: /tmp/edgex/secrets/support-notifications + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z