diff --git a/charts/infra-apps/Chart.yaml b/charts/infra-apps/Chart.yaml index 3e8a13bb3..e8b89cea2 100644 --- a/charts/infra-apps/Chart.yaml +++ b/charts/infra-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: infra-apps description: Argo CD app-of-apps config for infrastructure components type: application -version: 0.214.0 +version: 0.215.0 home: https://github.com/adfinis/helm-charts/tree/main/charts/infra-apps sources: - https://github.com/adfinis/helm-charts @@ -18,22 +18,4 @@ annotations: artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/changes: | - kind: changed - description: "fix: Update Argo CD from 2.11.3 to 2.11.4" - links: - - name: "Release Notes" - url: https://github.com/argoproj/argo-cd/releases/tag/v2.11.4 - - kind: changed - description: "chore: Update Argo CD chart from 7.2.0 to 7.3.5" - links: - - name: "fix: Default repo-server init container resources to empty" - url: https://github.com/argoproj/argo-helm/pull/2786 - - name: "feat: make PrometheusRule deployment conditional on CRD existing" - url: https://github.com/argoproj/argo-helm/pull/2791 - - name: "chore: add shard option for clusterCredentials" - url: https://github.com/argoproj/argo-helm/pull/2779 - - name: "feat: add support for passing redis - sentinel credentials" - url: https://github.com/argoproj/argo-helm/pull/2492 - - name: "fix: Make REDIS_PASSWORD environment variables optional always" - url: https://github.com/argoproj/argo-helm/pull/2800 - - name: "fix: Address oversights of feature namespaceOverride" - url: https://github.com/argoproj/argo-helm/pull/2821 + description: "feat: Remove thanos after 12 months of being disabled' diff --git a/charts/infra-apps/README.md b/charts/infra-apps/README.md index cd5226bd2..6640b07d1 100644 --- a/charts/infra-apps/README.md +++ b/charts/infra-apps/README.md @@ -1,6 +1,6 @@ # infra-apps -![Version: 0.214.0](https://img.shields.io/badge/Version-0.214.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.215.0](https://img.shields.io/badge/Version-0.215.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Argo CD app-of-apps config for infrastructure components @@ -98,14 +98,6 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | rbacManager.repoURL | string | [repo](https://charts.fairwinds.com/stable) | Repo URL | | rbacManager.targetRevision | string | `"1.20.0"` | [rbac-manager operator Helm chart](https://github.com/FairwindsOps/charts/tree/master/stable/rbac-manager) version | | rbacManager.values | object | [upstream values](https://github.com/FairwindsOps/charts/blob/master/stable/rbac-manager/values.yaml) | Helm values | -| thanos | object | DEPRECATED | [Thanos](https://thanos.io/) is DEPRECATED, use mimir instead | -| thanos.annotations | object | `{}` | Annotations for Thanos app | -| thanos.chart | string | `"thanos"` | Chart | -| thanos.destination.namespace | string | `"infra-monitoring"` | Namespace | -| thanos.enabled | bool | `false` | Enable Thanos | -| thanos.repoURL | string | [repo](https://charts.bitnami.com/bitnami) | Repo URL | -| thanos.targetRevision | string | `"11.5.*"` | [Thanos Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/thanos) | -| thanos.values | object | [upstream values](https://github.com/bitnami/charts/blob/master/bitnami/thanos/values.yaml) | Helm values | | velero | object | [example](./examples/velero.yaml) | [Velero](https://velero.io/) | | velero.annotations | object | `{}` | Annotations for Velero app | | velero.chart | string | `"velero"` | Chart | diff --git a/charts/infra-apps/examples/thanos.yaml b/charts/infra-apps/examples/thanos.yaml deleted file mode 100644 index ac35eb7a4..000000000 --- a/charts/infra-apps/examples/thanos.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Deploy Thanos -# -# This takes care of deploying Thanos' store gateway, query frontend, and receiver. -# Usually the prometheus-operator from kube-prometheus-stack will deploy -# ThanosRulers and sidecars to complete the stack. - -thanos: - enabled: true - values: - objstoreConfig: - # configure minio client lib for S3 and other S3 compatible endpoints - type: S3 - config: - region: "" - bucket: "" - endpoint: "" - access_key: "" - secret_key: "" - # on production, use a secret to not leak S3 credentials - # existingObjstoreSecret: thanos-objstore-secret - storegateway: - enabled: true - queryFrontend: - ingress: - enabled: true - hostname: thanos.example.com - receive: - enabled: true - # for demo purposes you can use the minio subchart: - minio: - enabled: false diff --git a/charts/infra-apps/templates/thanos.yaml b/charts/infra-apps/templates/thanos.yaml deleted file mode 100644 index 09022fcdf..000000000 --- a/charts/infra-apps/templates/thanos.yaml +++ /dev/null @@ -1,3 +0,0 @@ -{{ if .Values.thanos.enabled }} -{{ fail "thanos is DEPRECATED, use mimir instead" }} -{{ end }} diff --git a/charts/infra-apps/values.yaml b/charts/infra-apps/values.yaml index 0b0ab4ee4..f94a0629c 100644 --- a/charts/infra-apps/values.yaml +++ b/charts/infra-apps/values.yaml @@ -161,28 +161,6 @@ rbacManager: # @default -- [upstream values](https://github.com/FairwindsOps/charts/blob/master/stable/rbac-manager/values.yaml) values: {} -# -- [Thanos](https://thanos.io/) is DEPRECATED, use mimir instead -# @default -- DEPRECATED -thanos: - # -- Enable Thanos - enabled: false - name: thanos - # -- Annotations for Thanos app - annotations: {} - destination: - # -- Namespace - namespace: infra-monitoring - # -- Repo URL - # @default -- [repo](https://charts.bitnami.com/bitnami) - repoURL: https://charts.bitnami.com/bitnami - # -- Chart - chart: thanos - # -- [Thanos Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/thanos) - targetRevision: 11.5.* - # -- Helm values - # @default -- [upstream values](https://github.com/bitnami/charts/blob/master/bitnami/thanos/values.yaml) - values: {} - # -- [Velero](https://velero.io/) # @default -- [example](./examples/velero.yaml) velero: