diff --git a/tests/templates/kuttl/external-access/50-assert.yaml.j2 b/tests/templates/kuttl/external-access/50-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/external-access/50-assert.yaml.j2 +++ b/tests/templates/kuttl/external-access/50-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/ldap/95-assert.yaml.j2 b/tests/templates/kuttl/ldap/95-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/ldap/95-assert.yaml.j2 +++ b/tests/templates/kuttl/ldap/95-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/logging/70-assert.yaml.j2 b/tests/templates/kuttl/logging/70-assert.yaml.j2 index 97e0ee10..36ff53a9 100644 --- a/tests/templates/kuttl/logging/70-assert.yaml.j2 +++ b/tests/templates/kuttl/logging/70-assert.yaml.j2 @@ -15,9 +15,13 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. + # Rolegroup custom-log-config CURL_RESPONSE_CUSTOM=$( - kubectl -n $NAMESPACE exec airflow-webserver-custom-log-config-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-custom-log-config-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-custom-log-config-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-custom-log-config-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertions: @@ -25,7 +29,7 @@ commands: # Rolegroup automatic-log-config CURL_RESPONSE_AUTO=$( - kubectl -n $NAMESPACE exec airflow-webserver-automatic-log-config-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-automatic-log-config-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-automatic-log-config-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-automatic-log-config-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) echo "The HTTP Code is $CURL_RESPONSE_AUTO (an internal JWT token is needed for full access)" [ "$CURL_RESPONSE_CUSTOM" -eq 403 ] && [ "$CURL_RESPONSE_AUTO" -eq 403 ] diff --git a/tests/templates/kuttl/mount-dags-configmap/70-assert.yaml.j2 b/tests/templates/kuttl/mount-dags-configmap/70-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/mount-dags-configmap/70-assert.yaml.j2 +++ b/tests/templates/kuttl/mount-dags-configmap/70-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/mount-dags-gitsync/70-assert.yaml.j2 b/tests/templates/kuttl/mount-dags-gitsync/70-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/mount-dags-gitsync/70-assert.yaml.j2 +++ b/tests/templates/kuttl/mount-dags-gitsync/70-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/smoke/80-assert.yaml.j2 b/tests/templates/kuttl/smoke/80-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/smoke/80-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke/80-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/triggerer/70-assert.yaml.j2 b/tests/templates/kuttl/triggerer/70-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/triggerer/70-assert.yaml.j2 +++ b/tests/templates/kuttl/triggerer/70-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: diff --git a/tests/templates/kuttl/versioning/70-assert.yaml.j2 b/tests/templates/kuttl/versioning/70-assert.yaml.j2 index 7227e06f..1db58e43 100644 --- a/tests/templates/kuttl/versioning/70-assert.yaml.j2 +++ b/tests/templates/kuttl/versioning/70-assert.yaml.j2 @@ -15,8 +15,11 @@ commands: # 8793 port for the Webserver: we don't use the token as that is an # internal implementation, but check that the endpoint is reachable, # indicated by a 403. + # N.B. this behaviour is stricter in 3.1.0, whereby the "/log" suffix + # has to be declared. + # See https://github.com/apache/airflow/pull/52581. CURL_RESPONSE=$( - kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793 2>/dev/null || true);echo "$CODE"' + kubectl -n $NAMESPACE exec airflow-webserver-default-0 -- sh -c 'CODE=$(curl -s -o /dev/null -w "%{http_code}" http://airflow-worker-default-headless:8793/log 2>/dev/null || true);echo "$CODE"' ) # Log-Endpoint Test Assertion: