chore: upgrade nginx image to 1.25.2-alpine-sumo-1

SumoLogic · Nov 3, 2023 · f12509e · f12509e
1 parent d20f080
commit f12509e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/3375.changed.txt b/.changelog/3375.changed.txt
@@ -0,0 +1 @@
+chore: upgrade nginx image to 1.25.2-alpine-sumo-1
diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -92,7 +92,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `sumologic.metrics.remoteWriteProxy.config.workerCountAutotune`                       | This feature autodetects how much CPU is assigned to the nginx instance and setsthe right amount of workers based on that. Disable to use the default of 8 workers.                                                                                                                                        | `true`                                                                                                                                                                               |
 | `sumologic.metrics.remoteWriteProxy.config.enableAccessLogs`                          | Enable nginx access logs.                                                                                                                                                                                                                                                                                  | `false`                                                                                                                                                                              |
 | `sumologic.metrics.remoteWriteProxy.replicaCount`                                     | Number of replicas in the remote write proxy deployment.                                                                                                                                                                                                                                                   | `3`                                                                                                                                                                                  |
-| `sumologic.metrics.remoteWriteProxy.image`                                            | Nginx docker image for the remote write proxy.                                                                                                                                                                                                                                                             | `{"repository": "public.ecr.aws/sumologic/nginx-unprivileged", "tag": "1.25.2-alpine", "pullPolicy": "IfNotPresent"}`                                                                |
+| `sumologic.metrics.remoteWriteProxy.image`                                            | Nginx docker image for the remote write proxy.                                                                                                                                                                                                                                                             | `{"repository": "public.ecr.aws/sumologic/nginx-unprivileged", "tag": "1.25.2-alpine-sumo-1", "pullPolicy": "IfNotPresent"}`                                                         |
 | `sumologic.metrics.remoteWriteProxy.resources`                                        | Resource requests and limits for the remote write proxy container.                                                                                                                                                                                                                                         | `{"limits": {"cpu": "1000m", "memory": "256Mi"}, "requests": {"cpu": "100m", "memory": "128Mi"}}`                                                                                    |
 | `sumologic.metrics.remoteWriteProxy.livenessProbe`                                    | Liveness probe settings for the remote write proxy container.                                                                                                                                                                                                                                              | `{"initialDelaySeconds": 30, "periodSeconds": 10, "timeoutSeconds": 5, "successThreshold": 1, "failureThreshold": 6}`                                                                |
 | `sumologic.metrics.remoteWriteProxy.readinessProbe`                                   | Readiness probe settings for the remote write proxy container.                                                                                                                                                                                                                                             | `{"initialDelaySeconds": 5, "periodSeconds": 5, "timeoutSeconds": 3, "successThreshold": 1, "failureThreshold": 3}`                                                                  |

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -585,7 +585,9 @@ sumologic:
       replicaCount: 3
       image:
         repository: public.ecr.aws/sumologic/nginx-unprivileged
-        tag: 1.25.2-alpine
+        ## This is simply 1.25.2-alpine with a newer version of Alpine
+        ## In the nginx repo, this a moving tag, so I've chosen to add a -sumo-1 suffix to indicate the change
+        tag: 1.25.2-alpine-sumo-1
         pullPolicy: IfNotPresent
       resources:
         limits:

diff --git a/tests/helm/testdata/goldenfile/remote_write_proxy/basic.output.yaml b/tests/helm/testdata/goldenfile/remote_write_proxy/basic.output.yaml
@@ -28,7 +28,7 @@ spec:
       securityContext: {}
       containers:
         - name: nginx
-          image: public.ecr.aws/sumologic/nginx-unprivileged:1.25.2-alpine
+          image: public.ecr.aws/sumologic/nginx-unprivileged:1.25.2-alpine-sumo-1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080