From 322894e63dbecefacb5d7eec0ce8cfe0ea5d22e6 Mon Sep 17 00:00:00 2001 From: williamzelesny <41495262+williamzelesny@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:32:19 -0400 Subject: [PATCH] Upgrade alpine to 3.16.0 (#2028) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade alpine to 3.16.0 * Enhance MimirRequestLatency runbook with more advice (#1967) * Enhance MimirRequestLatency runbook with more advice Signed-off-by: Arve Knudsen Co-authored-by: Marco Pracucci * Include helm-docs in build and CI (#2026) * Update the mimir build image and its build doc Dockerfile: Add helm-docs package to the image. how-to: Write down the requirements for build in more detail. Add information about build on linux. Signed-off-by: György Krajcsovits * Expand make doc with helm-docs command This enables generating the helm chart README with the same make doc command as all other documentation. Signed-off-by: György Krajcsovits * Update docs/internal/how-to-update-the-build-image.md Co-authored-by: Dimitar Dimitrov * Update contributing guides for the helm chart (#2008) * Update contributing guides for the helm chart Signed-off-by: György Krajcsovits * Turn off helm version increment check in CI This enables periodic releases, as opposed to requiring version bump for release at every PR. Signed-off-by: György Krajcsovits * Add extraEnvFrom to all services and enable injection into mimir config (#2017) Add `extraEnvFrom` capability to all Mimir services to enable injecting secrets via environment variables. Enable `-config.exand-env=true` option in all Mimir services to be able to take secrets/settings from the environment and inject them into the Mimir configuration file. Signed-off-by: György Krajcsovits * Docs: fix mimir-mixin installation instructions (#2015) Signed-off-by: Marco Pracucci * Docs: make documentation a first class citizen in CHANGELOG (#2025) Signed-off-by: Marco Pracucci * upgrade to alpine 3.16.0 * upgrade alpine to 3.16.0 Co-authored-by: Arve Knudsen Co-authored-by: Marco Pracucci Co-authored-by: George Krajcsovits Co-authored-by: Dimitar Dimitrov --- CHANGELOG.md | 3 ++- cmd/metaconvert/Dockerfile | 2 +- cmd/mimir-continuous-test/Dockerfile | 2 +- cmd/mimir/Dockerfile | 2 +- cmd/mimirtool/Dockerfile | 2 +- cmd/query-tee/Dockerfile | 2 +- .../tsdb-blocks-storage-s3-single-binary/dev.dockerfile | 2 +- development/tsdb-blocks-storage-s3/dev.dockerfile | 2 +- .../tsdb-blocks-storage-swift-single-binary/dev.dockerfile | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e196b024b20..1b09823eb93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,17 +14,18 @@ - `-querier.query-store-after` * [CHANGE] Config flag category overrides can be set dynamically at runtime. #1934 * [CHANGE] Ingester: deprecated `-ingester.ring.join-after`. Mimir now behaves as this setting is always set to 0s. This configuration option will be removed in Mimir 2.4.0. #1965 +* [CHANGE] Blocks uploaded by ingester no longer contain `__org_id__` label. Compactor now ignores this label and will compact blocks with and without this label together. `mimirconvert` tool will remove the label from blocks as "unknown" label. #1972 * [ENHANCEMENT] Distributor: Added limit to prevent tenants from sending excessive number of requests: #1843 * The following CLI flags (and their respective YAML config options) have been added: * `-distributor.request-rate-limit` * `-distributor.request-burst-limit` * The following metric is exposed to tell how many requests have been rejected: * `cortex_discarded_requests_total` -* [CHANGE] Blocks uploaded by ingester no longer contain `__org_id__` label. Compactor now ignores this label and will compact blocks with and without this label together. `mimirconvert` tool will remove the label from blocks as "unknown" label. #1972 * [ENHANCEMENT] Store-gateway: Add the experimental ability to run requests in a dedicated OS thread pool. This feature can be configured using `-store-gateway.thread-pool-size` and is disabled by default. Replaces the ability to run index header operations in a dedicated thread pool. #1660 #1812 * [ENHANCEMENT] Improved error messages to make them easier to understand; each now have a unique, global identifier that you can use to look up in the runbooks for more information. #1907 #1919 #1888 #1939 #1984 * [ENHANCEMENT] Memberlist KV: incoming messages are now processed on per-key goroutine. This may reduce loss of "maintanance" packets in busy memberlist installations, but use more CPU. New `memberlist_client_received_broadcasts_dropped_total` counter tracks number of dropped per-key messages. #1912 * [ENHANCEMENT] Blocks Storage, Alertmanager, Ruler: add support a prefix to the bucket store (`*_storage.storage_prefix`). This enables using the same bucket for the three components. #1686 #1951 +* [ENHANCEMENT] Upgrade Docker base images to `alpine:3.16.0`. #2028 * [BUGFIX] Fix regexp parsing panic for regexp label matchers with start/end quantifiers. #1883 * [BUGFIX] Ingester: fixed deceiving error log "failed to update cached shipped blocks after shipper initialisation", occurring for each new tenant in the ingester. #1893 * [BUGFIX] Ring: fix bug where instances may appear unhealthy in the hash ring web UI even though they are not. #1933 diff --git a/cmd/metaconvert/Dockerfile b/cmd/metaconvert/Dockerfile index 4acc3391f57..d88d58440e6 100644 --- a/cmd/metaconvert/Dockerfile +++ b/cmd/metaconvert/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN apk add --no-cache ca-certificates # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. ARG TARGETOS diff --git a/cmd/mimir-continuous-test/Dockerfile b/cmd/mimir-continuous-test/Dockerfile index 3f26c8e951a..42aaf8e5c2e 100644 --- a/cmd/mimir-continuous-test/Dockerfile +++ b/cmd/mimir-continuous-test/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-only -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN apk add --no-cache ca-certificates # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. ARG TARGETOS diff --git a/cmd/mimir/Dockerfile b/cmd/mimir/Dockerfile index d813a84617d..a7f195948ed 100644 --- a/cmd/mimir/Dockerfile +++ b/cmd/mimir/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN apk add --no-cache ca-certificates # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. ARG TARGETOS diff --git a/cmd/mimirtool/Dockerfile b/cmd/mimirtool/Dockerfile index 55a6257353a..0f797e6ce8b 100644 --- a/cmd/mimirtool/Dockerfile +++ b/cmd/mimirtool/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN apk add --no-cache ca-certificates # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. ARG TARGETOS diff --git a/cmd/query-tee/Dockerfile b/cmd/query-tee/Dockerfile index 8b039303f88..008e65e6637 100644 --- a/cmd/query-tee/Dockerfile +++ b/cmd/query-tee/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN apk add --no-cache ca-certificates # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. ARG TARGETOS diff --git a/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile index 865216008c3..7844498ee10 100644 --- a/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15.4 +FROM alpine:3.16 RUN mkdir /mimir WORKDIR /mimir diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile index facd2333a0c..efa0fbd145a 100644 --- a/development/tsdb-blocks-storage-s3/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3/dev.dockerfile @@ -2,7 +2,7 @@ FROM golang:1.17.8 ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.7.3 -FROM alpine:3.15.4 +FROM alpine:3.16 RUN mkdir /mimir WORKDIR /mimir diff --git a/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile index 1a7db8a45d8..dd3d067f8cc 100644 --- a/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile +++ b/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15.0 +FROM alpine:3.16.0 RUN mkdir /mimir WORKDIR /mimir