ci: fix generated test values

Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
grafana · Jul 7, 2023 · 93b3bc2 · 93b3bc2
1 parent 07b2e59
commit 93b3bc2
Show file tree

Hide file tree

Showing 34 changed files with 85 additions and 51 deletions.
diff --git a/...ions/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-metamonitoring-values.yaml b/...ions/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-metamonitoring-values.yaml
@@ -4,6 +4,7 @@ kubeVersionOverride: "1.20"
 metaMonitoring:
   grafanaAgent:
     metrics:
+      enabled: false
       remote:
         url: https://mimir.example.com/api/v1/push # test with setting a different remote for the monitoring
 

diff --git a/operations/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-values.yaml b/operations/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-values.yaml
@@ -4,6 +4,7 @@ kubeVersionOverride: "1.20"
 metaMonitoring:
   grafanaAgent:
     metrics:
+      enabled: false
       # Leave the remote empty to use the default to send it to Mimir directly
       # remote: #
 

diff --git a/...g-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml b/...g-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
 data:
@@ -48,7 +48,7 @@ data:
     # Check if the bucket exists, by using the exit code of `mc ls`
     checkBucketExists() {
       BUCKET=$1
-      CMD=$(${MC} ls myminio/$BUCKET > /dev/null 2>&1)
+      CMD=$(${MC} stat myminio/$BUCKET > /dev/null 2>&1)
       return $?
     }
     

diff --git a/...monitoring-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml b/...monitoring-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
 spec:

diff --git a/...-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml b/...-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
 spec:
@@ -28,8 +28,8 @@ spec:
         app: minio
         release: keda-autoscaling-metamonitoring-values
       annotations:
-        checksum/secrets: 01b63763c5339c9382af3db71c156991073e1639beb76b1da5efef5aee1284e9
-        checksum/config: b9a834569278ffb212351e1d62c522d70beac8e03f98a2a1e19a8b5b1913a304
+        checksum/secrets: 28301a40d441e1dfdb8ee6e66247fa8728acb9c13f24d9fbb87681a401bcf082
+        checksum/config: 0abda6ee9d629199007eb003f9f4d967e7fa257f955d8a60f736054c88b603bb
     spec:
       securityContext:
         runAsUser: 1000
@@ -40,7 +40,7 @@ spec:
       serviceAccountName: minio-sa
       containers:
         - name: minio
-          image: "quay.io/minio/minio:RELEASE.2022-12-12T19-27-27Z"
+          image: "quay.io/minio/minio:RELEASE.2023-02-10T18-48-39Z"
           imagePullPolicy: IfNotPresent
           command:
             - "/bin/sh"

diff --git a/...ng-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml b/...ng-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio-post-job
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
   annotations:
@@ -32,7 +32,7 @@ spec:
                   name: keda-autoscaling-metamonitoring-values-minio
       containers:
         - name: minio-make-bucket
-          image: "quay.io/minio/mc:RELEASE.2022-12-13T00-23-28Z"
+          image: "quay.io/minio/mc:RELEASE.2023-01-28T20-29-38Z"
           imagePullPolicy: IfNotPresent
           command: [ "/bin/sh", "/config/initialize" ]
           env:
@@ -47,7 +47,7 @@ spec:
             requests:
               memory: 128Mi
         - name: minio-make-user
-          image: "quay.io/minio/mc:RELEASE.2022-12-13T00-23-28Z"
+          image: "quay.io/minio/mc:RELEASE.2023-01-28T20-29-38Z"
           imagePullPolicy: IfNotPresent
           command: [ "/bin/sh", "/config/add-user" ]
           env:

diff --git a/...scaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml b/...scaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
 spec:

diff --git a/...ing-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml b/...ing-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
 type: Opaque

diff --git a/...ing-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/service.yaml b/...ing-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/service.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-metamonitoring-values
     heritage: Helm
     monitoring: "true"

diff --git a/...ring-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml b/...ring-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml
@@ -5,10 +5,10 @@ kind: Deployment
 metadata:
   name: keda-autoscaling-metamonitoring-values-rollout-operator
   labels:
-    helm.sh/chart: rollout-operator-0.4.1
+    helm.sh/chart: rollout-operator-0.5.0
     app.kubernetes.io/name: rollout-operator
     app.kubernetes.io/instance: keda-autoscaling-metamonitoring-values
