From 726ff502df72fc04a097b92e9f3a3eaa523f4e40 Mon Sep 17 00:00:00 2001 From: Bryon Nevis Date: Mon, 19 Sep 2022 15:29:21 -0700 Subject: [PATCH] Fix: Delayed start services for support- services fail (#4159) Delayed start is not working for support services. Among other problems, for support services, the service key is support-servicename, but the service key in docker-compose is just servicename. Update pre-seeding script to account for this. Signed-off-by: Bryon Nevis Signed-off-by: Bryon Nevis --- cmd/security-spire-config/seed_builtin_entries.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/security-spire-config/seed_builtin_entries.sh b/cmd/security-spire-config/seed_builtin_entries.sh index 1b4ade490e..e62f969663 100755 --- a/cmd/security-spire-config/seed_builtin_entries.sh +++ b/cmd/security-spire-config/seed_builtin_entries.sh @@ -26,14 +26,16 @@ echo "SPIFFE_SERVER_SOCKET=${SPIFFE_SERVER_SOCKET}" echo "SPIFFE_EDGEX_SVID_BASE=${SPIFFE_EDGEX_SVID_BASE}" # add pre-authorized services into spire server entry -for dockerservice in security-spiffe-token-provider notifications scheduler \ +for dockerservice in security-spiffe-token-provider support-notifications support-scheduler \ device-bacnet device-camera device-grove device-modbus device-mqtt device-rest device-snmp \ device-virtual device-rfid-llrp device-coap device-gpio \ app-service-http-export app-service-mqtt-export app-service-sample app-rfid-llrp-inventory \ app-service-external-mqtt-trigger; do # Temporary workaround because service name in dockerfile is not consistent with service key. # TAF scripts depend on legacy docker-compose service name. Fix in EdgeX 3.0. - service=`echo -n ${dockerservice} | sed -e 's/app-service-/app-/'` + service=`echo -n ${dockerservice} | sed -e 's/app-service-/app-/'` + # support- services have the opposite problem. service key is right, service name in docker isn't + dockerservice=`echo -n ${dockerservice} | sed -e 's/support-//'` spire-server entry create -socketPath "${SPIFFE_SERVER_SOCKET}" -parentID "${local_agent_svid}" -dns "edgex-${service}" -spiffeID "${SPIFFE_EDGEX_SVID_BASE}/${service}" -selector "docker:label:com.docker.compose.service:${dockerservice}" done