Merge branch 'master' into release-0.34

astronomer · Mar 26, 2024 · 11035d9 · 11035d9
2 parents 48ceb99 + 08fedd2
commit 11035d9
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 30 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -357,37 +357,37 @@ workflows:
           matrix:
             parameters:
               docker_image:
-                - quay.io/astronomer/ap-alertmanager:0.26.0
+                - quay.io/astronomer/ap-alertmanager:0.27.0
                 - quay.io/astronomer/ap-astro-ui:0.34.3
-                - quay.io/astronomer/ap-auth-sidecar:1.25.3-1
+                - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-7
                 - quay.io/astronomer/ap-base:3.18.6
                 - quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
-                - quay.io/astronomer/ap-cli-install:0.26.22
+                - quay.io/astronomer/ap-cli-install:0.26.23
                 - quay.io/astronomer/ap-commander:0.34.0
                 - quay.io/astronomer/ap-configmap-reloader:0.12.0
-                - quay.io/astronomer/ap-curator:8.0.8-7
+                - quay.io/astronomer/ap-curator:8.0.9
                 - quay.io/astronomer/ap-db-bootstrapper:0.31.11
-                - quay.io/astronomer/ap-default-backend:0.28.23
+                - quay.io/astronomer/ap-default-backend:0.28.24
                 - quay.io/astronomer/ap-elasticsearch-exporter:1.7.0
                 - quay.io/astronomer/ap-elasticsearch:8.11.4
                 - quay.io/astronomer/ap-fluentd:1.16.3
-                - quay.io/astronomer/ap-grafana:10.2.3
+                - quay.io/astronomer/ap-grafana:10.2.4
                 - quay.io/astronomer/ap-houston-api:0.34.4
                 - quay.io/astronomer/ap-init:3.18.6
                 - quay.io/astronomer/ap-kibana:8.11.4
                 - quay.io/astronomer/ap-kube-state:2.10.1
                 - quay.io/astronomer/ap-nats-exporter:0.14.0-1
                 - 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-es:1.25.4
+                - 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
                 - quay.io/astronomer/ap-postgres-exporter:0.15.0-4
-                - quay.io/astronomer/ap-postgresql:15.5.0-1
-                - quay.io/astronomer/ap-prometheus:2.45.3
+                - quay.io/astronomer/ap-postgresql:15.6.0
+                - quay.io/astronomer/ap-prometheus:2.45.4
                 - quay.io/astronomer/ap-registry:3.18.6
                 - quay.io/astronomer/ap-vector:0.32.2-4
           context:
@@ -396,37 +396,37 @@ workflows:
           matrix:
             parameters:
               docker_image:
-                - quay.io/astronomer/ap-alertmanager:0.26.0
+                - quay.io/astronomer/ap-alertmanager:0.27.0
                 - quay.io/astronomer/ap-astro-ui:0.34.3
-                - quay.io/astronomer/ap-auth-sidecar:1.25.3-1
+                - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-7
                 - quay.io/astronomer/ap-base:3.18.6
                 - quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
-                - quay.io/astronomer/ap-cli-install:0.26.22
+                - quay.io/astronomer/ap-cli-install:0.26.23
                 - quay.io/astronomer/ap-commander:0.34.0
                 - quay.io/astronomer/ap-configmap-reloader:0.12.0
-                - quay.io/astronomer/ap-curator:8.0.8-7
+                - quay.io/astronomer/ap-curator:8.0.9
                 - quay.io/astronomer/ap-db-bootstrapper:0.31.11
-                - quay.io/astronomer/ap-default-backend:0.28.23
+                - quay.io/astronomer/ap-default-backend:0.28.24
                 - quay.io/astronomer/ap-elasticsearch-exporter:1.7.0
                 - quay.io/astronomer/ap-elasticsearch:8.11.4
                 - quay.io/astronomer/ap-fluentd:1.16.3
