feat: Bump grafana-loki to 0.69.10 (#1112)

* chore: Update grafana-loki 0.69.4 => 0.69.10 * chore: Move grafana-loki/0.69.4 => grafana-loki/0.69.10 * build: fix bloodhound linting error * build: update license mapping * feat: Bump project-grafana-loki to 0.69.10 (#1114) * chore: Update project-grafana-loki 0.69.4 => 0.69.10 * chore: Move project-grafana-loki/0.69.4 => project-grafana-loki/0.69.10 * build: fix bloodhound linting error --------- Co-authored-by: d2iq-mergebot <[email protected]> Co-authored-by: Casey Buto <[email protected]> --------- Co-authored-by: d2iq-mergebot <[email protected]> Co-authored-by: Casey Buto <[email protected]>
mesosphere · Apr 5, 2023 · d761d6a · d761d6a
1 parent 156144d
commit d761d6a
Show file tree

Hide file tree

Showing 24 changed files with 16 additions and 22 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -76,7 +76,7 @@ resources:
         ref: v${image_tag}
         license_path: LICENSE
         notice_path: NOTICE.md
-  - container_image: docker.io/grafana/loki:2.7.3
+  - container_image: docker.io/grafana/loki:2.7.5
     sources:
       - url: https://github.com/grafana/loki
         ref: v${image_tag}

diff --git a/...ices/grafana-loki/0.69.4/defaults/cm.yaml → ...ces/grafana-loki/0.69.10/defaults/cm.yaml b/...ices/grafana-loki/0.69.4/defaults/cm.yaml → ...ces/grafana-loki/0.69.10/defaults/cm.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-loki-0.69.4-d2iq-defaults
+  name: grafana-loki-0.69.10-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

diff --git a/...a-loki/0.69.4/defaults/kustomization.yaml → ...-loki/0.69.10/defaults/kustomization.yaml b/...a-loki/0.69.4/defaults/kustomization.yaml → ...-loki/0.69.10/defaults/kustomization.yaml
@@ -1,5 +1,4 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- cm.yaml
+  - cm.yaml
diff --git a/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml b/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml
diff --git a/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json b/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json
diff --git a/...69.4/grafana-dashboards/grafana-loki.json → ...9.10/grafana-dashboards/grafana-loki.json b/...69.4/grafana-dashboards/grafana-loki.json → ...9.10/grafana-dashboards/grafana-loki.json
diff --git a/...9.4/grafana-dashboards/kustomization.yaml → ....10/grafana-dashboards/kustomization.yaml b/...9.4/grafana-dashboards/kustomization.yaml → ....10/grafana-dashboards/kustomization.yaml
diff --git a/....69.4/grafana-dashboards/loki-chunks.json → ...69.10/grafana-dashboards/loki-chunks.json b/....69.4/grafana-dashboards/loki-chunks.json → ...69.10/grafana-dashboards/loki-chunks.json
diff --git a/...9.4/grafana-dashboards/loki-deletion.json → ....10/grafana-dashboards/loki-deletion.json b/...9.4/grafana-dashboards/loki-deletion.json → ....10/grafana-dashboards/loki-deletion.json
diff --git a/...fana-dashboards/loki-reads-resources.json → ...fana-dashboards/loki-reads-resources.json b/...fana-dashboards/loki-reads-resources.json → ...fana-dashboards/loki-reads-resources.json
diff --git a/....4/grafana-dashboards/loki-retention.json → ...10/grafana-dashboards/loki-retention.json b/....4/grafana-dashboards/loki-retention.json → ...10/grafana-dashboards/loki-retention.json
diff --git a/...ana-dashboards/loki-writes-resources.json → ...ana-dashboards/loki-writes-resources.json b/...ana-dashboards/loki-writes-resources.json → ...ana-dashboards/loki-writes-resources.json
diff --git a/...loki/0.69.4/grafana-loki-helmrelease.yaml → ...oki/0.69.10/grafana-loki-helmrelease.yaml b/...loki/0.69.4/grafana-loki-helmrelease.yaml → ...oki/0.69.10/grafana-loki-helmrelease.yaml
@@ -12,7 +12,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.4/grafana-loki-helmrelease
+  path: ./services/grafana-loki/0.69.10/grafana-loki-helmrelease
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/...rafana-loki-helmrelease/grafana-loki.yaml → ...rafana-loki-helmrelease/grafana-loki.yaml b/...rafana-loki-helmrelease/grafana-loki.yaml → ...rafana-loki-helmrelease/grafana-loki.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -12,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: "0.69.4"
+      version: 0.69.10
   interval: 15s
   install:
     crds: CreateReplace
@@ -25,7 +24,7 @@ spec:
   releaseName: grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: grafana-loki-0.69.4-d2iq-defaults
+      name: grafana-loki-0.69.10-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:
@@ -35,11 +34,13 @@ spec:
             kind: StatefulSet
             metadata:
               name: grafana-loki-loki-distributed-ingester
+              namespace: ${releaseNamespace}
               annotations:
                 secret.reloader.stakater.com/reload: dkp-loki
           - apiVersion: apps/v1
             kind: Deployment
             metadata:
               name: grafana-loki-loki-distributed-compactor
+              namespace: ${releaseNamespace}
               annotations:
                 secret.reloader.stakater.com/reload: dkp-loki
diff --git a/...na-loki-pre-install-jobs/pre-install.yaml → ...na-loki-pre-install-jobs/pre-install.yaml b/...na-loki-pre-install-jobs/pre-install.yaml → ...na-loki-pre-install-jobs/pre-install.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/...loki/0.69.4/grafana-loki-pre-install.yaml → ...oki/0.69.10/grafana-loki-pre-install.yaml b/...loki/0.69.4/grafana-loki-pre-install.yaml → ...oki/0.69.10/grafana-loki-pre-install.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs
+  path: ./services/grafana-loki/0.69.10/grafana-loki-pre-install-jobs
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/...es/grafana-loki/0.69.4/kustomization.yaml → ...s/grafana-loki/0.69.10/kustomization.yaml b/...es/grafana-loki/0.69.4/kustomization.yaml → ...s/grafana-loki/0.69.10/kustomization.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

diff --git a/...ject-grafana-loki/0.69.4/defaults/cm.yaml → ...ect-grafana-loki/0.69.10/defaults/cm.yaml b/...ject-grafana-loki/0.69.4/defaults/cm.yaml → ...ect-grafana-loki/0.69.10/defaults/cm.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: project-grafana-loki-0.69.4-d2iq-defaults
+  name: project-grafana-loki-0.69.10-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

diff --git a/...a-loki/0.69.4/defaults/kustomization.yaml → ...-loki/0.69.10/defaults/kustomization.yaml b/...a-loki/0.69.4/defaults/kustomization.yaml → ...-loki/0.69.10/defaults/kustomization.yaml
@@ -1,5 +1,4 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- cm.yaml
+  - cm.yaml
diff --git a/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml b/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml
diff --git a/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json b/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json
diff --git a/...ct-grafana-loki/0.69.4/kustomization.yaml → ...t-grafana-loki/0.69.10/kustomization.yaml b/...ct-grafana-loki/0.69.4/kustomization.yaml → ...t-grafana-loki/0.69.10/kustomization.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

diff --git a/...ana-loki/0.69.4/object-bucket-claims.yaml → ...na-loki/0.69.10/object-bucket-claims.yaml b/...ana-loki/0.69.4/object-bucket-claims.yaml → ...na-loki/0.69.10/object-bucket-claims.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -25,7 +24,7 @@ spec:
   releaseName: project-loki-object-bucket-claims
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.4-d2iq-defaults
+      name: project-grafana-loki-0.69.10-d2iq-defaults
     - kind: ConfigMap
       name: project-grafana-loki-overrides
       optional: true

diff --git a/...ana-loki/0.69.4/project-grafana-loki.yaml → ...na-loki/0.69.10/project-grafana-loki.yaml b/...ana-loki/0.69.4/project-grafana-loki.yaml → ...na-loki/0.69.10/project-grafana-loki.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -12,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: "0.69.4"
+      version: 0.69.10
   interval: 15s
   install:
     crds: CreateReplace
@@ -25,7 +24,7 @@ spec:
   releaseName: project-grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.4-d2iq-defaults
+      name: project-grafana-loki-0.69.10-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:
@@ -35,11 +34,13 @@ spec:
             kind: StatefulSet
             metadata:
               name: project-grafana-loki-loki-distributed-ingester
+              namespace: ${releaseNamespace}
               annotations:
                 secret.reloader.stakater.com/reload: proj-loki-${releaseNamespace}
           - apiVersion: apps/v1
             kind: Deployment
             metadata:
               name: project-grafana-loki-loki-distributed-compactor
+              namespace: ${releaseNamespace}
               annotations:
                 secret.reloader.stakater.com/reload: proj-loki-${releaseNamespace}