Skip to content

Commit

Permalink
Update nginx version 1.9.5 -> 1.9.6 (#2150)
Browse files Browse the repository at this point in the history
* Update nginx version 1.9.5 -> 1.9.6

* resolving pre-commit issues

* add test to validate ssl cache

* fix pre-commit

---------

Co-authored-by: pgvishnuram <vishnu@astronomer.io>
  • Loading branch information
himabindu07 and pgvishnuram authored Mar 22, 2024
1 parent c071ae4 commit 69c2a8e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
- 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
Expand Down Expand Up @@ -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.4
- 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
Expand Down
2 changes: 1 addition & 1 deletion charts/nginx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/functional_tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ def test_nginx_can_reach_default_backend(nginx):
)


def test_nginx_ssl_cache(nginx):
"""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", "")


@pytest.mark.flaky(reruns=20, reruns_delay=10)
def test_prometheus_targets(prometheus):
"""Ensure all Prometheus targets are healthy."""
Expand Down

0 comments on commit 69c2a8e

Please sign in to comment.