Merge pull request #65 from Footur/helm-chart-release-v0.4.2

Release the Helm Chart in v0.4.2

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

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)

docs/index.yaml

@@ -1,9 +1,21 @@
 apiVersion: v1
 entries:
   cortex-tenant:
+  - apiVersion: v2
+    appVersion: 1.13.0
+    created: "2024-01-30T14:28:03.395360787Z"
+    description: A Helm Chart for cortex-tenant
+    digest: f2b3499377fd5a34c6893e67ab79854c5c8c835b229a7cc7a67e0666cca9ab29
+    name: cortex-tenant
+    sources:
+    - https://github.com/blind-oracle/cortex-tenant
+    type: application
+    urls:
+    - cortex-tenant-0.4.2.tgz
+    version: 0.4.2
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-11-15T23:28:52.818836+03:00"
+    created: "2024-01-30T14:28:03.394653386Z"
     description: A Helm Chart for cortex-tenant
     digest: 60131d246dca1ead2fea8a2c188f25a5fe3c4d90368ba091a4bd0e4e8e6dcceb
     name: cortex-tenant
@@ -15,7 +27,7 @@ entries:
     version: 0.4.0
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-11-15T23:28:52.817654+03:00"
+    created: "2024-01-30T14:28:03.393982085Z"
     description: A Helm Chart for cortex-tenant
     digest: 56abb06ce3f646b94932d36b0d4ed5e5386ec390ebfd7d9110036291086d6f39
     name: cortex-tenant
@@ -25,7 +37,7 @@ entries:
     version: 0.3.2
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-08-24T12:48:05.910756+02:00"
+    created: "2024-01-30T14:28:03.393404328Z"
     description: A Helm Chart for cortex-tenant
     digest: 834b006e449ae97219799bfa3b7bd274aa386978802dbd49279258f534cc4da5
     name: cortex-tenant
@@ -35,7 +47,7 @@ entries:
     version: 0.3.1
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-08-24T12:48:05.909019+02:00"
+    created: "2024-01-30T14:28:03.392861087Z"
     description: A Helm Chart for cortex-tenant
     digest: cf12ab22dd0973e94e15d8246f66ae35738dadfc489952f919ed326a1f7eed5a
     name: cortex-tenant
@@ -45,7 +57,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-08-24T12:48:05.907357+02:00"
+    created: "2024-01-30T14:28:03.392305224Z"
     description: A Helm Chart for cortex-tenant
     digest: c967d4dea6ff8ae827133876f588d22bfa51d10168e4bca57f161b7ab6097c7c
     name: cortex-tenant
@@ -55,7 +67,7 @@ entries:
     version: 0.2.1
   - apiVersion: v2
     appVersion: 1.11.0
-    created: "2023-08-24T12:48:05.903241+02:00"
+    created: "2024-01-30T14:28:03.391835068Z"
     description: A Helm Chart for cortex-tenant
     digest: 8b9caea0e1774a6c8f3e627a63386f532498ca5f410927c702380692e5d20b61
     name: cortex-tenant
@@ -65,12 +77,12 @@ entries:
     version: 0.2.0
   - apiVersion: v2
     appVersion: 1.10.1
-    created: "2023-08-24T12:48:05.902166+02:00"
+    created: "2024-01-30T14:28:03.391370768Z"
     description: A Helm Chart for cortex-tenant
     digest: eabef3ad16e555543e32d9308994f76679e5fa54371cccd3957112f33a28a59e
     name: cortex-tenant
     type: application
     urls:
     - cortex-tenant-0.1.0.tgz
     version: 0.1.0
-generated: "2023-11-15T23:28:52.81508+03:00"
+generated: "2024-01-30T14:28:03.390752796Z"