Merge branch 'master' into ruler-alertmanager-sidecar

Author: elliesaber

.helmignore

@@ -5,3 +5,4 @@ docs
 tools
 ct.yaml
 ci
+README.md.gotmpl

CHANGELOG.md

@@ -3,8 +3,10 @@
 ## master / unreleased
 
 * [FEATURE] Support dynamic configuration of Ruler and AlertManager using sidecar #150
+## 0.5.0 / 2021-06-08
+
 * [CHANGE] **Labels has been updated to latest best practices**. This means that **you cannot do a rolling update from an older version of this chart**. Either change the labels of your existing deployment by hand to make the transition as seamless as possible or uninstall the old release and install the new release with a short downtime. #144
-* [CHANGE] Minimum Kubernetes Version of this Chart is now 1.18 #144
+* [CHANGE] Minimum Kubernetes Version of this Chart is now 1.19 #144
 * [CHANGE] A new dedicated service is now available for the memberlist. Check `config.memberlist.join_members` in the default `values.yaml` for more information. #144
 * [CHANGE] Ingress is now disabled by default. You can re-enable it by setting `ingress.enabled` to `true` #144
 * [CHANGE] Configs is now disabled by default. You can re-enable it by setting `configs.enabled` to `true` #144
@@ -21,6 +23,7 @@
 
 ## 0.4.1 / 2021-03-22
 
+* [BUGFIX] Fix dependencies in charts dir to reflect recent update in 0.4.0 #139
 
 ## 0.4.0 / 2021-03-01
 

Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
-version: 0.4.1
+version: 0.5.0
 appVersion: v1.9.0
-description: 'Cortex'
+description: 'Horizontally scalable, highly available, multi-tenant, long term Prometheus.'
 home: https://cortexmetrics.io/
 icon: https://avatars2.githubusercontent.com/u/43045022?s=200&v=4
 kubeVersion: ^1.19.0-0

README.md

@@ -0,0 +1,73 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+## Dependencies
+
+### Key-Value store
+
+Cortex requires an externally provided key-value store, such as [etcd](https://etcd.io/) or [Consul](https://www.consul.io/).
+
+Both services can be installed alongside Cortex, for example using helm charts available [here](https://github.com/bitnami/charts/tree/master/bitnami/etcd) and [here](https://github.com/helm/charts/tree/master/stable/consul).
+
+### Storage
+
+Cortex requires a storage backend to store metrics and indexes.
+See [cortex documentation](https://cortexmetrics.io/docs/) for details on storage types and documentation
+
+## Installation
+
+[Helm](https://helm.sh) must be installed to use the charts.
+Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
+
+Once Helm is set up properly, add the repo as follows:
+
+```bash
+  helm repo add cortex-helm https://cortexproject.github.io/cortex-helm-chart
+```
+
+Cortex can now be installed with the following command:
+
+```bash
+  helm install cortex --namespace cortex cortex-helm/cortex
+```
+
+If you have custom options or values you want to override:
+
+```bash
+  helm install cortex --namespace cortex -f my-cortex-values.yaml cortex-helm/cortex
+```
+
+Specific versions of the chart can be installed using the `--version` option, with the default being the latest release.
+What versions are available for installation can be listed with the following command:
+
+```bash
+  helm search repo cortex-helm
+```
+
+As part of this chart many different pods and services are installed which all
+have varying resource requirements. Please make sure that you have sufficient
+resources (CPU/memory) available in your cluster before installing Cortex Helm
+chart.
+
+
+## Upgrades
+
+To upgrade Cortex use the following command:
+
+```bash
+  helm upgrade cortex -f my-cortex-values.yaml cortex-helm/cortex
+```
+
+Source code can be found [here](https://cortexmetrics.io/)
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}

README.md.gotmpl

@@ -1,9 +1,66 @@
 apiVersion: v1
 entries:
   cortex:
+  - apiVersion: v2
+    appVersion: v1.9.0
+    created: "2021-06-08T10:30:58.898750613+02:00"
+    dependencies:
+    - alias: memcached
+      condition: memcached.enabled
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      version: 5.5.1
+    - alias: memcached-index-read
+      condition: memcached-index-read.enabled
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      version: 5.5.1
+    - alias: memcached-index-write
+      condition: memcached-index-write.enabled
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      version: 5.5.1
+    - alias: memcached-frontend
+      condition: memcached-frontend.enabled
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      version: 5.5.1
+    - alias: memcached-blocks-index
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      tags:
+      - blocks-storage-memcached
+      version: 5.5.1
+    - alias: memcached-blocks
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      tags:
+      - blocks-storage-memcached
+      version: 5.5.1
+    - alias: memcached-blocks-metadata
+      name: memcached
+      repository: https://charts.bitnami.com/bitnami
+      tags:
+      - blocks-storage-memcached
+      version: 5.5.1
+    description: Horizontally scalable, highly available, multi-tenant, long term
+      Prometheus.
+    digest: e0e77c0ad09b3f1e56e6d13ab1382f95ac32ea1d56944597f94bdacbe8fdf3d2
+    home: https://cortexmetrics.io/
+    icon: https://avatars2.githubusercontent.com/u/43045022?s=200&v=4
+    kubeVersion: ^1.19.0-0
+    maintainers:
+    - email: [email protected]
+      name: Cortex Maintainers
+    name: cortex
+    sources:
+    - https://github.com/cortexproject/cortex-helm-chart
+    urls:
+    - https://cortexproject.github.io/cortex-helm-chart/cortex-0.5.0.tgz
+    version: 0.5.0
   - apiVersion: v2
     appVersion: v1.7.0
-    created: "2021-03-22T10:00:42.83263-07:00"
+    created: "2021-06-08T10:30:58.895139082+02:00"
     dependencies:
     - alias: memcached
       condition: memcached.enabled
@@ -59,7 +116,7 @@ entries:
     version: 0.4.1
   - apiVersion: v2
     appVersion: v1.7.0
-    created: "2021-03-22T10:00:42.826948-07:00"
+    created: "2021-06-08T10:30:58.891779477+02:00"
     dependencies:
     - alias: memcached
       condition: memcached.enabled
@@ -115,7 +172,7 @@ entries:
     version: 0.4.0
   - apiVersion: v2
     appVersion: v1.6.0
-    created: "2021-03-22T10:00:42.821423-07:00"
+    created: "2021-06-08T10:30:58.887937988+02:00"
     dependencies:
     - alias: memcached
       condition: memcached.enabled
@@ -171,7 +228,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: v1.4.0
-    created: "2021-03-22T10:00:42.816383-07:00"
+    created: "2021-06-08T10:30:58.883272548+02:00"
     dependencies:
     - alias: memcached
       condition: memcached.enabled
@@ -202,4 +259,4 @@ entries:
     urls:
     - https://cortexproject.github.io/cortex-helm-chart/cortex-0.2.0.tgz
     version: 0.2.0
-generated: "2021-03-22T10:00:42.80009-07:00"
+generated: "2021-06-08T10:30:58.873137315+02:00"