Update memcached image to 1.6.16 (#2740)

* Update memcached image to 1.6.16 Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
grafana · Aug 17, 2022 · 631bc2d · 631bc2d
1 parent 741ffbb
commit 631bc2d
Show file tree

Hide file tree

Showing 39 changed files with 127 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@
 
 ### Jsonnet
 
+* [ENHANCEMENT] Upgrade memcached image tag to `memcached:1.6.16-alpine`. #2740
+
 ### Mimirtool
 
 * [BUGFIX] Version checking no longer prompts for updating when already on latest version. #2723

diff --git a/development/tsdb-blocks-storage-s3/docker-compose.jsonnet b/development/tsdb-blocks-storage-s3/docker-compose.jsonnet
@@ -214,7 +214,7 @@ std.manifestYamlDoc({
 
   memcached:: {
     memcached: {
-      image: 'memcached:1.6',
+      image: 'memcached:1.6.16-alpine',
     },
   },
 

diff --git a/development/tsdb-blocks-storage-s3/docker-compose.yml b/development/tsdb-blocks-storage-s3/docker-compose.yml
@@ -198,7 +198,7 @@
       - "16686:16686"
       - "14268"
   "memcached":
-    "image": "memcached:1.6"
+    "image": "memcached:1.6.16-alpine"
   "minio":
     "command":
       - "server"

diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -14,6 +14,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 ## main / unreleased
 
 * [FEATURE] Add query-scheduler, which is now enabled by default. If you have copied the `mimir.config`, then update it to correctly configure the query-frontend and the querier. #2087
+* [ENHANCEMENT] Upgrade memcached image tag to `memcached:1.6.16-alpine`. #2740
 * [ENHANCEMENT] Upgrade nginx image tag to `nginxinc/nginx-unprivileged:1.22-alpine`. #2742
 
 ## 3.1.0

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -1131,7 +1131,7 @@ memcached:
     # -- Memcached Docker image repository
     repository: memcached
     # -- Memcached Docker image tag
-    tag: 1.6.9-alpine
+    tag: 1.6.16-alpine
     # -- Memcached Docker image pull policy
     pullPolicy: IfNotPresent
 

diff --git a/...s-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml b/...s-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml
@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: memcached
-          image: memcached:1.6.9-alpine
+          image: memcached:1.6.16-alpine
           imagePullPolicy: IfNotPresent
           resources:
             limits: null

diff --git a/...oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml b/...oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml
@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: memcached
-          image: memcached:1.6.9-alpine
+          image: memcached:1.6.16-alpine
           imagePullPolicy: IfNotPresent
           resources:
             limits: null

diff --git a/...lues-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml b/...lues-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml
@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: memcached
-          image: memcached:1.6.9-alpine
+          image: memcached:1.6.16-alpine
           imagePullPolicy: IfNotPresent
           resources:
             limits: null

diff --git a/...values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml b/...values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml
@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: memcached
-          image: memcached:1.6.9-alpine
+          image: memcached:1.6.16-alpine
           imagePullPolicy: IfNotPresent
           resources:
             limits: null

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -1388,7 +1388,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1441,7 +1441,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1494,7 +1494,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1547,7 +1547,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-consul-generated.yaml b/operations/mimir-tests/test-consul-generated.yaml
@@ -1442,7 +1442,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1495,7 +1495,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1548,7 +1548,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1601,7 +1601,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-consul-multi-zone-generated.yaml b/operations/mimir-tests/test-consul-multi-zone-generated.yaml
@@ -1881,7 +1881,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1934,7 +1934,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1987,7 +1987,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -2040,7 +2040,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml b/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml
@@ -1332,7 +1332,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1385,7 +1385,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1438,7 +1438,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1491,7 +1491,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-defaults-generated.yaml b/operations/mimir-tests/test-defaults-generated.yaml
@@ -855,7 +855,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -908,7 +908,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -961,7 +961,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1014,7 +1014,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
@@ -1088,7 +1088,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1141,7 +1141,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1194,7 +1194,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1247,7 +1247,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-helm-parity-generated.yaml b/operations/mimir-tests/test-helm-parity-generated.yaml
@@ -1158,7 +1158,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1211,7 +1211,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1264,7 +1264,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1317,7 +1317,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:

diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml
@@ -1087,7 +1087,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1140,7 +1140,7 @@ spec:
         - -I 5m
         - -c 1024
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1193,7 +1193,7 @@ spec:
         - -I 5m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports:
@@ -1246,7 +1246,7 @@ spec:
         - -I 1m
         - -c 16384
         - -v
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.16-alpine
         imagePullPolicy: IfNotPresent
         name: memcached
         ports: