From c937fdb0651dbc85b2fd1abae4f07b31bf4b6c96 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:41 +0000 Subject: [PATCH 1/5] chore: Update grafana-loki 0.69.16 => 0.71.2 --- services/grafana-loki/0.69.16/defaults/cm.yaml | 2 +- services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml | 2 +- .../0.69.16/grafana-loki-helmrelease/grafana-loki.yaml | 4 ++-- services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/grafana-loki/0.69.16/defaults/cm.yaml b/services/grafana-loki/0.69.16/defaults/cm.yaml index 3390e276b..4a3d1b69b 100644 --- a/services/grafana-loki/0.69.16/defaults/cm.yaml +++ b/services/grafana-loki/0.69.16/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-loki-0.69.16-d2iq-defaults + name: grafana-loki-0.71.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml index c531bd16d..f032c3b0b 100644 --- a/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml +++ b/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.69.16/grafana-loki-helmrelease + path: ./services/grafana-loki/0.71.2/grafana-loki-helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml index b9e465e46..aab8a1112 100644 --- a/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 0.69.16 + version: 0.71.2 interval: 15s timeout: 15m install: @@ -25,4 +25,4 @@ spec: releaseName: grafana-loki valuesFrom: - kind: ConfigMap - name: grafana-loki-0.69.16-d2iq-defaults + name: grafana-loki-0.71.2-d2iq-defaults diff --git a/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml b/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml index bfb7fa7a1..7d89c329a 100644 --- a/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml +++ b/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs + path: ./services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs sourceRef: kind: GitRepository name: management From c6790dadf0829fc97baf1d705b39a2cbe25c1f33 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:41 +0000 Subject: [PATCH 2/5] chore: Move grafana-loki/0.69.16 => 0.71.2 --- services/grafana-loki/{0.69.16 => 0.71.2}/defaults/cm.yaml | 0 .../grafana-loki/{0.69.16 => 0.71.2}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../{0.69.16 => 0.71.2}/grafana-dashboards/grafana-loki.json | 0 .../{0.69.16 => 0.71.2}/grafana-dashboards/kustomization.yaml | 0 .../{0.69.16 => 0.71.2}/grafana-dashboards/loki-chunks.json | 0 .../{0.69.16 => 0.71.2}/grafana-dashboards/loki-deletion.json | 0 .../grafana-dashboards/loki-reads-resources.json | 0 .../{0.69.16 => 0.71.2}/grafana-dashboards/loki-retention.json | 0 .../grafana-dashboards/loki-writes-resources.json | 0 .../{0.69.16 => 0.71.2}/grafana-loki-helmrelease.yaml | 0 .../grafana-loki-helmrelease/grafana-loki.yaml | 0 .../grafana-loki-pre-install-jobs/pre-install.yaml | 0 .../{0.69.16 => 0.71.2}/grafana-loki-pre-install.yaml | 0 services/grafana-loki/{0.69.16 => 0.71.2}/kustomization.yaml | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename services/grafana-loki/{0.69.16 => 0.71.2}/defaults/cm.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/defaults/kustomization.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/grafana-loki.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/kustomization.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/loki-chunks.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/loki-deletion.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/loki-reads-resources.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/loki-retention.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards/loki-writes-resources.json (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-loki-helmrelease.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-loki-helmrelease/grafana-loki.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-loki-pre-install-jobs/pre-install.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/grafana-loki-pre-install.yaml (100%) rename services/grafana-loki/{0.69.16 => 0.71.2}/kustomization.yaml (100%) diff --git a/services/grafana-loki/0.69.16/defaults/cm.yaml b/services/grafana-loki/0.71.2/defaults/cm.yaml similarity index 100% rename from services/grafana-loki/0.69.16/defaults/cm.yaml rename to services/grafana-loki/0.71.2/defaults/cm.yaml diff --git a/services/grafana-loki/0.69.16/defaults/kustomization.yaml b/services/grafana-loki/0.71.2/defaults/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.16/defaults/kustomization.yaml rename to services/grafana-loki/0.71.2/defaults/kustomization.yaml diff --git a/services/grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml rename to services/grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml diff --git a/services/grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.71.2/grafana-dashboards/grafana-loki.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/grafana-loki.json rename to services/grafana-loki/0.71.2/grafana-dashboards/grafana-loki.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.71.2/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/kustomization.yaml rename to services/grafana-loki/0.71.2/grafana-dashboards/kustomization.yaml diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-chunks.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-chunks.json rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-chunks.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-deletion.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-deletion.json rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-deletion.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-reads-resources.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-reads-resources.json rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-reads-resources.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-retention.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-retention.json rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-retention.json diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-writes-resources.json similarity index 100% rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-writes-resources.json rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-writes-resources.json diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.71.2/grafana-loki-helmrelease.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml rename to services/grafana-loki/0.71.2/grafana-loki-helmrelease.yaml diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.71.2/grafana-loki-helmrelease/grafana-loki.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml rename to services/grafana-loki/0.71.2/grafana-loki-helmrelease/grafana-loki.yaml diff --git a/services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs/pre-install.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs/pre-install.yaml rename to services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs/pre-install.yaml diff --git a/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml b/services/grafana-loki/0.71.2/grafana-loki-pre-install.yaml similarity index 100% rename from services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml rename to services/grafana-loki/0.71.2/grafana-loki-pre-install.yaml diff --git a/services/grafana-loki/0.69.16/kustomization.yaml b/services/grafana-loki/0.71.2/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.16/kustomization.yaml rename to services/grafana-loki/0.71.2/kustomization.yaml From bda56d24d3cbafea90a38406658b3128fd1b5b3e Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:42 +0000 Subject: [PATCH 3/5] chore: Update project-grafana-loki 0.69.16 => 0.71.2 --- services/project-grafana-loki/0.69.16/defaults/cm.yaml | 2 +- .../project-grafana-loki/0.69.16/object-bucket-claims.yaml | 2 +- .../project-grafana-loki/0.69.16/project-grafana-loki.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/project-grafana-loki/0.69.16/defaults/cm.yaml b/services/project-grafana-loki/0.69.16/defaults/cm.yaml index 1a0a4591e..0fa2b0251 100644 --- a/services/project-grafana-loki/0.69.16/defaults/cm.yaml +++ b/services/project-grafana-loki/0.69.16/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: project-grafana-loki-0.69.16-d2iq-defaults + name: project-grafana-loki-0.71.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml b/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml index b09e4f98b..f986d64a9 100644 --- a/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml +++ b/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml @@ -24,7 +24,7 @@ spec: releaseName: project-loki-object-bucket-claims valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.69.16-d2iq-defaults + name: project-grafana-loki-0.71.2-d2iq-defaults - kind: ConfigMap name: project-grafana-loki-overrides optional: true diff --git a/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml b/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml index 01ccc47d3..91342d352 100644 --- a/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml +++ b/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 0.69.16 + version: 0.71.2 timeout: 15m interval: 15s install: @@ -25,4 +25,4 @@ spec: releaseName: project-grafana-loki valuesFrom: - kind: ConfigMap - name: project-grafana-loki-0.69.16-d2iq-defaults + name: project-grafana-loki-0.71.2-d2iq-defaults From 7825c8faca0d5f179ea574d25c8bb822e8927f11 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:42 +0000 Subject: [PATCH 4/5] chore: Move project-grafana-loki/0.69.16 => 0.71.2 --- .../project-grafana-loki/{0.69.16 => 0.71.2}/defaults/cm.yaml | 0 .../{0.69.16 => 0.71.2}/defaults/kustomization.yaml | 0 .../grafana-dashboards-logging/kustomization.yaml | 0 .../grafana-dashboards-logging/logging-loki-dashboard.json | 0 .../project-grafana-loki/{0.69.16 => 0.71.2}/kustomization.yaml | 0 .../{0.69.16 => 0.71.2}/object-bucket-claims.yaml | 0 .../{0.69.16 => 0.71.2}/project-grafana-loki.yaml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/defaults/cm.yaml (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/defaults/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards-logging/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/grafana-dashboards-logging/logging-loki-dashboard.json (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/kustomization.yaml (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/object-bucket-claims.yaml (100%) rename services/project-grafana-loki/{0.69.16 => 0.71.2}/project-grafana-loki.yaml (100%) diff --git a/services/project-grafana-loki/0.69.16/defaults/cm.yaml b/services/project-grafana-loki/0.71.2/defaults/cm.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/defaults/cm.yaml rename to services/project-grafana-loki/0.71.2/defaults/cm.yaml diff --git a/services/project-grafana-loki/0.69.16/defaults/kustomization.yaml b/services/project-grafana-loki/0.71.2/defaults/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/defaults/kustomization.yaml rename to services/project-grafana-loki/0.71.2/defaults/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml rename to services/project-grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/project-grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/project-grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/project-grafana-loki/0.69.16/kustomization.yaml b/services/project-grafana-loki/0.71.2/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/kustomization.yaml rename to services/project-grafana-loki/0.71.2/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml b/services/project-grafana-loki/0.71.2/object-bucket-claims.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/object-bucket-claims.yaml rename to services/project-grafana-loki/0.71.2/object-bucket-claims.yaml diff --git a/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml b/services/project-grafana-loki/0.71.2/project-grafana-loki.yaml similarity index 100% rename from services/project-grafana-loki/0.69.16/project-grafana-loki.yaml rename to services/project-grafana-loki/0.71.2/project-grafana-loki.yaml From 6d541e6bfa3583e21f87c414d8c3eb8542c14c32 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Mon, 11 Sep 2023 18:23:14 -0700 Subject: [PATCH 5/5] feat(licenses): Bump loki image --- licenses.d2iq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 10f01e28d..d1451ee1f 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -106,7 +106,7 @@ resources: notice_path: NOTICE.md ref: v${image_tag} url: https://github.com/grafana/grafana - - container_image: docker.io/grafana/loki:2.8.2 + - container_image: docker.io/grafana/loki:2.8.4 sources: - license_path: LICENSE ref: v${image_tag}