From d0aedcf8b3429520deb67ff9a0e7f72d3c2373f4 Mon Sep 17 00:00:00 2001 From: Casey Buto Date: Mon, 11 Sep 2023 12:45:43 -0400 Subject: [PATCH] chore: bump Loki versions --- services/grafana-loki/{0.48.7 => 0.48.8}/defaults/cm.yaml | 2 +- .../grafana-loki/{0.48.7 => 0.48.8}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../{0.48.7 => 0.48.8}/grafana-dashboards/grafana-loki.json | 0 .../{0.48.7 => 0.48.8}/grafana-dashboards/kustomization.yaml | 0 .../{0.48.7 => 0.48.8}/grafana-dashboards/loki-chunks.json | 0 .../{0.48.7 => 0.48.8}/grafana-dashboards/loki-deletion.json | 0 .../grafana-dashboards/loki-reads-resources.json | 0 .../{0.48.7 => 0.48.8}/grafana-dashboards/loki-retention.json | 0 .../grafana-dashboards/loki-writes-resources.json | 0 .../{0.48.7 => 0.48.8}/grafana-loki-helmrelease.yaml | 2 +- .../grafana-loki-helmrelease/grafana-loki.yaml | 2 +- .../grafana-loki-pre-install-jobs/pre-install.yaml | 0 .../{0.48.7 => 0.48.8}/grafana-loki-pre-install.yaml | 2 +- services/grafana-loki/{0.48.7 => 0.48.8}/kustomization.yaml | 0 .../project-grafana-loki/{0.48.7 => 0.48.8}/defaults/cm.yaml | 2 +- .../{0.48.7 => 0.48.8}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../project-grafana-loki/{0.48.7 => 0.48.8}/kustomization.yaml | 0 .../{0.48.7 => 0.48.8}/object-bucket-claims.yaml | 2 +- .../{0.48.7 => 0.48.8}/project-grafana-loki.yaml | 2 +- 23 files changed, 7 insertions(+), 7 deletions(-) rename services/grafana-loki/{0.48.7 => 0.48.8}/defaults/cm.yaml (99%) rename services/grafana-loki/{0.48.7 => 0.48.8}/defaults/kustomization.yaml (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/grafana-loki.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/kustomization.yaml (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/loki-chunks.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/loki-deletion.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/loki-reads-resources.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/loki-retention.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards/loki-writes-resources.json (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-loki-helmrelease.yaml (92%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-loki-helmrelease/grafana-loki.yaml (96%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-loki-pre-install-jobs/pre-install.yaml (100%) rename services/grafana-loki/{0.48.7 => 0.48.8}/grafana-loki-pre-install.yaml (86%) rename services/grafana-loki/{0.48.7 => 0.48.8}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/defaults/cm.yaml (99%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/defaults/kustomization.yaml (100%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/object-bucket-claims.yaml (93%) rename services/project-grafana-loki/{0.48.7 => 0.48.8}/project-grafana-loki.yaml (96%) diff --git a/services/grafana-loki/0.48.7/defaults/cm.yaml b/services/grafana-loki/0.48.8/defaults/cm.yaml similarity index 99% rename from services/grafana-loki/0.48.7/defaults/cm.yaml rename to services/grafana-loki/0.48.8/defaults/cm.yaml index 585411993..361dc997e 100644 --- a/services/grafana-loki/0.48.7/defaults/cm.yaml +++ b/services/grafana-loki/0.48.8/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-loki-0.48.7-d2iq-defaults + name: grafana-loki-0.48.8-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/grafana-loki/0.48.7/defaults/kustomization.yaml b/services/grafana-loki/0.48.8/defaults/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.48.7/defaults/kustomization.yaml rename to services/grafana-loki/0.48.8/defaults/kustomization.yaml diff --git a/services/grafana-loki/0.48.7/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.48.8/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards-logging/kustomization.yaml rename to services/grafana-loki/0.48.8/grafana-dashboards-logging/kustomization.yaml diff --git a/services/grafana-loki/0.48.7/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.48.8/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/grafana-loki/0.48.8/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.48.8/grafana-dashboards/grafana-loki.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/grafana-loki.json rename to services/grafana-loki/0.48.8/grafana-dashboards/grafana-loki.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.48.8/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/kustomization.yaml rename to services/grafana-loki/0.48.8/grafana-dashboards/kustomization.yaml diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.48.8/grafana-dashboards/loki-chunks.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/loki-chunks.json rename to services/grafana-loki/0.48.8/grafana-dashboards/loki-chunks.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.48.8/grafana-dashboards/loki-deletion.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/loki-deletion.json rename to services/grafana-loki/0.48.8/grafana-dashboards/loki-deletion.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.48.8/grafana-dashboards/loki-reads-resources.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/loki-reads-resources.json rename to services/grafana-loki/0.48.8/grafana-dashboards/loki-reads-resources.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.48.8/grafana-dashboards/loki-retention.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/loki-retention.json rename to services/grafana-loki/0.48.8/grafana-dashboards/loki-retention.json diff --git a/services/grafana-loki/0.48.7/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.48.8/grafana-dashboards/loki-writes-resources.json similarity index 100% rename from services/grafana-loki/0.48.7/grafana-dashboards/loki-writes-resources.json rename to services/grafana-loki/0.48.8/grafana-dashboards/loki-writes-resources.json diff --git a/services/grafana-loki/0.48.7/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.48.8/grafana-loki-helmrelease.yaml similarity index 92% rename from services/grafana-loki/0.48.7/grafana-loki-helmrelease.yaml rename to services/grafana-loki/0.48.8/grafana-loki-helmrelease.yaml index 2fd00bfb9..fac00e556 100644 --- a/services/grafana-loki/0.48.7/grafana-loki-helmrelease.yaml +++ b/services/grafana-loki/0.48.8/grafana-loki-helmrelease.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.48.7/grafana-loki-helmrelease + path: ./services/grafana-loki/0.48.8/grafana-loki-helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.48.7/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.48.8/grafana-loki-helmrelease/grafana-loki.yaml similarity index 96% rename from services/grafana-loki/0.48.7/grafana-loki-helmrelease/grafana-loki.yaml rename to services/grafana-loki/0.48.8/grafana-loki-helmrelease/grafana-loki.yaml index 92654b300..964b6d115 100644 --- a/services/grafana-loki/0.48.7/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.48.8/grafana-loki-helmrelease/grafana-loki.yaml @@ -25,7 +25,7 @@ spec: releaseName: grafana-loki valuesFrom: - kind: ConfigMap - name: grafana-loki-0.48.7-d2iq-defaults + name: grafana-loki-0.48.8-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: diff --git a/services/grafana-loki/0.48.7/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.48.8/grafana-loki-pre-install-jobs/pre-install.yaml similarity index 100% rename from services/grafana-loki/0.48.7/grafana-loki-pre-install-jobs/pre-install.yaml rename to services/grafana-loki/0.48.8/grafana-loki-pre-install-jobs/pre-install.yaml diff --git a/services/grafana-loki/0.48.7/grafana-loki-pre-install.yaml b/services/grafana-loki/0.48.8/grafana-loki-pre-install.yaml similarity index 86% rename from services/grafana-loki/0.48.7/grafana-loki-pre-install.yaml rename to services/grafana-loki/0.48.8/grafana-loki-pre-install.yaml index eae3d40c2..0ac39f78f 100644 --- a/services/grafana-loki/0.48.7/grafana-loki-pre-install.yaml +++ b/services/grafana-loki/0.48.8/grafana-loki-pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.48.7/grafana-loki-pre-install-jobs + path: ./services/grafana-loki/0.48.8/grafana-loki-pre-install-jobs sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.48.7/kustomization.yaml b/services/grafana-loki/0.48.8/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.48.7/kustomization.yaml rename to services/grafana-loki/0.48.8/kustomization.yaml diff --git a/services/project-grafana-loki/0.48.7/defaults/cm.yaml b/services/project-grafana-loki/0.48.8/defaults/cm.yaml similarity index 99% rename from services/project-grafana-loki/0.48.7/defaults/cm.yaml rename to services/project-grafana-loki/0.48.8/defaults/cm.yaml index 967ae7aae..b67518cd0 100644 --- a/services/project-grafana-loki/0.48.7/defaults/cm.yaml +++ b/services/project-grafana-loki/0.48.8/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: project-grafana-loki-0.48.7-d2iq-defaults + name: project-grafana-loki-0.48.8-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/project-grafana-loki/0.48.7/defaults/kustomization.yaml b/services/project-grafana-loki/0.48.8/defaults/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.48.7/defaults/kustomization.yaml rename to services/project-grafana-loki/0.48.8/defaults/kustomization.yaml diff --git a/services/project-grafana-loki/0.48.7/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.48.8/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.48.7/grafana-dashboards-logging/kustomization.yaml rename to services/project-grafana-loki/0.48.8/grafana-dashboards-logging/kustomization.yaml diff --git a/services/project-grafana-loki/0.48.7/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.48.8/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/project-grafana-loki/0.48.7/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/project-grafana-loki/0.48.8/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/project-grafana-loki/0.48.7/kustomization.yaml b/services/project-grafana-loki/0.48.8/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.48.7/kustomization.yaml rename to services/project-grafana-loki/0.48.8/kustomization.yaml diff --git a/services/project-grafana-loki/0.48.7/object-bucket-claims.yaml b/services/project-grafana-loki/0.48.8/object-bucket-claims.yaml similarity index 93% rename from services/project-grafana-loki/0.48.7/object-bucket-claims.yaml rename to services/project-grafana-loki/0.48.8/object-bucket-claims.yaml index 30542cd0f..9ba454757 100644 --- a/services/project-grafana-loki/0.48.7/object-bucket-claims.yaml +++ b/services/project-grafana-loki/0.48.8/object-bucket-claims.yaml @@ -25,7 +25,7 @@ spec: releaseName: project-loki-object-bucket-claims valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.48.7-d2iq-defaults + name: project-grafana-loki-0.48.8-d2iq-defaults - kind: ConfigMap name: project-grafana-loki-overrides optional: true diff --git a/services/project-grafana-loki/0.48.7/project-grafana-loki.yaml b/services/project-grafana-loki/0.48.8/project-grafana-loki.yaml similarity index 96% rename from services/project-grafana-loki/0.48.7/project-grafana-loki.yaml rename to services/project-grafana-loki/0.48.8/project-grafana-loki.yaml index 8d6a70a98..de61ba71b 100644 --- a/services/project-grafana-loki/0.48.7/project-grafana-loki.yaml +++ b/services/project-grafana-loki/0.48.8/project-grafana-loki.yaml @@ -25,7 +25,7 @@ spec: releaseName: project-grafana-loki valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.48.7-d2iq-defaults + name: project-grafana-loki-0.48.8-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: