From 9bf40c98b93220bb15a12bd60f852c3d3e5fb304 Mon Sep 17 00:00:00 2001 From: Casey Buto Date: Mon, 7 Aug 2023 14:06:05 -0400 Subject: [PATCH 1/2] fix: remove postRenderer from Loki HelmRelease --- .../grafana-loki-helmrelease/grafana-loki.yaml | 17 ----------------- .../0.69.4/project-grafana-loki.yaml | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml index b1a65dd27..9586dd99c 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml @@ -27,20 +27,3 @@ spec: valuesFrom: - kind: ConfigMap name: grafana-loki-0.69.4-d2iq-defaults - # upstream chart doesn't apply loki.annotations to all loki deployment/statefulsets - # TODO: remove this after https://github.com/grafana/helm-charts/issues/1905 is fixed - postRenderers: - - kustomize: - patchesStrategicMerge: - - apiVersion: apps/v1 - kind: StatefulSet - metadata: - name: grafana-loki-loki-distributed-ingester - annotations: - secret.reloader.stakater.com/reload: dkp-loki - - apiVersion: apps/v1 - kind: Deployment - metadata: - name: grafana-loki-loki-distributed-compactor - annotations: - secret.reloader.stakater.com/reload: dkp-loki diff --git a/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml b/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml index ed5747efe..f286147fb 100644 --- a/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml +++ b/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml @@ -27,20 +27,3 @@ spec: valuesFrom: - kind: ConfigMap name: project-grafana-loki-0.69.4-d2iq-defaults - # upstream chart doesn't apply loki.annotations to all loki deployment/statefulsets - # TODO: remove this after https://github.com/grafana/helm-charts/issues/1905 is fixed - postRenderers: - - kustomize: - patchesStrategicMerge: - - apiVersion: apps/v1 - kind: StatefulSet - metadata: - name: project-grafana-loki-loki-distributed-ingester - annotations: - secret.reloader.stakater.com/reload: proj-loki-${releaseNamespace} - - apiVersion: apps/v1 - kind: Deployment - metadata: - name: project-grafana-loki-loki-distributed-compactor - annotations: - secret.reloader.stakater.com/reload: proj-loki-${releaseNamespace} From e368ca6affa0047f6f35d73b57ad47e38b615874 Mon Sep 17 00:00:00 2001 From: Casey Buto Date: Mon, 7 Aug 2023 14:16:36 -0400 Subject: [PATCH 2/2] feat(loki): bump Loki version to 0.69.5 --- services/grafana-loki/{0.69.4 => 0.69.5}/defaults/cm.yaml | 2 +- .../grafana-loki/{0.69.4 => 0.69.5}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../{0.69.4 => 0.69.5}/grafana-dashboards/grafana-loki.json | 0 .../{0.69.4 => 0.69.5}/grafana-dashboards/kustomization.yaml | 0 .../{0.69.4 => 0.69.5}/grafana-dashboards/loki-chunks.json | 0 .../{0.69.4 => 0.69.5}/grafana-dashboards/loki-deletion.json | 0 .../grafana-dashboards/loki-reads-resources.json | 0 .../{0.69.4 => 0.69.5}/grafana-dashboards/loki-retention.json | 0 .../grafana-dashboards/loki-writes-resources.json | 0 .../{0.69.4 => 0.69.5}/grafana-loki-helmrelease.yaml | 2 +- .../grafana-loki-helmrelease/grafana-loki.yaml | 2 +- .../grafana-loki-pre-install-jobs/pre-install.yaml | 0 .../{0.69.4 => 0.69.5}/grafana-loki-pre-install.yaml | 2 +- services/grafana-loki/{0.69.4 => 0.69.5}/kustomization.yaml | 0 .../project-grafana-loki/{0.69.4 => 0.69.5}/defaults/cm.yaml | 2 +- .../{0.69.4 => 0.69.5}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../project-grafana-loki/{0.69.4 => 0.69.5}/kustomization.yaml | 0 .../{0.69.4 => 0.69.5}/object-bucket-claims.yaml | 2 +- .../{0.69.4 => 0.69.5}/project-grafana-loki.yaml | 2 +- 23 files changed, 7 insertions(+), 7 deletions(-) rename services/grafana-loki/{0.69.4 => 0.69.5}/defaults/cm.yaml (99%) rename services/grafana-loki/{0.69.4 => 0.69.5}/defaults/kustomization.yaml (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/grafana-loki.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/kustomization.yaml (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/loki-chunks.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/loki-deletion.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/loki-reads-resources.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/loki-retention.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards/loki-writes-resources.json (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-loki-helmrelease.yaml (92%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-loki-helmrelease/grafana-loki.yaml (92%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-loki-pre-install-jobs/pre-install.yaml (100%) rename services/grafana-loki/{0.69.4 => 0.69.5}/grafana-loki-pre-install.yaml (86%) rename services/grafana-loki/{0.69.4 => 0.69.5}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/defaults/cm.yaml (99%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/defaults/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/object-bucket-claims.yaml (93%) rename services/project-grafana-loki/{0.69.4 => 0.69.5}/project-grafana-loki.yaml (91%) diff --git a/services/grafana-loki/0.69.4/defaults/cm.yaml b/services/grafana-loki/0.69.5/defaults/cm.yaml similarity index 99% rename from services/grafana-loki/0.69.4/defaults/cm.yaml rename to services/grafana-loki/0.69.5/defaults/cm.yaml index 56a46abcf..c33315486 100644 --- a/services/grafana-loki/0.69.4/defaults/cm.yaml +++ b/services/grafana-loki/0.69.5/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-loki-0.69.4-d2iq-defaults + name: grafana-loki-0.69.5-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/grafana-loki/0.69.4/defaults/kustomization.yaml b/services/grafana-loki/0.69.5/defaults/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/defaults/kustomization.yaml rename to services/grafana-loki/0.69.5/defaults/kustomization.yaml diff --git a/services/grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml rename to services/grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml diff --git a/services/grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.69.5/grafana-dashboards/grafana-loki.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/grafana-loki.json rename to services/grafana-loki/0.69.5/grafana-dashboards/grafana-loki.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.69.5/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/kustomization.yaml rename to services/grafana-loki/0.69.5/grafana-dashboards/kustomization.yaml diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.69.5/grafana-dashboards/loki-chunks.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-chunks.json rename to services/grafana-loki/0.69.5/grafana-dashboards/loki-chunks.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.69.5/grafana-dashboards/loki-deletion.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-deletion.json rename to services/grafana-loki/0.69.5/grafana-dashboards/loki-deletion.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.69.5/grafana-dashboards/loki-reads-resources.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-reads-resources.json rename to services/grafana-loki/0.69.5/grafana-dashboards/loki-reads-resources.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.69.5/grafana-dashboards/loki-retention.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-retention.json rename to services/grafana-loki/0.69.5/grafana-dashboards/loki-retention.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.69.5/grafana-dashboards/loki-writes-resources.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-writes-resources.json rename to services/grafana-loki/0.69.5/grafana-dashboards/loki-writes-resources.json diff --git a/services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml similarity index 92% rename from services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml rename to services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml index 3be10e911..87cb19716 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml +++ b/services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.69.4/grafana-loki-helmrelease + path: ./services/grafana-loki/0.69.5/grafana-loki-helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml similarity index 92% rename from services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml rename to services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml index 9586dd99c..e4b2e1e42 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml @@ -26,4 +26,4 @@ spec: releaseName: grafana-loki valuesFrom: - kind: ConfigMap - name: grafana-loki-0.69.4-d2iq-defaults + name: grafana-loki-0.69.5-d2iq-defaults diff --git a/services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs/pre-install.yaml similarity index 100% rename from services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs/pre-install.yaml rename to services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs/pre-install.yaml diff --git a/services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml b/services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml similarity index 86% rename from services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml rename to services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml index e2f8e750e..3784822a1 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml +++ b/services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs + path: ./services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.69.4/kustomization.yaml b/services/grafana-loki/0.69.5/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/kustomization.yaml rename to services/grafana-loki/0.69.5/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.4/defaults/cm.yaml b/services/project-grafana-loki/0.69.5/defaults/cm.yaml similarity index 99% rename from services/project-grafana-loki/0.69.4/defaults/cm.yaml rename to services/project-grafana-loki/0.69.5/defaults/cm.yaml index 14c5ec5dc..f7c30903f 100644 --- a/services/project-grafana-loki/0.69.4/defaults/cm.yaml +++ b/services/project-grafana-loki/0.69.5/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: project-grafana-loki-0.69.4-d2iq-defaults + name: project-grafana-loki-0.69.5-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/project-grafana-loki/0.69.4/defaults/kustomization.yaml b/services/project-grafana-loki/0.69.5/defaults/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.4/defaults/kustomization.yaml rename to services/project-grafana-loki/0.69.5/defaults/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml rename to services/project-grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/project-grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/project-grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/project-grafana-loki/0.69.4/kustomization.yaml b/services/project-grafana-loki/0.69.5/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.4/kustomization.yaml rename to services/project-grafana-loki/0.69.5/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.4/object-bucket-claims.yaml b/services/project-grafana-loki/0.69.5/object-bucket-claims.yaml similarity index 93% rename from services/project-grafana-loki/0.69.4/object-bucket-claims.yaml rename to services/project-grafana-loki/0.69.5/object-bucket-claims.yaml index eac69b16f..ccdc03759 100644 --- a/services/project-grafana-loki/0.69.4/object-bucket-claims.yaml +++ b/services/project-grafana-loki/0.69.5/object-bucket-claims.yaml @@ -25,7 +25,7 @@ spec: releaseName: project-loki-object-bucket-claims valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.69.4-d2iq-defaults + name: project-grafana-loki-0.69.5-d2iq-defaults - kind: ConfigMap name: project-grafana-loki-overrides optional: true diff --git a/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml b/services/project-grafana-loki/0.69.5/project-grafana-loki.yaml similarity index 91% rename from services/project-grafana-loki/0.69.4/project-grafana-loki.yaml rename to services/project-grafana-loki/0.69.5/project-grafana-loki.yaml index f286147fb..a6d301151 100644 --- a/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml +++ b/services/project-grafana-loki/0.69.5/project-grafana-loki.yaml @@ -26,4 +26,4 @@ spec: releaseName: project-grafana-loki valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.69.4-d2iq-defaults + name: project-grafana-loki-0.69.5-d2iq-defaults