From 14aaa21c63065ded2a99d8449ce6c6e7d4108a10 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Mon, 24 Jul 2023 14:03:09 +0200 Subject: [PATCH] operator: Update Loki operand to v2.8.3 (#10019) --- operator/CHANGELOG.md | 1 + .../manifests/loki-operator.clusterserviceversion.yaml | 9 ++++++--- .../manifests/loki.grafana.com_recordingrules.yaml | 5 +++++ .../manifests/loki-operator.clusterserviceversion.yaml | 9 ++++++--- .../manifests/loki.grafana.com_recordingrules.yaml | 5 +++++ .../manifests/loki-operator.clusterserviceversion.yaml | 6 +++--- .../bases/loki-operator.clusterserviceversion.yaml | 3 +++ .../bases/loki-operator.clusterserviceversion.yaml | 3 +++ .../community-openshift/manager_related_image_patch.yaml | 2 +- .../overlays/community/manager_related_image_patch.yaml | 2 +- .../development/manager_related_image_patch.yaml | 2 +- .../overlays/openshift/manager_related_image_patch.yaml | 2 +- operator/docs/operator/compatibility.md | 1 + operator/hack/addons_dev.yaml | 4 ++-- operator/hack/addons_ocp.yaml | 4 ++-- operator/internal/manifests/var.go | 2 +- 16 files changed, 42 insertions(+), 18 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index bac845d37dbd0..2437c68a8e608 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [10019](https://github.com/grafana/loki/pull/10019) **periklis**: Update Loki operand to v2.8.3 - [9972](https://github.com/grafana/loki/pull/9972) **JoaoBraveCoding**: Fix OIDC.IssuerCAPath by updating it to type CASpec - [9931](https://github.com/grafana/loki/pull/9931) **aminesnow**: Custom configuration for LokiStack admin groups - [9971](https://github.com/grafana/loki/pull/9971) **aminesnow**: Add namespace and tenantId labels to RecordingRules diff --git a/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml index 168f3607257ed..14e9457e48e14 100644 --- a/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml @@ -150,7 +150,7 @@ metadata: categories: OpenShift Optional, Logging & Tracing certified: "false" containerImage: docker.io/grafana/loki-operator:main-ac1c1fd - createdAt: "2023-07-19T14:44:08Z" + createdAt: "2023-07-24T11:44:09Z" description: The Community Loki Operator provides Kubernetes native deployment and management of Loki and related logging components. operators.operatorframework.io/builder: operator-sdk-unknown @@ -874,6 +874,9 @@ spec: alerts. displayName: LogQL Expression path: groups[0].rules[0].expr + - description: Labels to add to each recording rule. + displayName: Labels + path: groups[0].rules[0].labels - description: The name of the time series to output to. Must be a valid metric name. displayName: Metric Name @@ -1646,7 +1649,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:2.8.2 + value: docker.io/grafana/loki:2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1769,7 +1772,7 @@ spec: provider: name: Grafana Loki SIG Operator relatedImages: - - image: docker.io/grafana/loki:2.8.2 + - image: docker.io/grafana/loki:2.8.3 name: loki - image: quay.io/observatorium/api:latest name: gateway diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml index 8e74313af6bc5..ef1ffe1d0e6d3 100644 --- a/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml +++ b/operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml @@ -84,6 +84,11 @@ spec: cycle this is evaluated at the current time, and all resultant time series become pending/firing alerts. type: string + labels: + additionalProperties: + type: string + description: Labels to add to each recording rule. + type: object record: description: The name of the time series to output to. Must be a valid metric name. diff --git a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml index 0919f6c2680e8..4f0787e96470a 100644 --- a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml @@ -150,7 +150,7 @@ metadata: categories: OpenShift Optional, Logging & Tracing certified: "false" containerImage: docker.io/grafana/loki-operator:main-ac1c1fd - createdAt: "2023-07-19T14:44:06Z" + createdAt: "2023-07-24T11:44:07Z" description: The Community Loki Operator provides Kubernetes native deployment and management of Loki and related logging components. operators.operatorframework.io/builder: operator-sdk-unknown @@ -874,6 +874,9 @@ spec: alerts. displayName: LogQL Expression path: groups[0].rules[0].expr + - description: Labels to add to each recording rule. + displayName: Labels + path: groups[0].rules[0].labels - description: The name of the time series to output to. Must be a valid metric name. displayName: Metric Name @@ -1633,7 +1636,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:2.8.2 + value: docker.io/grafana/loki:2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1744,7 +1747,7 @@ spec: provider: name: Grafana Loki SIG Operator relatedImages: - - image: docker.io/grafana/loki:2.8.2 + - image: docker.io/grafana/loki:2.8.3 name: loki - image: quay.io/observatorium/api:latest name: gateway diff --git a/operator/bundle/community/manifests/loki.grafana.com_recordingrules.yaml b/operator/bundle/community/manifests/loki.grafana.com_recordingrules.yaml index d191bf6d5fa2e..6b998ab449941 100644 --- a/operator/bundle/community/manifests/loki.grafana.com_recordingrules.yaml +++ b/operator/bundle/community/manifests/loki.grafana.com_recordingrules.yaml @@ -84,6 +84,11 @@ spec: cycle this is evaluated at the current time, and all resultant time series become pending/firing alerts. type: string + labels: + additionalProperties: + type: string + description: Labels to add to each recording rule. + type: object record: description: The name of the time series to output to. Must be a valid metric name. diff --git a/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml index a5b0649d11264..9e5ab66320e99 100644 --- a/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml @@ -150,7 +150,7 @@ metadata: categories: OpenShift Optional, Logging & Tracing certified: "false" containerImage: quay.io/openshift-logging/loki-operator:v0.1.0 - createdAt: "2023-07-19T14:44:10Z" + createdAt: "2023-07-24T11:44:11Z" description: | The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging. ## Prerequisites and Requirements @@ -1634,7 +1634,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v2.8.0 + value: quay.io/openshift-logging/loki:v2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1757,7 +1757,7 @@ spec: provider: name: Red Hat relatedImages: - - image: quay.io/openshift-logging/loki:v2.8.0 + - image: quay.io/openshift-logging/loki:v2.8.3 name: loki - image: quay.io/observatorium/api:latest name: gateway diff --git a/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml index 93cad78a6cf3e..880800ee3e1eb 100644 --- a/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml @@ -1207,6 +1207,9 @@ spec: alerts. displayName: LogQL Expression path: groups[0].rules[0].expr + - description: Labels to add to each recording rule. + displayName: Labels + path: groups[0].rules[0].labels - description: The name of the time series to output to. Must be a valid metric name. displayName: Metric Name diff --git a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml index 6986e8387df9b..bdf142ed65689 100644 --- a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml @@ -1207,6 +1207,9 @@ spec: alerts. displayName: LogQL Expression path: groups[0].rules[0].expr + - description: Labels to add to each recording rule. + displayName: Labels + path: groups[0].rules[0].labels - description: The name of the time series to output to. Must be a valid metric name. displayName: Metric Name diff --git a/operator/config/overlays/community-openshift/manager_related_image_patch.yaml b/operator/config/overlays/community-openshift/manager_related_image_patch.yaml index f5748d4053c45..bddf6592cb837 100644 --- a/operator/config/overlays/community-openshift/manager_related_image_patch.yaml +++ b/operator/config/overlays/community-openshift/manager_related_image_patch.yaml @@ -9,7 +9,7 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:2.8.2 + value: docker.io/grafana/loki:2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA diff --git a/operator/config/overlays/community/manager_related_image_patch.yaml b/operator/config/overlays/community/manager_related_image_patch.yaml index f5748d4053c45..bddf6592cb837 100644 --- a/operator/config/overlays/community/manager_related_image_patch.yaml +++ b/operator/config/overlays/community/manager_related_image_patch.yaml @@ -9,7 +9,7 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:2.8.2 + value: docker.io/grafana/loki:2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA diff --git a/operator/config/overlays/development/manager_related_image_patch.yaml b/operator/config/overlays/development/manager_related_image_patch.yaml index a561bb1cf0b78..2a9d755d3bc51 100644 --- a/operator/config/overlays/development/manager_related_image_patch.yaml +++ b/operator/config/overlays/development/manager_related_image_patch.yaml @@ -9,6 +9,6 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:2.8.2 + value: docker.io/grafana/loki:2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest diff --git a/operator/config/overlays/openshift/manager_related_image_patch.yaml b/operator/config/overlays/openshift/manager_related_image_patch.yaml index 2efabe7d80dcc..eac60f7713289 100644 --- a/operator/config/overlays/openshift/manager_related_image_patch.yaml +++ b/operator/config/overlays/openshift/manager_related_image_patch.yaml @@ -9,7 +9,7 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v2.8.0 + value: quay.io/openshift-logging/loki:v2.8.3 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA diff --git a/operator/docs/operator/compatibility.md b/operator/docs/operator/compatibility.md index 16dc70089fad1..303c9a63d75ac 100644 --- a/operator/docs/operator/compatibility.md +++ b/operator/docs/operator/compatibility.md @@ -32,3 +32,4 @@ The versions of Loki compatible to be run with the Loki Operator are: * v2.7.3 * v2.7.4 * v2.8.0 +* v2.8.3 diff --git a/operator/hack/addons_dev.yaml b/operator/hack/addons_dev.yaml index 4ff2198487394..1f28ddd44852f 100644 --- a/operator/hack/addons_dev.yaml +++ b/operator/hack/addons_dev.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: logcli - image: docker.io/grafana/logcli:2.8.2-amd64 + image: docker.io/grafana/logcli:2.8.3-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -73,7 +73,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.8.2 + image: docker.io/grafana/promtail:2.8.3 args: - -config.file=/etc/promtail/promtail.yaml - -log.level=info diff --git a/operator/hack/addons_ocp.yaml b/operator/hack/addons_ocp.yaml index 1cbac3a630251..62da11cae3bec 100644 --- a/operator/hack/addons_ocp.yaml +++ b/operator/hack/addons_ocp.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: logcli - image: docker.io/grafana/logcli:2.8.2-amd64 + image: docker.io/grafana/logcli:2.8.3-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -70,7 +70,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.8.2 + image: docker.io/grafana/promtail:2.8.3 args: - -config.file=/etc/promtail/promtail.yaml - -log.level=info diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index dd3f45fd4a88b..c0f9d8a0651ab 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -58,7 +58,7 @@ const ( EnvRelatedImageGateway = "RELATED_IMAGE_GATEWAY" // DefaultContainerImage declares the default fallback for loki image. - DefaultContainerImage = "docker.io/grafana/loki:2.8.2" + DefaultContainerImage = "docker.io/grafana/loki:2.8.3" // DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway. DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"