Merge pull request #104 from arvatoaws-labs/develop

merge to master

Author: runningman84

.github/workflows/build-develop.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Set up Git
         run: |
@@ -40,7 +40,7 @@ jobs:
           rm -rf helm-${HELM_VERSION}-linux-arm64.tar.gz linux-arm64
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/build-master.yaml

@@ -53,7 +53,7 @@ jobs:
           git config --global user.email '${{ vars.APP_ID }}+buildandpublish[bot]@users.noreply.github.com'
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Install helm
         run: |
@@ -63,7 +63,7 @@ jobs:
           rm -rf helm-${HELM_VERSION}-linux-arm64.tar.gz linux-arm64
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

templates/configmap.yaml

@@ -142,6 +142,22 @@ data:
     limit_req_zone $binary_remote_addr zone=login:{{ .Values.nginx.rate_limit_login.zone_memory_size }} rate={{ .Values.nginx.rate_limit_login.requests_per_second }}r/s;
     {{- end }}
 
+    {{- if .Values.nginx.accessLog.excludeReadinessProbe }}
+    # Exclude readiness probe from access log
+    geo $remote_addr $log_client_ip {
+      default 1;
+      10.0.0.0/8 0;
+      172.16.0.0/12 0;
+      192.168.0.0/16 0;
+    }
+    map "$request_uri $http_user_agent" $loggable {
+        {{- with .Values.nginx.readinessProbe }}
+        ~*^{{ replace "." `\.` .httpGet.path }}.*kube-probe $log_client_ip;
+        {{- end }}
+        default 1;
+    }
+    {{- end }}
+
     server {
         listen       8080;
         server_name {{ index $.Values.ingress.hosts 0 "host" | quote }};
@@ -255,7 +271,7 @@ data:
         {{- end }}
 
         {{- if .Values.nginx.accessLog.enabled }}
-        access_log /dev/stdout {{ if .Values.nginx.accessLog.logUpstreamTime }}upstream_time{{ else }}main{{- end }};
+        access_log /dev/stdout {{ if .Values.nginx.accessLog.logUpstreamTime }}upstream_time{{ else }}main{{- end }}{{ if .Values.nginx.accessLog.excludeReadinessProbe }} if=$loggable{{- end }};
         {{- else }}
         access_log off;
         {{- end }}

values.yaml

@@ -81,7 +81,7 @@ karpenter:
 nginx:
   image:
     repository: public.ecr.aws/nginx/nginx
-    tag: 1.29.4-alpine-slim
+    tag: 1.29.5-alpine-slim
     pullPolicy: IfNotPresent
   resources: {}
   disallow_robots: false
@@ -99,6 +99,7 @@ nginx:
   accessLog:
     enabled: true
     logUpstreamTime: true
+    excludeReadinessProbe: true
   fastcgi_buffer_size: 16k
   fastcgi_buffers_number: 16
   fastcgi_buffers_size: 8k
@@ -180,7 +181,7 @@ offload:
     fileName: wpoffload_private.pem
   errorPages:
     enabled: false
-    image: public.ecr.aws/aws-cli/aws-cli:2.32.18
+    image: public.ecr.aws/aws-cli/aws-cli:2.34.6
     path: /var/www/html/error-pages