From 6e2ff817880814c1108176018c7f481959219071 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 16 Jan 2025 17:17:48 +0100 Subject: [PATCH] chore(logging-apps): Fail deprecated loki-stack installations --- charts/logging-apps/Chart.yaml | 38 +------------------ charts/logging-apps/README.md | 2 +- charts/logging-apps/templates/loki-stack.yaml | 32 +--------------- 3 files changed, 4 insertions(+), 68 deletions(-) diff --git a/charts/logging-apps/Chart.yaml b/charts/logging-apps/Chart.yaml index 6bc9c1d2d..e1c5abc16 100644 --- a/charts/logging-apps/Chart.yaml +++ b/charts/logging-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: logging-apps description: Argo CD app-of-apps config for logging applications type: application -version: 0.35.0 +version: 0.35.1 home: https://github.com/adfinis/helm-charts/tree/main/charts/logging-apps sources: - https://github.com/adfinis/helm-charts @@ -18,38 +18,4 @@ annotations: artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - kind: changed - description: "[Loki 6.13.0] Correctly wrap ClusterRoleBinding around `rbac/namespaced` conditional" - - kind: fixed - description: "[Loki 6.13.0] Do not create bloom planner, bloom builder, bloom gateway Deployment/Statefulset if their replica count is 0" - - kind: fixed - description: "[Loki 6.13.0] Configure (ephemeral) storage for bloom builder working directory" - - kind: added - description: "[Loki 6.13.0] Automatically configure bloom planner address for bloom builders and bloom gateway addresses for bloom gateway clients" - - kind: added - description: "[Loki 6.14.0] Add additional service annotations for components in distributed mode" - - kind: fixed - description: "[Loki 6.14.0] Rename loki/templates/query-frontend/poddisruptionbudget-query-frontend.yaml to fix spelling mistake" - - kind: fixed - description: "[Loki 6.14.1] Fixed Memcached persistence options" - - kind: added - description: "[Loki 6.15.0] Allow setting annotations for memberlist and query-scheduler-discovery services" - - kind: added - description: "[Loki 6.15.0] Allow to customize `client_max_body_size` when using Loki Gateway" - - kind: added - description: "[Loki 6.16.0] Allow setting nodeSelector, tolerations and affinity to enterprise components (tokengen and provisioner)" - - kind: changed - description: "[Loki 6.17.0] Changed version of Grafana Loki to 3.2.0" - links: - - name: "Loki 3.2.0 Changelog" - url: "https://github.com/grafana/loki/blob/main/CHANGELOG.md#320-2024-09-18" - - kind: fixed - description: "[Loki 6.17.1] Added missing `loki.storage.azure.chunkDelimiter` parameter to Helm chart" - - kind: changed - description: "[Loki 6.18.0] Added automated weekly releases, which created this release" - - kind: added - description: "[Loki 6.19.0-weekly.227] Expose Topology Spread Constraints in Helm chart templates and default values" - - kind: changed - description: "[Loki 6.20.0] Changed version of Grafana Loki to 3.3.0" - links: - - name: "Loki 3.3.0 Changelog" - url: "https://github.com/grafana/loki/blob/main/CHANGELOG.md#330-2024-11-19" + description: Fail deprecated loki-stack installations diff --git a/charts/logging-apps/README.md b/charts/logging-apps/README.md index 68c3eb9d0..523f26fec 100644 --- a/charts/logging-apps/README.md +++ b/charts/logging-apps/README.md @@ -1,6 +1,6 @@ # logging-apps -![Version: 0.35.0](https://img.shields.io/badge/Version-0.35.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.35.1](https://img.shields.io/badge/Version-0.35.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Argo CD app-of-apps config for logging applications diff --git a/charts/logging-apps/templates/loki-stack.yaml b/charts/logging-apps/templates/loki-stack.yaml index 9cafbe83e..9d8d4ce5c 100644 --- a/charts/logging-apps/templates/loki-stack.yaml +++ b/charts/logging-apps/templates/loki-stack.yaml @@ -1,33 +1,3 @@ {{ if .Values.lokiStack.enabled }} -{{ template "argoconfig.application" (list . "logging-apps.lokiStack") }} +{{ fail "loki-stack is DEPRECATED, uuse `loki` and `promtail` individually" }} {{ end }} - -{{- define "logging-apps.lokiStack" -}}{{- $app := unset .Values.lokiStack "enabled" -}}{{- $name := default $app.destination.namespace $app.name -}} -metadata: - name: {{ template "common.fullname" . }}-{{ $name }} -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 -}}