diff --git a/charts/infra-apps/Chart.yaml b/charts/infra-apps/Chart.yaml index e08a6eccf..8665c7c8d 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.167.0 +version: 0.168.0 home: https://github.com/adfinis/helm-charts/tree/main/charts/infra-apps sources: - https://github.com/adfinis/helm-charts diff --git a/charts/infra-apps/README.md b/charts/infra-apps/README.md index 503c47ac6..73ac91d84 100644 --- a/charts/infra-apps/README.md +++ b/charts/infra-apps/README.md @@ -1,6 +1,6 @@ # infra-apps -![Version: 0.167.0](https://img.shields.io/badge/Version-0.167.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.168.0](https://img.shields.io/badge/Version-0.168.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 diff --git a/charts/infra-apps/ci/default-values.yaml b/charts/infra-apps/ci/default-values.yaml index f1551a369..42b645620 100644 --- a/charts/infra-apps/ci/default-values.yaml +++ b/charts/infra-apps/ci/default-values.yaml @@ -21,11 +21,6 @@ rbacManager: enabled: true values: TODO: add values in values.yaml -thanos: - enabled: true - values: - persistence: - enabled: false kured: enabled: true kubeEventExporter: diff --git a/charts/infra-apps/templates/thanos.yaml b/charts/infra-apps/templates/thanos.yaml index 302353264..09022fcdf 100644 --- a/charts/infra-apps/templates/thanos.yaml +++ b/charts/infra-apps/templates/thanos.yaml @@ -1,37 +1,3 @@ {{ if .Values.thanos.enabled }} -{{ template "argoconfig.application" (list . "infra-apps.thanos") }} +{{ fail "thanos is DEPRECATED, use mimir instead" }} {{ end }} - -{{- define "infra-apps.thanos" -}}{{- $app := unset .Values.thanos "enabled" -}}{{- $name := default $app.namespace $app.name -}} -metadata: - name: {{ template "common.fullname" . }}-{{ $name }} - {{- with $app.annotations }} - annotations: - {{ toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if $app.project }} - project: {{ $app.project | quote }} - {{- end }} - source: - repoURL: {{ $app.repoURL | quote }} - chart: {{ $app.chart | quote }} - targetRevision: {{ $app.targetRevision | quote }} - helm: - releaseName: {{ $name | quote }} - values: |- - nameOverride: {{ $name | quote }} - {{- $app.values | toYaml | nindent 8 }} - {{- if $app.destination }} - destination: - {{ $app.destination | toYaml | nindent 4 }} - {{- end }} - {{- if $app.syncPolicy }} - syncPolicy: - {{ $app.syncPolicy | toYaml | nindent 4 }} - {{- end }} - {{- if $app.ignoreDifferences }} - ignoreDifferences: - {{ $app.ignoreDifferences | toYaml | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/docs/argocd-app-of-apps.md b/docs/argocd-app-of-apps.md index ad23a5f31..d85745941 100644 --- a/docs/argocd-app-of-apps.md +++ b/docs/argocd-app-of-apps.md @@ -163,7 +163,7 @@ Once we are ready to fully remove it we replace the components template with a ` ```yaml {{ if .Values.component.enabled }} -{{ fail("component is DEPRECATED, use "improved solution" instead") }} +{{ fail "component is DEPRECATED, use improved solution instead" }} {{ end }} ```