-    app.kubernetes.io/version: "v0.4.0"
+    app.kubernetes.io/version: "v0.5.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -43,7 +43,7 @@ spec:
               drop:
               - ALL
             readOnlyRootFilesystem: true
-          image: "grafana/rollout-operator:v0.4.0"
+          image: "grafana/rollout-operator:v0.5.0"
           imagePullPolicy: IfNotPresent
           args:
           - -kubernetes.namespace=citestns

diff --git a/...-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml b/...-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml
@@ -5,8 +5,8 @@ kind: ServiceAccount
 metadata:
   name: keda-autoscaling-metamonitoring-values-rollout-operator
   labels:
-    helm.sh/chart: rollout-operator-0.4.1
+    helm.sh/chart: rollout-operator-0.5.0
     app.kubernetes.io/name: rollout-operator
     app.kubernetes.io/instance: keda-autoscaling-metamonitoring-values
-    app.kubernetes.io/version: "v0.4.0"
+    app.kubernetes.io/version: "v0.5.0"
     app.kubernetes.io/managed-by: Helm
diff --git a/...autoscaling-metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/...autoscaling-metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -30,7 +30,6 @@ data:
     blocks_storage:
       backend: s3
       bucket_store:
-        max_chunk_pool_bytes: 12884901888
         sync_dir: /data/tsdb-sync
       s3:
         access_key_id: grafana-mimir
@@ -40,10 +39,13 @@ data:
         secret_access_key: supersecret
       tsdb:
         dir: /data/tsdb
+        head_compaction_interval: 15m
+        wal_replay_concurrency: 3
     compactor:
       compaction_interval: 30m
       data_dir: /data
       deletion_delay: 2h
+      first_level_compaction_wait_period: 25m
       max_closing_blocks_concurrency: 2
       max_opening_blocks_concurrency: 4
       sharding_ring:
@@ -104,6 +106,7 @@ data:
         kvstore:
           prefix: multi-zone/
         tokens_file_path: /data/tokens
+        unregister_on_shutdown: false
         wait_stability_min_duration: 1m
         zone_awareness_enabled: true
     usage_stats:

diff --git a/...-metamonitoring-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/...-metamonitoring-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml
@@ -7,7 +7,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keda-autoscaling-metamonitoring-values-mimir-make-minio-buckets
+  name: keda-autoscaling-metamonitoring-values-mimir-make-minio-buckets-5.0.7
   namespace: "citestns"
   labels:
     app: mimir-distributed-make-bucket-job
@@ -31,7 +31,7 @@ spec:
                 name: keda-autoscaling-metamonitoring-values-minio
       containers:
       - name: minio-mc
-        image: "quay.io/minio/mc:RELEASE.2022-12-13T00-23-28Z"
+        image: "quay.io/minio/mc:RELEASE.2023-01-28T20-29-38Z"
         imagePullPolicy: IfNotPresent
         command: ["/bin/sh", "/config/initialize"]
         env:

diff --git a/...ng-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/...ng-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml
@@ -44,6 +44,7 @@ data:
         "" "anonymous";
       }
     
