diff --git a/operations/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-metamonitoring-values.yaml b/operations/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-metamonitoring-values.yaml index c352197b5c6..3d71844881d 100644 --- a/operations/helm/charts/mimir-distributed/ci/offline/keda-autoscaling-metamonitoring-values.yaml +++ b/operations/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 index 878539ada64..a49ac9f22b1 100644 --- 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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml index ccce34c6270..078f5c64ab5 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml index f80a3d00e7a..cc12b7039df 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml +++ b/operations/helm/tests/keda-autoscaling-metamonitoring-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml index 87d6090dc29..71447779a17 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml index 431081e3960..4c08cb3d25d 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml index ea2cd954f8c..2eab1143fba 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml index 230113052ab..caab297c662 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/service.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/service.yaml index 1b347d7e554..b1c71d89b9b 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/minio/templates/service.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml index 0d7f99535c1..b6c1dc241c6 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml +++ b/operations/helm/tests/keda-autoscaling-metamonitoring-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml index 4b368f10ca8..706ffec5382 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml +++ b/operations/helm/tests/keda-autoscaling-metamonitoring-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml index 9d17da46444..14cec8d98bc 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/keda-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index bf2ed2efd32..9678547aae0 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 9efadf9cd81..1e8149dad1e 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml index 31fb8bd6c04..8f7b61369fa 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index d134e4d8755..b6da323996c 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/keda-autoscaling-metamonitoring-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml index 8fda2afffcf..2fac0480fe3 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/configmap.yaml +++ b/operations/helm/tests/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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml index c066910e98e..4c2384b7b01 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/console-service.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml index a82c247f062..b80ad565cde 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/deployment.yaml +++ b/operations/helm/tests/keda-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml index ced0b3048ad..98e2726fe9e 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/post-job.yaml +++ b/operations/helm/tests/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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml index ffbc5da0e4a..3720e7df60b 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/pvc.yaml +++ b/operations/helm/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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml index 5cfc6e678fb..51d0e23f1f9 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/secrets.yaml +++ b/operations/helm/tests/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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/service.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/service.yaml index a76639be712..090c01ebbfe 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/minio/templates/service.yaml +++ b/operations/helm/tests/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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml index f1167491634..ecbff1aad1a 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/deployment.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml index 6d5ecc8b504..17d7d603137 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/charts/rollout_operator/templates/serviceaccount.yaml +++ b/operations/helm/tests/keda-autoscaling-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 diff --git a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/distributor/autoscaling.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/distributor/autoscaling.yaml index b504fbab912..b4530345bb7 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/distributor/autoscaling.yaml +++ b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/distributor/autoscaling.yaml @@ -33,14 +33,14 @@ spec: - metadata: metricName: cortex_distributor_cpu_hpa_default query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="distributor",namespace="citestns"}[5m]))[15m:]) * 1000 - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "80" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus - metadata: metricName: cortex_distributor_memory_hpa_default query: max_over_time(sum(container_memory_working_set_bytes{container="distributor",namespace="citestns"})[15m:]) - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "429496729" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus diff --git a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/mimir-config.yaml index ab050edd0cb..8530a89f169 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index 4399d581797..858eaa7885f 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml @@ -7,7 +7,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: keda-autoscaling-values-mimir-make-minio-buckets + name: keda-autoscaling-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-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index afa83ec155c..d258774dc0e 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml index 0c3ef5d460b..8dfb05fc14d 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/querier/autoscaling.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/querier/autoscaling.yaml index 730cab473bb..679ee75ff28 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/querier/autoscaling.yaml +++ b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/querier/autoscaling.yaml @@ -33,7 +33,7 @@ spec: - metadata: metricName: cortex_querier_hpa_default query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="query-scheduler",namespace="citestns",quantile="0.75"}[5m])) - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "6" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus diff --git a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/query-frontend/autoscaling.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/query-frontend/autoscaling.yaml index 63547e79418..d22384bf2b0 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/query-frontend/autoscaling.yaml +++ b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/query-frontend/autoscaling.yaml @@ -32,14 +32,14 @@ spec: - metadata: metricName: query_frontend_cpu_hpa_default query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="query-frontend",namespace="citestns"}[5m]))[15m:]) * 1000 - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "80" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus - metadata: metricName: query_frontend_memory_hpa_default query: max_over_time(sum(container_memory_working_set_bytes{container="query-frontend",namespace="citestns"})[15m:]) - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "107374182" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus diff --git a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/ruler/autoscaling.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/ruler/autoscaling.yaml index 73ae8ddbff2..ce9e2458a4a 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/ruler/autoscaling.yaml +++ b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/ruler/autoscaling.yaml @@ -33,14 +33,14 @@ spec: - metadata: metricName: ruler_cpu_hpa_default query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="ruler",namespace="citestns"}[5m]))[15m:]) * 1000 - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "80" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus - metadata: metricName: ruler_memory_hpa_default query: max_over_time(sum(container_memory_working_set_bytes{container="ruler",namespace="citestns"})[15m:]) - serverAddress: + serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus threshold: "107374182" customHeaders: "X-Scope-OrgID=tenant-1" type: prometheus diff --git a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index 895f9b336b1..07ab3e52a7f 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/keda-autoscaling-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: