From f05a9fa69c565ae8f7f39bc4156021516eb5876c Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Thu, 19 Oct 2023 16:44:49 -0700 Subject: [PATCH] feat: Bump grafana to 6.60.1 (#1645) * chore: Update grafana-logging 6.58.6 => 6.60.1 * chore: Move grafana-logging/6.58.6 => 6.60.1 * chore: Update project-grafana-logging 6.58.6 => 6.60.1 * chore: Move project-grafana-logging/6.58.6 => 6.60.1 * feat(licenses): Bump grafana sidecar image --------- Co-authored-by: d2iq-mergebot Co-authored-by: Grace Do --- licenses.d2iq.yaml | 5 +++++ services/grafana-logging/{6.58.6 => 6.60.1}/defaults/cm.yaml | 2 +- .../{6.58.6 => 6.60.1}/defaults/kustomization.yaml | 0 services/grafana-logging/{6.58.6 => 6.60.1}/grafana.yaml | 4 ++-- .../grafana-logging/{6.58.6 => 6.60.1}/kustomization.yaml | 0 .../{6.58.6 => 6.60.1}/defaults/cm.yaml | 2 +- .../{6.58.6 => 6.60.1}/defaults/kustomization.yaml | 0 .../{6.58.6 => 6.60.1}/kustomization.yaml | 0 .../{6.58.6 => 6.60.1}/project-grafana.yaml | 4 ++-- 9 files changed, 11 insertions(+), 6 deletions(-) rename services/grafana-logging/{6.58.6 => 6.60.1}/defaults/cm.yaml (98%) rename services/grafana-logging/{6.58.6 => 6.60.1}/defaults/kustomization.yaml (100%) rename services/grafana-logging/{6.58.6 => 6.60.1}/grafana.yaml (96%) rename services/grafana-logging/{6.58.6 => 6.60.1}/kustomization.yaml (100%) rename services/project-grafana-logging/{6.58.6 => 6.60.1}/defaults/cm.yaml (98%) rename services/project-grafana-logging/{6.58.6 => 6.60.1}/defaults/kustomization.yaml (100%) rename services/project-grafana-logging/{6.58.6 => 6.60.1}/kustomization.yaml (100%) rename services/project-grafana-logging/{6.58.6 => 6.60.1}/project-grafana.yaml (86%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 428ab6791..1fbc1237e 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -527,6 +527,11 @@ resources: - license_path: LICENSE ref: ${image_tag} url: https://github.com/kiwigrid/k8s-sidecar + - container_image: quay.io/kiwigrid/k8s-sidecar:1.25.1 + sources: + - license_path: LICENSE + ref: ${image_tag} + url: https://github.com/kiwigrid/k8s-sidecar - container_image: quay.io/kubernetes-multicluster/kubefed:v0.9.1 sources: - license_path: LICENSE diff --git a/services/grafana-logging/6.58.6/defaults/cm.yaml b/services/grafana-logging/6.60.1/defaults/cm.yaml similarity index 98% rename from services/grafana-logging/6.58.6/defaults/cm.yaml rename to services/grafana-logging/6.60.1/defaults/cm.yaml index 46f9dd0a4..88272ef06 100644 --- a/services/grafana-logging/6.58.6/defaults/cm.yaml +++ b/services/grafana-logging/6.60.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-logging-6.58.6-d2iq-defaults + name: grafana-logging-6.60.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/grafana-logging/6.58.6/defaults/kustomization.yaml b/services/grafana-logging/6.60.1/defaults/kustomization.yaml similarity index 100% rename from services/grafana-logging/6.58.6/defaults/kustomization.yaml rename to services/grafana-logging/6.60.1/defaults/kustomization.yaml diff --git a/services/grafana-logging/6.58.6/grafana.yaml b/services/grafana-logging/6.60.1/grafana.yaml similarity index 96% rename from services/grafana-logging/6.58.6/grafana.yaml rename to services/grafana-logging/6.60.1/grafana.yaml index 647d058fa..881b32212 100644 --- a/services/grafana-logging/6.58.6/grafana.yaml +++ b/services/grafana-logging/6.60.1/grafana.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 6.58.6 + version: 6.60.1 interval: 15s install: crds: CreateReplace @@ -24,7 +24,7 @@ spec: releaseName: grafana-logging valuesFrom: - kind: ConfigMap - name: grafana-logging-6.58.6-d2iq-defaults + name: grafana-logging-6.60.1-d2iq-defaults targetNamespace: ${releaseNamespace} --- apiVersion: v1 diff --git a/services/grafana-logging/6.58.6/kustomization.yaml b/services/grafana-logging/6.60.1/kustomization.yaml similarity index 100% rename from services/grafana-logging/6.58.6/kustomization.yaml rename to services/grafana-logging/6.60.1/kustomization.yaml diff --git a/services/project-grafana-logging/6.58.6/defaults/cm.yaml b/services/project-grafana-logging/6.60.1/defaults/cm.yaml similarity index 98% rename from services/project-grafana-logging/6.58.6/defaults/cm.yaml rename to services/project-grafana-logging/6.60.1/defaults/cm.yaml index c211a695c..c17420d79 100644 --- a/services/project-grafana-logging/6.58.6/defaults/cm.yaml +++ b/services/project-grafana-logging/6.60.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: project-grafana-logging-6.58.6-d2iq-defaults + name: project-grafana-logging-6.60.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/project-grafana-logging/6.58.6/defaults/kustomization.yaml b/services/project-grafana-logging/6.60.1/defaults/kustomization.yaml similarity index 100% rename from services/project-grafana-logging/6.58.6/defaults/kustomization.yaml rename to services/project-grafana-logging/6.60.1/defaults/kustomization.yaml diff --git a/services/project-grafana-logging/6.58.6/kustomization.yaml b/services/project-grafana-logging/6.60.1/kustomization.yaml similarity index 100% rename from services/project-grafana-logging/6.58.6/kustomization.yaml rename to services/project-grafana-logging/6.60.1/kustomization.yaml diff --git a/services/project-grafana-logging/6.58.6/project-grafana.yaml b/services/project-grafana-logging/6.60.1/project-grafana.yaml similarity index 86% rename from services/project-grafana-logging/6.58.6/project-grafana.yaml rename to services/project-grafana-logging/6.60.1/project-grafana.yaml index b098d83cf..2a48756f4 100644 --- a/services/project-grafana-logging/6.58.6/project-grafana.yaml +++ b/services/project-grafana-logging/6.60.1/project-grafana.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: grafana.github.io namespace: kommander-flux - version: 6.58.6 + version: 6.60.1 interval: 15s install: crds: CreateReplace @@ -23,5 +23,5 @@ spec: retries: 30 valuesFrom: - kind: ConfigMap - name: project-grafana-logging-6.58.6-d2iq-defaults + name: project-grafana-logging-6.60.1-d2iq-defaults targetNamespace: ${releaseNamespace}