Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Replace old Scheduler service with cron Scheduler service #478

Merged
merged 1 commit into from
Nov 12, 2024
Merged

refactor: Replace old Scheduler service with cron Scheduler service #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compose-builder/add-security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions compose-builder/docker-compose-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@ 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:
- edgex-network
env_file:
- common-non-security.env
environment:
SERVICE_HOST: edgex-support-cron-scheduler
SERVICE_HOST: edgex-support-scheduler
depends_on:
- core-keeper
- database
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions docker-compose-no-secty-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose-no-secty-with-app-sample-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose-no-secty-with-app-sample.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose-no-secty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-with-app-sample-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-with-app-sample.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-zero-trust-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-zero-trust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
Loading