From efccfba503dec1d6c3dd11a938497f9e46fe00f2 Mon Sep 17 00:00:00 2001 From: vivekshankar1 <59958706+vivekshankar1@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:39:29 +0530 Subject: [PATCH] manual bum p multi services (#8594) Signed-off-by: Vivek Shankar --- components/automate-backend-deployment/README.md | 1 + components/automate-cli/habitat/plan.sh | 1 + components/automate-cs-nginx/habitat/hooks/health-check | 1 + components/automate-cs-oc-erchef/habitat/hooks/health-check | 1 + components/automate-deployment/habitat/hooks/health-check | 1 + components/automate-es-gateway/habitat/hooks/health-check | 1 + components/automate-pg-gateway/habitat/hooks/health-check | 1 + 7 files changed, 7 insertions(+) diff --git a/components/automate-backend-deployment/README.md b/components/automate-backend-deployment/README.md index 53b1a1df597..a91aa471b47 100644 --- a/components/automate-backend-deployment/README.md +++ b/components/automate-backend-deployment/README.md @@ -4,4 +4,5 @@ This provides the `automate-backend-deployment` package. This package will build a package using terraform/a2ha-terraform, inspecs, test, certs and Makefile. + This is the heart of the a2ha because this component will set up a workspace for a2ha and all the a2ha command will get available after installing this package. diff --git a/components/automate-cli/habitat/plan.sh b/components/automate-cli/habitat/plan.sh index 3e6f95dc9c0..8082332a1ef 100644 --- a/components/automate-cli/habitat/plan.sh +++ b/components/automate-cli/habitat/plan.sh @@ -28,6 +28,7 @@ do_after() { # being placed in a specific location in the hab package. Therefore, instead # of relying on the scaffolding install we'll do it manually to please the # updater and chef-automate cli zip creator in expeditor. + local bin_root="${pkg_prefix}/static/linux" mkdir -p "${bin_root}" diff --git a/components/automate-cs-nginx/habitat/hooks/health-check b/components/automate-cs-nginx/habitat/hooks/health-check index e6fb15f9cd2..c9820fe0815 100644 --- a/components/automate-cs-nginx/habitat/hooks/health-check +++ b/components/automate-cs-nginx/habitat/hooks/health-check @@ -1,5 +1,6 @@ #!/bin/sh # + curlOpts="-sS --fail --max-time 2" curlOpts="$curlOpts --resolve automate-cs-nginx:{{cfg.service.port}}:127.0.0.1" curlOpts="$curlOpts --noproxy automate-cs-nginx" diff --git a/components/automate-cs-oc-erchef/habitat/hooks/health-check b/components/automate-cs-oc-erchef/habitat/hooks/health-check index ee6431fbe77..84dcf1cd894 100644 --- a/components/automate-cs-oc-erchef/habitat/hooks/health-check +++ b/components/automate-cs-oc-erchef/habitat/hooks/health-check @@ -1,5 +1,6 @@ #!/bin/sh # + curlOpts="-X GET -sS --fail --max-time 2" curlOpts="$curlOpts --cert {{pkg.svc_config_path}}/service.crt" curlOpts="$curlOpts --key {{pkg.svc_config_path}}/service.key" diff --git a/components/automate-deployment/habitat/hooks/health-check b/components/automate-deployment/habitat/hooks/health-check index 6bf27af9ef8..4a761f75690 100644 --- a/components/automate-deployment/habitat/hooks/health-check +++ b/components/automate-deployment/habitat/hooks/health-check @@ -1,5 +1,6 @@ #!/bin/sh + # Client-side code we use in health-check reads this env var. See deployment/address.go export DEPLOYMENT_SERVICE_ADDRESS="127.0.0.1:{{cfg.service.port}}" diff --git a/components/automate-es-gateway/habitat/hooks/health-check b/components/automate-es-gateway/habitat/hooks/health-check index 07fc1ce11da..d98ef528aac 100644 --- a/components/automate-es-gateway/habitat/hooks/health-check +++ b/components/automate-es-gateway/habitat/hooks/health-check @@ -1,5 +1,6 @@ #!{{pkgPathFor "core/bash"}}/bin/bash # + curlOpts="-sS --fail --max-time 2" # shellcheck disable=SC2086 output=$({{pkgPathFor "core/curl"}}/bin/curl $curlOpts "http://localhost:{{cfg.service.port}}/automate_es_gateway_status") diff --git a/components/automate-pg-gateway/habitat/hooks/health-check b/components/automate-pg-gateway/habitat/hooks/health-check index 53e3ca75a88..eae82d1c5aa 100644 --- a/components/automate-pg-gateway/habitat/hooks/health-check +++ b/components/automate-pg-gateway/habitat/hooks/health-check @@ -11,6 +11,7 @@ set -uo pipefail exec 2>&1 rc=0 + STATUS_SOCK={{pkg.svc_var_path}}/status.sock JQ_FILTER=".[] | select(.field.name == \"Name\").value.value"