From 58a6f5c7c9659efd1b58966f9850e072f17c68ca Mon Sep 17 00:00:00 2001 From: bruce Date: Mon, 11 Nov 2024 22:23:16 +0800 Subject: [PATCH] refactor: Replace old Scheduler service with cron Scheduler service BREAKING CHANGE: the cron scheduler name and key changed Replace the old Scheduler service with the new cron Scheduler service Signed-off-by: bruce --- compose-builder/add-security.yml | 6 +++--- compose-builder/docker-compose-base.yml | 10 +++++----- docker-compose-arm64.yml | 16 ++++++++-------- docker-compose-no-secty-arm64.yml | 10 +++++----- ...er-compose-no-secty-with-app-sample-arm64.yml | 10 +++++----- docker-compose-no-secty-with-app-sample.yml | 10 +++++----- docker-compose-no-secty.yml | 10 +++++----- docker-compose-with-app-sample-arm64.yml | 16 ++++++++-------- docker-compose-with-app-sample.yml | 16 ++++++++-------- docker-compose-zero-trust-arm64.yml | 16 ++++++++-------- docker-compose-zero-trust.yml | 16 ++++++++-------- docker-compose.yml | 16 ++++++++-------- taf/docker-compose-taf-arm64.yml | 16 ++++++++-------- taf/docker-compose-taf-no-secty-arm64.yml | 10 +++++----- taf/docker-compose-taf-no-secty.yml | 10 +++++----- taf/docker-compose-taf-perf-arm64.yml | 16 ++++++++-------- taf/docker-compose-taf-perf-no-secty-arm64.yml | 10 +++++----- taf/docker-compose-taf-perf-no-secty.yml | 10 +++++----- taf/docker-compose-taf-perf.yml | 16 ++++++++-------- taf/docker-compose-taf.yml | 16 ++++++++-------- 20 files changed, 128 insertions(+), 128 deletions(-) diff --git a/compose-builder/add-security.yml b/compose-builder/add-security.yml index f8bdbf47..b6c7c930 100644 --- a/compose-builder/add-security.yml +++ b/compose-builder/add-security.yml @@ -144,15 +144,15 @@ services: - security-bootstrapper - security-secretstore-setup - support-cron-scheduler: + support-scheduler: env_file: - common-security.env - common-sec-stage-gate.env entrypoint: ["/edgex-init/ready_to_run_wait_install.sh"] - command: "/support-cron-scheduler --registry ${CP_FLAGS}" + command: "/support-scheduler --registry ${CP_FLAGS}" volumes: - edgex-init:/edgex-init:ro - - /tmp/edgex/secrets/support-cron-scheduler:/tmp/edgex/secrets/support-cron-scheduler:ro,z + - /tmp/edgex/secrets/support-scheduler:/tmp/edgex/secrets/support-scheduler:ro,z depends_on: - security-bootstrapper - security-secretstore-setup diff --git a/compose-builder/docker-compose-base.yml b/compose-builder/docker-compose-base.yml index ef60aafd..632bb2e7 100644 --- a/compose-builder/docker-compose-base.yml +++ b/compose-builder/docker-compose-base.yml @@ -84,14 +84,14 @@ services: # use host timezone - /etc/localtime:/etc/localtime:ro - support-cron-scheduler: - image: ${CORE_EDGEX_REPOSITORY}/support-cron-scheduler${ARCH}:${CORE_EDGEX_VERSION} + support-scheduler: + image: ${CORE_EDGEX_REPOSITORY}/support-scheduler${ARCH}:${CORE_EDGEX_VERSION} command: --registry ${CP_FLAGS} user: "${EDGEX_USER}:${EDGEX_GROUP}" ports: - "127.0.0.1:59863:59863" - container_name: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler + container_name: edgex-support-scheduler + hostname: edgex-support-scheduler read_only: true restart: always networks: @@ -99,7 +99,7 @@ services: env_file: - common-non-security.env environment: - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler depends_on: - core-keeper - database diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml index 9998a06a..f5e2e056 100644 --- a/docker-compose-arm64.yml +++ b/docker-compose-arm64.yml @@ -1183,12 +1183,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1211,7 +1211,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1225,8 +1225,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: @@ -1253,8 +1253,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 5f4df3b5..f98d0b79 100644 --- a/docker-compose-no-secty-arm64.yml +++ b/docker-compose-no-secty-arm64.yml @@ -456,11 +456,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -473,9 +473,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-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: diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml index 0c439075..f37e5d5f 100644 --- a/docker-compose-no-secty-with-app-sample-arm64.yml +++ b/docker-compose-no-secty-with-app-sample-arm64.yml @@ -500,11 +500,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -517,9 +517,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-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: diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml index f7ec409c..2ea389bc 100644 --- a/docker-compose-no-secty-with-app-sample.yml +++ b/docker-compose-no-secty-with-app-sample.yml @@ -500,11 +500,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -517,9 +517,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml index 66d81742..96a06341 100644 --- a/docker-compose-no-secty.yml +++ b/docker-compose-no-secty.yml @@ -456,11 +456,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -473,9 +473,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml index 77056e5d..37ff762d 100644 --- a/docker-compose-with-app-sample-arm64.yml +++ b/docker-compose-with-app-sample-arm64.yml @@ -1260,12 +1260,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1288,7 +1288,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1302,8 +1302,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: @@ -1330,8 +1330,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 389483a3..a8f2963d 100644 --- a/docker-compose-with-app-sample.yml +++ b/docker-compose-with-app-sample.yml @@ -1260,12 +1260,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1288,7 +1288,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1302,8 +1302,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: @@ -1330,8 +1330,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 ea95a6c3..825f8f0e 100644 --- a/docker-compose-zero-trust-arm64.yml +++ b/docker-compose-zero-trust-arm64.yml @@ -966,12 +966,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -994,7 +994,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1008,8 +1008,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: @@ -1036,8 +1036,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 a0ae019e..7d0ccf18 100644 --- a/docker-compose-zero-trust.yml +++ b/docker-compose-zero-trust.yml @@ -966,12 +966,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -994,7 +994,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1008,8 +1008,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: @@ -1036,8 +1036,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 a71df0e6..bdbdce5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1183,12 +1183,12 @@ services: source: kuiper-connections target: /tmp/kuiper-connections volume: {} - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1211,7 +1211,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1225,8 +1225,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: @@ -1253,8 +1253,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 81808431..17bc60bd 100644 --- a/taf/docker-compose-taf-arm64.yml +++ b/taf/docker-compose-taf-arm64.yml @@ -2181,12 +2181,12 @@ services: bind: selinux: z create_host_path: true - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -2209,7 +2209,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2223,8 +2223,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: @@ -2251,8 +2251,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 1d1a7ac6..5e53801f 100644 --- a/taf/docker-compose-taf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-no-secty-arm64.yml @@ -871,11 +871,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -888,9 +888,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-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: diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml index 9c6b259c..738b1c92 100644 --- a/taf/docker-compose-taf-no-secty.yml +++ b/taf/docker-compose-taf-no-secty.yml @@ -871,11 +871,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -888,9 +888,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml index bb187b38..ca37de28 100644 --- a/taf/docker-compose-taf-perf-arm64.yml +++ b/taf/docker-compose-taf-perf-arm64.yml @@ -1552,12 +1552,12 @@ services: bind: selinux: z create_host_path: true - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1580,7 +1580,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1594,8 +1594,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-arm64:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest networks: edgex-network: null ports: @@ -1622,8 +1622,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 e9a59dcd..26598f8d 100644 --- a/taf/docker-compose-taf-perf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-perf-no-secty-arm64.yml @@ -521,11 +521,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -538,9 +538,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler-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: diff --git a/taf/docker-compose-taf-perf-no-secty.yml b/taf/docker-compose-taf-perf-no-secty.yml index 3f510c01..3176b452 100644 --- a/taf/docker-compose-taf-perf-no-secty.yml +++ b/taf/docker-compose-taf-perf-no-secty.yml @@ -521,11 +521,11 @@ services: source: kuiper-plugins target: /kuiper/plugins volume: {} - support-cron-scheduler: + support-scheduler: command: - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -538,9 +538,9 @@ services: required: true environment: EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-cron-scheduler - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + SERVICE_HOST: edgex-support-scheduler + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml index 188e69b8..b9200bf3 100644 --- a/taf/docker-compose-taf-perf.yml +++ b/taf/docker-compose-taf-perf.yml @@ -1552,12 +1552,12 @@ services: bind: selinux: z create_host_path: true - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -1580,7 +1580,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -1594,8 +1594,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: @@ -1622,8 +1622,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + 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 d0376c37..2bfa6948 100644 --- a/taf/docker-compose-taf.yml +++ b/taf/docker-compose-taf.yml @@ -2181,12 +2181,12 @@ services: bind: selinux: z create_host_path: true - support-cron-scheduler: + support-scheduler: command: - - /support-cron-scheduler + - /support-scheduler - --registry - -cp=keeper.http://edgex-core-keeper:59890 - container_name: edgex-support-cron-scheduler + container_name: edgex-support-scheduler depends_on: core-common-config-bootstrapper: condition: service_started @@ -2209,7 +2209,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-secret-store - SERVICE_HOST: edgex-support-cron-scheduler + SERVICE_HOST: edgex-support-scheduler STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" STAGEGATE_DATABASE_HOST: edgex-postgres @@ -2223,8 +2223,8 @@ services: STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322" STAGEGATE_WAITFOR_TIMEOUT: 60s - hostname: edgex-support-cron-scheduler - image: nexus3.edgexfoundry.org:10004/support-cron-scheduler:latest + hostname: edgex-support-scheduler + image: nexus3.edgexfoundry.org:10004/support-scheduler:latest networks: edgex-network: null ports: @@ -2251,8 +2251,8 @@ services: read_only: true volume: {} - type: bind - source: /tmp/edgex/secrets/support-cron-scheduler - target: /tmp/edgex/secrets/support-cron-scheduler + source: /tmp/edgex/secrets/support-scheduler + target: /tmp/edgex/secrets/support-scheduler read_only: true bind: selinux: z