From 838f16d7d5f7eba2090afef9cafd5361a6ea7993 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Wed, 27 Sep 2023 06:38:44 +0000 Subject: [PATCH 1/3] chore: Update project-grafana-loki 0.74.5 => 0.74.6 --- services/project-grafana-loki/0.74.5/defaults/cm.yaml | 2 +- .../project-grafana-loki/0.74.5/object-bucket-claims.yaml | 2 +- .../project-grafana-loki/0.74.5/project-grafana-loki.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/project-grafana-loki/0.74.5/defaults/cm.yaml b/services/project-grafana-loki/0.74.5/defaults/cm.yaml index cd553596c..3e1caa447 100644 --- a/services/project-grafana-loki/0.74.5/defaults/cm.yaml +++ b/services/project-grafana-loki/0.74.5/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: project-grafana-loki-0.74.5-d2iq-defaults + name: project-grafana-loki-0.74.6-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/project-grafana-loki/0.74.5/object-bucket-claims.yaml b/services/project-grafana-loki/0.74.5/object-bucket-claims.yaml index 96826e772..e345641bc 100644 --- a/services/project-grafana-loki/0.74.5/object-bucket-claims.yaml +++ b/services/project-grafana-loki/0.74.5/object-bucket-claims.yaml @@ -24,7 +24,7 @@ spec: releaseName: project-loki-object-bucket-claims valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.74.5-d2iq-defaults + name: project-grafana-loki-0.74.6-d2iq-defaults - kind: ConfigMap name: project-grafana-loki-overrides optional: true diff --git a/services/project-grafana-loki/0.74.5/project-grafana-loki.yaml b/services/project-grafana-loki/0.74.5/project-grafana-loki.yaml index 94e26e01c..f08acf26e 100644 --- a/services/project-grafana-loki/0.74.5/project-grafana-loki.yaml +++ b/services/project-grafana-loki/0.74.5/project-grafana-loki.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 0.74.5 + version: 0.74.6 timeout: 15m interval: 15s install: @@ -25,4 +25,4 @@ spec: releaseName: project-grafana-loki valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.74.5-d2iq-defaults + name: project-grafana-loki-0.74.6-d2iq-defaults From a6c3aceb3c475036a4e1ff290c7fdb1e554f7a10 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Wed, 27 Sep 2023 06:38:44 +0000 Subject: [PATCH 2/3] chore: Move project-grafana-loki/0.74.5 => 0.74.6 --- services/project-grafana-loki/{0.74.5 => 0.74.6}/defaults/cm.yaml | 0 .../{0.74.5 => 0.74.6}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../project-grafana-loki/{0.74.5 => 0.74.6}/kustomization.yaml | 0 .../{0.74.5 => 0.74.6}/object-bucket-claims.yaml | 0 .../{0.74.5 => 0.74.6}/project-grafana-loki.yaml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/defaults/cm.yaml (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/defaults/kustomization.yaml (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/object-bucket-claims.yaml (100%) rename services/project-grafana-loki/{0.74.5 => 0.74.6}/project-grafana-loki.yaml (100%) diff --git a/services/project-grafana-loki/0.74.5/defaults/cm.yaml b/services/project-grafana-loki/0.74.6/defaults/cm.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/defaults/cm.yaml rename to services/project-grafana-loki/0.74.6/defaults/cm.yaml diff --git a/services/project-grafana-loki/0.74.5/defaults/kustomization.yaml b/services/project-grafana-loki/0.74.6/defaults/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/defaults/kustomization.yaml rename to services/project-grafana-loki/0.74.6/defaults/kustomization.yaml diff --git a/services/project-grafana-loki/0.74.5/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.74.6/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/grafana-dashboards-logging/kustomization.yaml rename to services/project-grafana-loki/0.74.6/grafana-dashboards-logging/kustomization.yaml diff --git a/services/project-grafana-loki/0.74.5/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.74.6/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/project-grafana-loki/0.74.5/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/project-grafana-loki/0.74.6/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/project-grafana-loki/0.74.5/kustomization.yaml b/services/project-grafana-loki/0.74.6/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/kustomization.yaml rename to services/project-grafana-loki/0.74.6/kustomization.yaml diff --git a/services/project-grafana-loki/0.74.5/object-bucket-claims.yaml b/services/project-grafana-loki/0.74.6/object-bucket-claims.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/object-bucket-claims.yaml rename to services/project-grafana-loki/0.74.6/object-bucket-claims.yaml diff --git a/services/project-grafana-loki/0.74.5/project-grafana-loki.yaml b/services/project-grafana-loki/0.74.6/project-grafana-loki.yaml similarity index 100% rename from services/project-grafana-loki/0.74.5/project-grafana-loki.yaml rename to services/project-grafana-loki/0.74.6/project-grafana-loki.yaml From de8113490a39ee1ccbe082dea504cd4d81878970 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 11 Oct 2023 18:41:45 -0700 Subject: [PATCH 3/3] feat(grafana-loki): Bump to 0.74.6 --- services/grafana-loki/{0.74.5 => 0.74.6}/defaults/cm.yaml | 2 +- .../{0.74.5 => 0.74.6}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../{0.74.5 => 0.74.6}/grafana-dashboards/grafana-loki.json | 0 .../{0.74.5 => 0.74.6}/grafana-dashboards/kustomization.yaml | 0 .../{0.74.5 => 0.74.6}/grafana-dashboards/loki-chunks.json | 0 .../{0.74.5 => 0.74.6}/grafana-dashboards/loki-deletion.json | 0 .../grafana-dashboards/loki-reads-resources.json | 0 .../{0.74.5 => 0.74.6}/grafana-dashboards/loki-retention.json | 0 .../grafana-dashboards/loki-writes-resources.json | 0 .../{0.74.5 => 0.74.6}/grafana-loki-helmrelease.yaml | 2 +- .../grafana-loki-helmrelease/grafana-loki.yaml | 4 ++-- .../grafana-loki-pre-install-jobs/pre-install.yaml | 0 .../{0.74.5 => 0.74.6}/grafana-loki-pre-install.yaml | 2 +- services/grafana-loki/{0.74.5 => 0.74.6}/kustomization.yaml | 0 16 files changed, 5 insertions(+), 5 deletions(-) rename services/grafana-loki/{0.74.5 => 0.74.6}/defaults/cm.yaml (99%) rename services/grafana-loki/{0.74.5 => 0.74.6}/defaults/kustomization.yaml (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/grafana-loki.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/kustomization.yaml (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/loki-chunks.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/loki-deletion.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/loki-reads-resources.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/loki-retention.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-dashboards/loki-writes-resources.json (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-loki-helmrelease.yaml (92%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-loki-helmrelease/grafana-loki.yaml (88%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-loki-pre-install-jobs/pre-install.yaml (100%) rename services/grafana-loki/{0.74.5 => 0.74.6}/grafana-loki-pre-install.yaml (86%) rename services/grafana-loki/{0.74.5 => 0.74.6}/kustomization.yaml (100%) diff --git a/services/grafana-loki/0.74.5/defaults/cm.yaml b/services/grafana-loki/0.74.6/defaults/cm.yaml similarity index 99% rename from services/grafana-loki/0.74.5/defaults/cm.yaml rename to services/grafana-loki/0.74.6/defaults/cm.yaml index dd2520b11..9e7a5027f 100644 --- a/services/grafana-loki/0.74.5/defaults/cm.yaml +++ b/services/grafana-loki/0.74.6/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-loki-0.74.5-d2iq-defaults + name: grafana-loki-0.74.6-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/grafana-loki/0.74.5/defaults/kustomization.yaml b/services/grafana-loki/0.74.6/defaults/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.74.5/defaults/kustomization.yaml rename to services/grafana-loki/0.74.6/defaults/kustomization.yaml diff --git a/services/grafana-loki/0.74.5/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.74.6/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards-logging/kustomization.yaml rename to services/grafana-loki/0.74.6/grafana-dashboards-logging/kustomization.yaml diff --git a/services/grafana-loki/0.74.5/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.74.6/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/grafana-loki/0.74.6/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.74.6/grafana-dashboards/grafana-loki.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/grafana-loki.json rename to services/grafana-loki/0.74.6/grafana-dashboards/grafana-loki.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.74.6/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/kustomization.yaml rename to services/grafana-loki/0.74.6/grafana-dashboards/kustomization.yaml diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.74.6/grafana-dashboards/loki-chunks.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/loki-chunks.json rename to services/grafana-loki/0.74.6/grafana-dashboards/loki-chunks.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.74.6/grafana-dashboards/loki-deletion.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/loki-deletion.json rename to services/grafana-loki/0.74.6/grafana-dashboards/loki-deletion.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.74.6/grafana-dashboards/loki-reads-resources.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/loki-reads-resources.json rename to services/grafana-loki/0.74.6/grafana-dashboards/loki-reads-resources.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.74.6/grafana-dashboards/loki-retention.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/loki-retention.json rename to services/grafana-loki/0.74.6/grafana-dashboards/loki-retention.json diff --git a/services/grafana-loki/0.74.5/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.74.6/grafana-dashboards/loki-writes-resources.json similarity index 100% rename from services/grafana-loki/0.74.5/grafana-dashboards/loki-writes-resources.json rename to services/grafana-loki/0.74.6/grafana-dashboards/loki-writes-resources.json diff --git a/services/grafana-loki/0.74.5/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.74.6/grafana-loki-helmrelease.yaml similarity index 92% rename from services/grafana-loki/0.74.5/grafana-loki-helmrelease.yaml rename to services/grafana-loki/0.74.6/grafana-loki-helmrelease.yaml index 0a8d4306c..1ed08bcda 100644 --- a/services/grafana-loki/0.74.5/grafana-loki-helmrelease.yaml +++ b/services/grafana-loki/0.74.6/grafana-loki-helmrelease.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.74.5/grafana-loki-helmrelease + path: ./services/grafana-loki/0.74.6/grafana-loki-helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.74.5/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.74.6/grafana-loki-helmrelease/grafana-loki.yaml similarity index 88% rename from services/grafana-loki/0.74.5/grafana-loki-helmrelease/grafana-loki.yaml rename to services/grafana-loki/0.74.6/grafana-loki-helmrelease/grafana-loki.yaml index a98b9635a..80f44d9f0 100644 --- a/services/grafana-loki/0.74.5/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.74.6/grafana-loki-helmrelease/grafana-loki.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 0.74.5 + version: 0.74.6 interval: 15s timeout: 15m install: @@ -25,4 +25,4 @@ spec: releaseName: grafana-loki valuesFrom: - kind: ConfigMap - name: grafana-loki-0.74.5-d2iq-defaults + name: grafana-loki-0.74.6-d2iq-defaults diff --git a/services/grafana-loki/0.74.5/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.74.6/grafana-loki-pre-install-jobs/pre-install.yaml similarity index 100% rename from services/grafana-loki/0.74.5/grafana-loki-pre-install-jobs/pre-install.yaml rename to services/grafana-loki/0.74.6/grafana-loki-pre-install-jobs/pre-install.yaml diff --git a/services/grafana-loki/0.74.5/grafana-loki-pre-install.yaml b/services/grafana-loki/0.74.6/grafana-loki-pre-install.yaml similarity index 86% rename from services/grafana-loki/0.74.5/grafana-loki-pre-install.yaml rename to services/grafana-loki/0.74.6/grafana-loki-pre-install.yaml index 93d1c328d..238abad36 100644 --- a/services/grafana-loki/0.74.5/grafana-loki-pre-install.yaml +++ b/services/grafana-loki/0.74.6/grafana-loki-pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.74.5/grafana-loki-pre-install-jobs + path: ./services/grafana-loki/0.74.6/grafana-loki-pre-install-jobs sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.74.5/kustomization.yaml b/services/grafana-loki/0.74.6/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.74.5/kustomization.yaml rename to services/grafana-loki/0.74.6/kustomization.yaml