Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nginx version 1.9.5 -> 1.9.6 #2150

Merged
merged 5 commits into from
Mar 22, 2024
Merged

Update nginx version 1.9.5 -> 1.9.6 #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb7a0f3
Update nginx version 1.9.5 -> 1.9.6
himabindu07 Mar 22, 2024
b246492
resolving pre-commit issues
himabindu07 Mar 22, 2024
749279b
Merge branch 'master' into update-nginx-packages
pgvishnuram Mar 22, 2024
c93c486
add test to validate ssl cache
pgvishnuram Mar 22, 2024
5841503
fix pre-commit
pgvishnuram Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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