fix: use HTTPS for registry catalog check, fix log output quoting
Caddy ingress controller redirects HTTP→HTTPS by default, so the container-registry test catalog check needs to use https with -k. Also fix wait_for_log_output in k8s-deploy test and quote all echo $log_output vars to prevent glob expansion. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>pull/739/head
parent
787806d6fa
commit
5e4263873d
|
|
@ -135,7 +135,7 @@ docker push localhost:80/hello-world
|
||||||
# Wait for the catalog to reflect the pushed image
|
# Wait for the catalog to reflect the pushed image
|
||||||
registry_ok=false
|
registry_ok=false
|
||||||
for i in {1..10}; do
|
for i in {1..10}; do
|
||||||
registry_response=$(curl -s -X GET http://localhost:80/v2/_catalog)
|
registry_response=$(curl -s -k -X GET https://localhost/v2/_catalog)
|
||||||
if [[ "$registry_response" == *"hello-world"* ]]; then
|
if [[ "$registry_response" == *"hello-world"* ]]; then
|
||||||
registry_ok=true
|
registry_ok=true
|
||||||
break
|
break
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ wait_for_log_output () {
|
||||||
|
|
||||||
local log_output=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir logs )
|
local log_output=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir logs )
|
||||||
|
|
||||||
if [[ ! -z "$log_output" ]]; then
|
if [[ ! -z "$log_output" ]] && [[ "$log_output" != *"No logs available"* ]] && [[ "$log_output" != *"Pods not running"* ]]; then
|
||||||
# if ready, return
|
# if ready, return
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
|
|
@ -129,7 +129,7 @@ if [[ "$log_output_3" == *"filesystem is fresh"* ]]; then
|
||||||
echo "deployment logs test: passed"
|
echo "deployment logs test: passed"
|
||||||
else
|
else
|
||||||
echo "deployment logs test: FAILED"
|
echo "deployment logs test: FAILED"
|
||||||
echo $log_output_3
|
echo "$log_output_3"
|
||||||
delete_cluster_exit
|
delete_cluster_exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -164,7 +164,7 @@ if [[ "$log_output_5" == *"/data: MOUNTED"* ]]; then
|
||||||
echo "deployment bind volumes test: passed"
|
echo "deployment bind volumes test: passed"
|
||||||
else
|
else
|
||||||
echo "deployment bind volumes test: FAILED"
|
echo "deployment bind volumes test: FAILED"
|
||||||
echo $log_output_5
|
echo "$log_output_5"
|
||||||
delete_cluster_exit
|
delete_cluster_exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -174,7 +174,7 @@ if [[ "$log_output_6" == *"/data2: MOUNTED"* ]]; then
|
||||||
echo "deployment provisioner volumes test: passed"
|
echo "deployment provisioner volumes test: passed"
|
||||||
else
|
else
|
||||||
echo "deployment provisioner volumes test: FAILED"
|
echo "deployment provisioner volumes test: FAILED"
|
||||||
echo $log_output_6
|
echo "$log_output_6"
|
||||||
delete_cluster_exit
|
delete_cluster_exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ if [[ "$log_output_1" == *"filesystem is fresh"* ]]; then
|
||||||
echo "deployment of pod test: passed"
|
echo "deployment of pod test: passed"
|
||||||
else
|
else
|
||||||
echo "deployment pod test: FAILED"
|
echo "deployment pod test: FAILED"
|
||||||
echo $log_output_1
|
echo "$log_output_1"
|
||||||
delete_cluster_exit
|
delete_cluster_exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue