Make ADC command path detection more robust in job script
This commit is contained in:
@@ -102,9 +102,27 @@ spec:
|
||||
sed -i 's|/etc/ssl/certs/tls.key|/tmp/tls.key|g' /config/adc-config.yaml
|
||||
{{- end }}
|
||||
|
||||
# Find and use ADC command
|
||||
if command -v adc &> /dev/null; then
|
||||
ADC_CMD="adc"
|
||||
elif [ -f /usr/local/bin/adc ]; then
|
||||
ADC_CMD="/usr/local/bin/adc"
|
||||
elif [ -f /usr/bin/adc ]; then
|
||||
ADC_CMD="/usr/bin/adc"
|
||||
elif [ -f /adc ]; then
|
||||
ADC_CMD="/adc"
|
||||
else
|
||||
echo "ERROR: ADC command not found in container image"
|
||||
echo "Available commands:"
|
||||
ls -la /usr/local/bin/ /usr/bin/ / 2>/dev/null | grep adc || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Using ADC command: $ADC_CMD"
|
||||
|
||||
# Validate configuration
|
||||
echo "Validating ADC configuration..."
|
||||
adc validate -f /config/adc-config.yaml || {
|
||||
$ADC_CMD validate -f /config/adc-config.yaml || {
|
||||
echo "ERROR: Configuration validation failed"
|
||||
cat /config/adc-config.yaml
|
||||
exit 1
|
||||
@@ -112,7 +130,7 @@ spec:
|
||||
|
||||
# Sync configuration to API7
|
||||
echo "Syncing configuration to API7 Gateway..."
|
||||
adc sync -f /config/adc-config.yaml \
|
||||
$ADC_CMD sync -f /config/adc-config.yaml \
|
||||
--backend {{ .Values.api7.backend | default "api7ee" }} \
|
||||
--server ${API7_ADMIN_URL} \
|
||||
--token ${API7_ADMIN_KEY} \
|
||||
|
||||
Reference in New Issue
Block a user