From c34fc2edc0ff099c8c49cfd13a5a384191cbe073 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Fri, 29 Apr 2022 14:56:11 -0600 Subject: [PATCH 1/2] Deprecates enterprise-logs-simple Signed-off-by: Trevor Whitney --- charts/enterprise-logs-simple/CHANGELOG.md | 16 ---------------- charts/enterprise-logs-simple/Chart.yaml | 5 +++-- charts/enterprise-logs-simple/README.md | 5 +++++ .../enterprise-logs-simple/templates/NOTES.txt | 2 ++ charts/enterprise-logs-simple/values.yaml | 2 ++ 5 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 charts/enterprise-logs-simple/CHANGELOG.md create mode 100644 charts/enterprise-logs-simple/templates/NOTES.txt diff --git a/charts/enterprise-logs-simple/CHANGELOG.md b/charts/enterprise-logs-simple/CHANGELOG.md deleted file mode 100644 index b4a900806a..0000000000 --- a/charts/enterprise-logs-simple/CHANGELOG.md +++ /dev/null @@ -1,16 +0,0 @@ -# Changelog - -All notable changes to this library will be documented in this file. - -Entries should be ordered as follows: - -- [CHANGE] -- [FEATURE] -- [ENHANCEMENT] -- [BUGFIX] - -Entries should include a reference to the pull request that introduced the change. - -## 1.0.0 - -* [FEATURE] Initial version of the `enterprise-logs-simple` (GEL) Helm chart. #1123 diff --git a/charts/enterprise-logs-simple/Chart.yaml b/charts/enterprise-logs-simple/Chart.yaml index 78bdc35698..a27734a78b 100644 --- a/charts/enterprise-logs-simple/Chart.yaml +++ b/charts/enterprise-logs-simple/Chart.yaml @@ -2,9 +2,10 @@ apiVersion: "v2" name: "enterprise-logs-simple" type: application version: "1.1.0" -appVersion: "v1.4.0" +appVersion: "v1.5.0" kubeVersion: "^1.10.0-0" -description: "Grafana Enterprise Logs (Simple Scalable)" +description: "DEPRECATED Grafana Enterprise Logs (Simple Scalable)" +deprecated: true home: "https://grafana.com/products/enterprise/logs/" dependencies: - name: loki-simple-scalable diff --git a/charts/enterprise-logs-simple/README.md b/charts/enterprise-logs-simple/README.md index 403f61586f..9f41eb90ba 100644 --- a/charts/enterprise-logs-simple/README.md +++ b/charts/enterprise-logs-simple/README.md @@ -6,6 +6,11 @@ Grafana Enterprise Logs (Simple Scalable) **Homepage:** + +## Deprecation warning + +This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). + ## Requirements Kubernetes: `^1.10.0-0` diff --git a/charts/enterprise-logs-simple/templates/NOTES.txt b/charts/enterprise-logs-simple/templates/NOTES.txt new file mode 100644 index 0000000000..ccae514f91 --- /dev/null +++ b/charts/enterprise-logs-simple/templates/NOTES.txt @@ -0,0 +1,2 @@ +This chart is now deprecated and will no longer be updated. +Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). diff --git a/charts/enterprise-logs-simple/values.yaml b/charts/enterprise-logs-simple/values.yaml index 6c0d6abf2e..2061bf6c9b 100644 --- a/charts/enterprise-logs-simple/values.yaml +++ b/charts/enterprise-logs-simple/values.yaml @@ -1,3 +1,5 @@ +# DEPRECATED +# This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). # ----------------------------------------- # Configuration for `enterprise-logs` chart # ----------------------------------------- From acb725ea30a852bab8b5e8596561a2c28d4f80b7 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Fri, 29 Apr 2022 15:00:48 -0600 Subject: [PATCH 2/2] Fix versions Signed-off-by: Trevor Whitney --- charts/enterprise-logs-simple/Chart.yaml | 4 ++-- charts/enterprise-logs-simple/README.md | 2 +- charts/enterprise-logs-simple/templates/NOTES.txt | 2 +- charts/enterprise-logs-simple/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/enterprise-logs-simple/Chart.yaml b/charts/enterprise-logs-simple/Chart.yaml index a27734a78b..3787f3c2f3 100644 --- a/charts/enterprise-logs-simple/Chart.yaml +++ b/charts/enterprise-logs-simple/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: "v2" name: "enterprise-logs-simple" type: application -version: "1.1.0" -appVersion: "v1.5.0" +version: "1.2.0" +appVersion: "v1.4.0" kubeVersion: "^1.10.0-0" description: "DEPRECATED Grafana Enterprise Logs (Simple Scalable)" deprecated: true diff --git a/charts/enterprise-logs-simple/README.md b/charts/enterprise-logs-simple/README.md index 9f41eb90ba..0965272ce2 100644 --- a/charts/enterprise-logs-simple/README.md +++ b/charts/enterprise-logs-simple/README.md @@ -9,7 +9,7 @@ Grafana Enterprise Logs (Simple Scalable) ## Deprecation warning -This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). +This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.4.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). ## Requirements diff --git a/charts/enterprise-logs-simple/templates/NOTES.txt b/charts/enterprise-logs-simple/templates/NOTES.txt index ccae514f91..be0b063db1 100644 --- a/charts/enterprise-logs-simple/templates/NOTES.txt +++ b/charts/enterprise-logs-simple/templates/NOTES.txt @@ -1,2 +1,2 @@ This chart is now deprecated and will no longer be updated. -Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). +Grafana Enterprise Logs v1.4.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). diff --git a/charts/enterprise-logs-simple/values.yaml b/charts/enterprise-logs-simple/values.yaml index 2061bf6c9b..dc0fea27b3 100644 --- a/charts/enterprise-logs-simple/values.yaml +++ b/charts/enterprise-logs-simple/values.yaml @@ -1,5 +1,5 @@ # DEPRECATED -# This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.5.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). +# This chart is now deprecated and will no longer be updated. Grafana Enterprise Logs v1.4.0 is included in the `loki-simple-scalable` chart which implements Grafana Enterprise Logs as an option (`enterprise.enabled: true`). # ----------------------------------------- # Configuration for `enterprise-logs` chart # -----------------------------------------