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 <ci-mergebot@d2iq.com> Co-authored-by: Grace Do <xgrace@gmail.com>
mesosphere · Oct 19, 2023 · f05a9fa · f05a9fa
1 parent 469b115
commit f05a9fa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git 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/...s/grafana-logging/6.58.6/defaults/cm.yaml → ...s/grafana-logging/6.60.1/defaults/cm.yaml b/...s/grafana-logging/6.58.6/defaults/cm.yaml → ...s/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/...ogging/6.58.6/defaults/kustomization.yaml → ...ogging/6.60.1/defaults/kustomization.yaml b/...ogging/6.58.6/defaults/kustomization.yaml → ...ogging/6.60.1/defaults/kustomization.yaml
diff --git a/services/grafana-logging/6.58.6/grafana.yaml → services/grafana-logging/6.60.1/grafana.yaml b/services/grafana-logging/6.58.6/grafana.yaml → 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/...grafana-logging/6.58.6/kustomization.yaml → ...grafana-logging/6.60.1/kustomization.yaml b/...grafana-logging/6.58.6/kustomization.yaml → ...grafana-logging/6.60.1/kustomization.yaml
diff --git a/...t-grafana-logging/6.58.6/defaults/cm.yaml → ...t-grafana-logging/6.60.1/defaults/cm.yaml b/...t-grafana-logging/6.58.6/defaults/cm.yaml → ...t-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/...ogging/6.58.6/defaults/kustomization.yaml → ...ogging/6.60.1/defaults/kustomization.yaml b/...ogging/6.58.6/defaults/kustomization.yaml → ...ogging/6.60.1/defaults/kustomization.yaml
diff --git a/...grafana-logging/6.58.6/kustomization.yaml → ...grafana-logging/6.60.1/kustomization.yaml b/...grafana-logging/6.58.6/kustomization.yaml → ...grafana-logging/6.60.1/kustomization.yaml
diff --git a/...afana-logging/6.58.6/project-grafana.yaml → ...afana-logging/6.60.1/project-grafana.yaml b/...afana-logging/6.58.6/project-grafana.yaml → ...afana-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}