+      proxy_read_timeout 300;
       server {
         listen 8080;
     

diff --git a/...oscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...oscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -42,7 +42,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
         - name: nginx
-          image: docker.io/nginxinc/nginx-unprivileged:1.22-alpine
+          image: docker.io/nginxinc/nginx-unprivileged:1.24-alpine
           imagePullPolicy: IfNotPresent
           ports:
             - name: http-metric

diff --git a/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -134,6 +134,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
+            - name: "GOMAXPROCS"
+              value: "5"
+            - name: "GOMEMLIMIT"
+              value: "536870912"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -271,6 +275,10 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
+            - name: "GOMAXPROCS"
+              value: "5"
+            - name: "GOMEMLIMIT"
+              value: "536870912"
           envFrom:
 ---
 # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -408,4 +416,8 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
           env:
+            - name: "GOMAXPROCS"
+              value: "5"
+            - name: "GOMEMLIMIT"
+              value: "536870912"
           envFrom:
diff --git a/...keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml b/...keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
 data:
@@ -48,7 +48,7 @@ data:
     # Check if the bucket exists, by using the exit code of `mc ls`
     checkBucketExists() {
       BUCKET=$1
-      CMD=$(${MC} ls myminio/$BUCKET > /dev/null 2>&1)
+      CMD=$(${MC} stat myminio/$BUCKET > /dev/null 2>&1)
       return $?
     }
     

diff --git a/...utoscaling-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml b/...utoscaling-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
 spec:

diff --git a/...eda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml b/...eda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
 spec:
@@ -28,8 +28,8 @@ spec:
         app: minio
         release: keda-autoscaling-values
       annotations:
-        checksum/secrets: a220721f5c6512741de2cb0f37783adba7c191521f6e341d91ab2755da1859f4
-        checksum/config: e0789c39ac9e475157d2e0ee17ef8d8304a65cc9dec5eabc58a2c05bbcb84a49
+        checksum/secrets: ad5993a7e4d30b5a0c97657da26a25ab263f49971adb3116fdf128d491f34cae
+        checksum/config: aab6c0ec21a5b2d9d2817815a8ea23049b6b9926193480fa61f799aa9389bc27
     spec:
       securityContext:
         runAsUser: 1000
@@ -40,7 +40,7 @@ spec:
       serviceAccountName: minio-sa
       containers:
         - name: minio
-          image: "quay.io/minio/minio:RELEASE.2022-12-12T19-27-27Z"
+          image: "quay.io/minio/minio:RELEASE.2023-02-10T18-48-39Z"
           imagePullPolicy: IfNotPresent
           command:
             - "/bin/sh"

diff --git a/.../keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml b/.../keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio-post-job
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
   annotations:
@@ -32,7 +32,7 @@ spec:
                   name: keda-autoscaling-values-minio
       containers:
         - name: minio-make-bucket
-          image: "quay.io/minio/mc:RELEASE.2022-12-13T00-23-28Z"
+          image: "quay.io/minio/mc:RELEASE.2023-01-28T20-29-38Z"
           imagePullPolicy: IfNotPresent
           command: [ "/bin/sh", "/config/initialize" ]
           env:
@@ -47,7 +47,7 @@ spec:
             requests:
               memory: 128Mi
         - name: minio-make-user
-          image: "quay.io/minio/mc:RELEASE.2022-12-13T00-23-28Z"
+          image: "quay.io/minio/mc:RELEASE.2023-01-28T20-29-38Z"
           imagePullPolicy: IfNotPresent
           command: [ "/bin/sh", "/config/add-user" ]
           env:

diff --git a/...tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml b/...tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
 spec:

diff --git a/...s/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml b/...s/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
 type: Opaque

diff --git a/...s/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/service.yaml b/...s/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/service.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "citestns"
   labels:
     app: minio
-    chart: minio-5.0.4
+    chart: minio-5.0.7
     release: keda-autoscaling-values
     heritage: Helm
     monitoring: "true"

diff --git a/...ling-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml b/...ling-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml
@@ -5,10 +5,10 @@ kind: Deployment
 metadata:
   name: keda-autoscaling-values-rollout-operator
   labels:
-    helm.sh/chart: rollout-operator-0.4.1
+    helm.sh/chart: rollout-operator-0.5.0
     app.kubernetes.io/name: rollout-operator
     app.kubernetes.io/instance: keda-autoscaling-values
-    app.kubernetes.io/version: "v0.4.0"
+    app.kubernetes.io/version: "v0.5.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -43,7 +43,7 @@ spec:
               drop:
               - ALL
             readOnlyRootFilesystem: true
-          image: "grafana/rollout-operator:v0.4.0"
+          image: "grafana/rollout-operator:v0.5.0"
           imagePullPolicy: IfNotPresent
           args:
           - -kubernetes.namespace=citestns

diff --git a/...-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml b/...-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml
@@ -5,8 +5,8 @@ kind: ServiceAccount
 metadata:
   name: keda-autoscaling-values-rollout-operator
   labels:
-    helm.sh/chart: rollout-operator-0.4.1
+    helm.sh/chart: rollout-operator-0.5.0
     app.kubernetes.io/name: rollout-operator
     app.kubernetes.io/instance: keda-autoscaling-values
-    app.kubernetes.io/version: "v0.4.0"
+    app.kubernetes.io/version: "v0.5.0"
     app.kubernetes.io/managed-by: Helm