-                - quay.io/astronomer/ap-grafana:10.2.3
+                - quay.io/astronomer/ap-grafana:10.2.4
                 - quay.io/astronomer/ap-houston-api:0.34.4
                 - quay.io/astronomer/ap-init:3.18.6
                 - quay.io/astronomer/ap-kibana:8.11.4
                 - quay.io/astronomer/ap-kube-state:2.10.1
                 - quay.io/astronomer/ap-nats-exporter:0.14.0-1
                 - 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-es:1.25.4
+                - 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
                 - quay.io/astronomer/ap-postgres-exporter:0.15.0-4
-                - quay.io/astronomer/ap-postgresql:15.5.0-1
-                - quay.io/astronomer/ap-prometheus:2.45.3
+                - quay.io/astronomer/ap-postgresql:15.6.0
+                - quay.io/astronomer/ap-prometheus:2.45.4
                 - quay.io/astronomer/ap-registry:3.18.6
                 - quay.io/astronomer/ap-vector:0.32.2-4
           context:

diff --git a/charts/alertmanager/values.yaml b/charts/alertmanager/values.yaml
@@ -9,7 +9,7 @@ tolerations: []
 images:
   alertmanager:
     repository: quay.io/astronomer/ap-alertmanager
-    tag: 0.26.0
+    tag: 0.27.0
     pullPolicy: IfNotPresent
 
 podSecurityContext:

diff --git a/charts/astronomer/values.yaml b/charts/astronomer/values.yaml
@@ -36,7 +36,7 @@ images:
     pullPolicy: IfNotPresent
   cliInstall:
     repository: quay.io/astronomer/ap-cli-install
-    tag: 0.26.22
+    tag: 0.26.23
     pullPolicy: IfNotPresent
 
 securityContext:

diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
@@ -18,15 +18,15 @@ images:
     pullPolicy: IfNotPresent
   curator:
     repository: quay.io/astronomer/ap-curator
-    tag: 8.0.8-7
+    tag: 8.0.9
     pullPolicy: IfNotPresent
   exporter:
     repository: quay.io/astronomer/ap-elasticsearch-exporter
     tag: 1.7.0
     pullPolicy: IfNotPresent
   nginx:
     repository: quay.io/astronomer/ap-nginx-es
-    tag: 1.25.3-1
+    tag: 1.25.4
     pullPolicy: IfNotPresent
 
 common:

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -9,7 +9,7 @@ tolerations: []
 images:
   grafana:
     repository: quay.io/astronomer/ap-grafana
-    tag: 10.2.3
+    tag: 10.2.4
     pullPolicy: IfNotPresent
   dbBootstrapper:
     repository: quay.io/astronomer/ap-db-bootstrapper

diff --git a/charts/nginx/values.yaml b/charts/nginx/values.yaml
@@ -9,11 +9,11 @@ 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
-    tag: 0.28.23
+    tag: 0.28.24
     pullPolicy: IfNotPresent
 
 securityContext:

diff --git a/charts/postgresql/values.yaml b/charts/postgresql/values.yaml
@@ -15,7 +15,7 @@ global:
 image:
   registry: quay.io
   repository: astronomer/ap-postgresql
-  tag: 15.5.0-1
+  tag: 15.6.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -18,7 +18,7 @@ replicas: 1
 images:
   prometheus:
     repository: quay.io/astronomer/ap-prometheus
-    tag: 2.45.3
+    tag: 2.45.4
     pullPolicy: IfNotPresent
   configReloader:
     repository: quay.io/astronomer/ap-configmap-reloader

diff --git a/tests/functional_tests/test_config.py b/tests/functional_tests/test_config.py
@@ -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."""

diff --git a/values.yaml b/values.yaml
@@ -152,7 +152,7 @@ global:
   authSidecar:
     enabled: false
     repository: quay.io/astronomer/ap-auth-sidecar
-    tag: 1.25.3-1
+    tag: 1.25.4
     pullPolicy: IfNotPresent
     port: 8084
     default_nginx_settings: |