From bb7a0f3d75b29ad229b1e0065854db7616086ee4 Mon Sep 17 00:00:00 2001 From: himabindu <47584863+himabindu07@users.noreply.github.com> Date: Thu, 21 Mar 2024 23:27:38 -0700 Subject: [PATCH 1/4] Update nginx version 1.9.5 -> 1.9.6 --- charts/nginx/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nginx/values.yaml b/charts/nginx/values.yaml index 00365135d..dd640561c 100644 --- a/charts/nginx/values.yaml +++ b/charts/nginx/values.yaml @@ -9,7 +9,7 @@ tolerations: [] images: nginx: repository: quay.io/astronomer/ap-nginx - tag: 1.9.5 + tag: 1.9.6 pullPolicy: IfNotPresent defaultBackend: repository: quay.io/astronomer/ap-default-backend From b246492216050d770a9a60e6f24274d1e0393f06 Mon Sep 17 00:00:00 2001 From: himabindu <47584863+himabindu07@users.noreply.github.com> Date: Thu, 21 Mar 2024 23:39:10 -0700 Subject: [PATCH 2/4] resolving pre-commit issues --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3516585ae..ab7936343 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -381,7 +381,7 @@ workflows: - quay.io/astronomer/ap-nats-server:2.10.9-2 - quay.io/astronomer/ap-nats-streaming:0.25.6-1 - quay.io/astronomer/ap-nginx-es:1.25.3-1 - - quay.io/astronomer/ap-nginx:1.9.5 + - quay.io/astronomer/ap-nginx:1.9.6 - quay.io/astronomer/ap-node-exporter:1.7.0 - quay.io/astronomer/ap-openresty:1.25.3-1 - quay.io/astronomer/ap-pgbouncer-krb:1.17.0-10 @@ -420,7 +420,7 @@ workflows: - quay.io/astronomer/ap-nats-server:2.10.9-2 - quay.io/astronomer/ap-nats-streaming:0.25.6-1 - quay.io/astronomer/ap-nginx-es:1.25.3-1 - - quay.io/astronomer/ap-nginx:1.9.5 + - quay.io/astronomer/ap-nginx:1.9.6 - quay.io/astronomer/ap-node-exporter:1.7.0 - quay.io/astronomer/ap-openresty:1.25.3-1 - quay.io/astronomer/ap-pgbouncer-krb:1.17.0-10 From c93c4867fbe928b6d12adf6e96dbac64ba268f63 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Fri, 22 Mar 2024 14:16:13 +0530 Subject: [PATCH 3/4] add test to validate ssl cache --- tests/functional_tests/test_config.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/functional_tests/test_config.py b/tests/functional_tests/test_config.py index 44ccab9b0..b311e87e2 100755 --- a/tests/functional_tests/test_config.py +++ b/tests/functional_tests/test_config.py @@ -62,6 +62,11 @@ def test_nginx_can_reach_default_backend(nginx): "curl -s --max-time 1 http://astronomer-nginx-default-backend:8080" ) +def test_nginx_ssl_cache(nginx): + """Ensure default nginx cache size if 10m.""" + assert "ssl_session_cache shared:SSL:10m;" == nginx.check_output( + "cat nginx.conf | grep ssl_session_cache" + ).replace('\t',"") @pytest.mark.flaky(reruns=20, reruns_delay=10) def test_prometheus_targets(prometheus): From 5841503b56d99b9a6383d54047ccdcc4734c041a Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Fri, 22 Mar 2024 14:19:08 +0530 Subject: [PATCH 4/4] fix pre-commit --- tests/functional_tests/test_config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/functional_tests/test_config.py b/tests/functional_tests/test_config.py index b311e87e2..47917b939 100755 --- a/tests/functional_tests/test_config.py +++ b/tests/functional_tests/test_config.py @@ -62,11 +62,13 @@ def test_nginx_can_reach_default_backend(nginx): "curl -s --max-time 1 http://astronomer-nginx-default-backend:8080" ) + def test_nginx_ssl_cache(nginx): - """Ensure default nginx cache size if 10m.""" + """Ensure nginx default ssl cache size is 10m.""" assert "ssl_session_cache shared:SSL:10m;" == nginx.check_output( "cat nginx.conf | grep ssl_session_cache" - ).replace('\t',"") + ).replace("\t", "") + @pytest.mark.flaky(reruns=20, reruns_delay=10) def test_prometheus_targets(prometheus):