From 8b2e44c56e748a8e4cbb7fe16cd5642a429087bf Mon Sep 17 00:00:00 2001 From: Tim Bultmann Date: Tue, 30 Jan 2024 14:49:56 +0100 Subject: [PATCH] Release the Helm Chart in v0.4.2 --- deploy/k8s/chart/Chart.yaml | 2 +- deploy/k8s/chart/README.md | 6 ++++-- docs/cortex-tenant-0.4.2.tgz | Bin 0 -> 9686 bytes docs/index.yaml | 28 ++++++++++++++++++++-------- 4 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 docs/cortex-tenant-0.4.2.tgz diff --git a/deploy/k8s/chart/Chart.yaml b/deploy/k8s/chart/Chart.yaml index 8717cc3..b806040 100644 --- a/deploy/k8s/chart/Chart.yaml +++ b/deploy/k8s/chart/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: A Helm Chart for cortex-tenant name: cortex-tenant version: 0.4.2 # This is the chart version -appVersion: 1.12.5 # version number of the application being deployed. +appVersion: 1.13.0 # version number of the application being deployed. type: application sources: - https://github.com/blind-oracle/cortex-tenant diff --git a/deploy/k8s/chart/README.md b/deploy/k8s/chart/README.md index 6bcdb9d..973e610 100644 --- a/deploy/k8s/chart/README.md +++ b/deploy/k8s/chart/README.md @@ -1,6 +1,6 @@ # cortex-tenant -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square) +![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.0](https://img.shields.io/badge/AppVersion-1.13.0-informational?style=flat-square) A Helm Chart for cortex-tenant @@ -36,8 +36,10 @@ A Helm Chart for cortex-tenant | config.tenant.default | string | `"cortex-tenant-default"` | Which tenant ID to use if the label is missing in any of the timeseries If this is not set or empty then the write request with missing tenant label will be rejected with HTTP code 400 (env: `CT_TENANT_DEFAULT`) | | config.tenant.header | string | `"X-Scope-OrgID"` | To which header to add the tenant ID (env: `CT_TENANT_HEADER`) | | config.tenant.label | string | `"tenant"` | Which label to look for the tenant information (env: `CT_TENANT_LABEL`) | +| config.tenant.label_list | list | `[]` | List of labels examined for tenant information. If set takes precedent over `label` (env: `CT_TENANT_LABEL_LIST`) | | config.tenant.label_remove | bool | `false` | Whether to remove the tenant label from the request (env: `CT_TENANT_LABEL_REMOVE`) | | config.tenant.prefix | string | `""` | Optional hard-coded prefix with delimeter for all tenant values. Delimeters allowed for use: https://grafana.com/docs/mimir/latest/configure/about-tenant-ids/ (env: `CT_TENANT_PREFIX`) | +| config.tenant.prefix_prefer_source | bool | `false` | If true will use the tenant ID of the inbound request as the prefix of the new tenant id. Will be automatically suffixed with a `-` character. Example: Prometheus forwards metrics with `X-Scope-OrgID: Prom-A` set in the inbound request. This would result in the tenant prefix being set to `Prom-A-`. (env: `CT_TENANT_PREFIX_PREFER_SOURCE`) | | config.timeout | string | `"10s"` | HTTP request timeout (env: `CT_TIMEOUT`) | | config.timeout_shutdown | string | `"10s"` | Timeout to wait on shutdown to allow load balancers detect that we're going away. During this period after the shutdown command the /alive endpoint will reply with HTTP 503. Set to 0s to disable. (env: `CT_TIMEOUT_SHUTDOWN`) | | envs | list | `[]` | Additional environment variables | @@ -76,4 +78,4 @@ A Helm Chart for cortex-tenant | tolerations | list | `[]` | [Taints and Tolerations](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) +Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0) diff --git a/docs/cortex-tenant-0.4.2.tgz b/docs/cortex-tenant-0.4.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..64ac72cdc4fa07013a464d2b7a3c1f21b054fc66 GIT binary patch literal 9686 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