Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(logging-apps): Fail deprecated loki-stack installations #1367

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions charts/logging-apps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.36.0
home: https://github.com/adfinis/helm-charts/tree/main/charts/logging-apps
sources:
- https://github.com/adfinis/helm-charts
Expand All @@ -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
2 changes: 1 addition & 1 deletion charts/logging-apps/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 1 addition & 31 deletions charts/logging-apps/templates/loki-stack.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,3 @@
{{ if .Values.lokiStack.enabled }}
{{ template "argoconfig.application" (list . "logging-apps.lokiStack") }}
{{ fail "loki-stack is DEPRECATED, use `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 -}}