diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 3d011b82c..ee5ae46dc 100644 --- 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/services/grafana-loki/0.69.4/defaults/cm.yaml b/services/grafana-loki/0.69.10/defaults/cm.yaml similarity index 99% rename from services/grafana-loki/0.69.4/defaults/cm.yaml rename to services/grafana-loki/0.69.10/defaults/cm.yaml index 56a46abcf..e30a123dd 100644 --- a/services/grafana-loki/0.69.4/defaults/cm.yaml +++ b/services/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/services/project-grafana-loki/0.69.4/defaults/kustomization.yaml b/services/grafana-loki/0.69.10/defaults/kustomization.yaml similarity index 84% rename from services/project-grafana-loki/0.69.4/defaults/kustomization.yaml rename to services/grafana-loki/0.69.10/defaults/kustomization.yaml index fc857539d..77c753a51 100644 --- a/services/project-grafana-loki/0.69.4/defaults/kustomization.yaml +++ b/services/grafana-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/services/grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.69.10/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml rename to services/grafana-loki/0.69.10/grafana-dashboards-logging/kustomization.yaml diff --git a/services/grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.69.10/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/grafana-loki/0.69.10/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.69.10/grafana-dashboards/grafana-loki.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/grafana-loki.json rename to services/grafana-loki/0.69.10/grafana-dashboards/grafana-loki.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.69.10/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/kustomization.yaml rename to services/grafana-loki/0.69.10/grafana-dashboards/kustomization.yaml diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.69.10/grafana-dashboards/loki-chunks.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-chunks.json rename to services/grafana-loki/0.69.10/grafana-dashboards/loki-chunks.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.69.10/grafana-dashboards/loki-deletion.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-deletion.json rename to services/grafana-loki/0.69.10/grafana-dashboards/loki-deletion.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.69.10/grafana-dashboards/loki-reads-resources.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-reads-resources.json rename to services/grafana-loki/0.69.10/grafana-dashboards/loki-reads-resources.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.69.10/grafana-dashboards/loki-retention.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-retention.json rename to services/grafana-loki/0.69.10/grafana-dashboards/loki-retention.json diff --git a/services/grafana-loki/0.69.4/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.69.10/grafana-dashboards/loki-writes-resources.json similarity index 100% rename from services/grafana-loki/0.69.4/grafana-dashboards/loki-writes-resources.json rename to services/grafana-loki/0.69.10/grafana-dashboards/loki-writes-resources.json diff --git a/services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.69.10/grafana-loki-helmrelease.yaml similarity index 91% rename from services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml rename to services/grafana-loki/0.69.10/grafana-loki-helmrelease.yaml index 3be10e911..f5c8d4256 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-helmrelease.yaml +++ b/services/grafana-loki/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/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.69.10/grafana-loki-helmrelease/grafana-loki.yaml similarity index 88% rename from services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml rename to services/grafana-loki/0.69.10/grafana-loki-helmrelease/grafana-loki.yaml index c80f87182..69346afda 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-helmrelease/grafana-loki.yaml +++ b/services/grafana-loki/0.69.10/grafana-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/services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.69.10/grafana-loki-pre-install-jobs/pre-install.yaml similarity index 99% rename from services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs/pre-install.yaml rename to services/grafana-loki/0.69.10/grafana-loki-pre-install-jobs/pre-install.yaml index 0989c3fe8..716102418 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-pre-install-jobs/pre-install.yaml +++ b/services/grafana-loki/0.69.10/grafana-loki-pre-install-jobs/pre-install.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: ServiceAccount metadata: diff --git a/services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml b/services/grafana-loki/0.69.10/grafana-loki-pre-install.yaml similarity index 85% rename from services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml rename to services/grafana-loki/0.69.10/grafana-loki-pre-install.yaml index e2f8e750e..5a1651fa3 100644 --- a/services/grafana-loki/0.69.4/grafana-loki-pre-install.yaml +++ b/services/grafana-loki/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/services/grafana-loki/0.69.4/kustomization.yaml b/services/grafana-loki/0.69.10/kustomization.yaml similarity index 98% rename from services/grafana-loki/0.69.4/kustomization.yaml rename to services/grafana-loki/0.69.10/kustomization.yaml index 163ea038e..86ed3d407 100644 --- a/services/grafana-loki/0.69.4/kustomization.yaml +++ b/services/grafana-loki/0.69.10/kustomization.yaml @@ -1,4 +1,3 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: diff --git a/services/project-grafana-loki/0.69.4/defaults/cm.yaml b/services/project-grafana-loki/0.69.10/defaults/cm.yaml similarity index 99% rename from services/project-grafana-loki/0.69.4/defaults/cm.yaml rename to services/project-grafana-loki/0.69.10/defaults/cm.yaml index 14c5ec5dc..a3271a51f 100644 --- a/services/project-grafana-loki/0.69.4/defaults/cm.yaml +++ b/services/project-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/services/grafana-loki/0.69.4/defaults/kustomization.yaml b/services/project-grafana-loki/0.69.10/defaults/kustomization.yaml similarity index 84% rename from services/grafana-loki/0.69.4/defaults/kustomization.yaml rename to services/project-grafana-loki/0.69.10/defaults/kustomization.yaml index fc857539d..77c753a51 100644 --- a/services/grafana-loki/0.69.4/defaults/kustomization.yaml +++ b/services/project-grafana-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/services/project-grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.69.10/grafana-dashboards-logging/kustomization.yaml similarity index 100% rename from services/project-grafana-loki/0.69.4/grafana-dashboards-logging/kustomization.yaml rename to services/project-grafana-loki/0.69.10/grafana-dashboards-logging/kustomization.yaml diff --git a/services/project-grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.69.10/grafana-dashboards-logging/logging-loki-dashboard.json similarity index 100% rename from services/project-grafana-loki/0.69.4/grafana-dashboards-logging/logging-loki-dashboard.json rename to services/project-grafana-loki/0.69.10/grafana-dashboards-logging/logging-loki-dashboard.json diff --git a/services/project-grafana-loki/0.69.4/kustomization.yaml b/services/project-grafana-loki/0.69.10/kustomization.yaml similarity index 97% rename from services/project-grafana-loki/0.69.4/kustomization.yaml rename to services/project-grafana-loki/0.69.10/kustomization.yaml index d75c8b309..977a48fcf 100644 --- a/services/project-grafana-loki/0.69.4/kustomization.yaml +++ b/services/project-grafana-loki/0.69.10/kustomization.yaml @@ -1,4 +1,3 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: diff --git a/services/project-grafana-loki/0.69.4/object-bucket-claims.yaml b/services/project-grafana-loki/0.69.10/object-bucket-claims.yaml similarity index 92% rename from services/project-grafana-loki/0.69.4/object-bucket-claims.yaml rename to services/project-grafana-loki/0.69.10/object-bucket-claims.yaml index eac69b16f..dda788d82 100644 --- a/services/project-grafana-loki/0.69.4/object-bucket-claims.yaml +++ b/services/project-grafana-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/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml b/services/project-grafana-loki/0.69.10/project-grafana-loki.yaml similarity index 88% rename from services/project-grafana-loki/0.69.4/project-grafana-loki.yaml rename to services/project-grafana-loki/0.69.10/project-grafana-loki.yaml index 59df72d1e..a5964fc35 100644 --- a/services/project-grafana-loki/0.69.4/project-grafana-loki.yaml +++ b/services/project-grafana-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}