Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-5.8] Backport PR grafana/loki#14331 #361

Merged
merged 1 commit into from
Oct 2, 2024
Merged

[release-5.8] Backport PR grafana/loki#14331 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Release 5.8.14

- [14331](https://github.com/grafana/loki/pull/14331) **periklis**: feat!(operator): Update Loki operand to v3.2.0
- [14314](https://github.com/grafana/loki/pull/14314) **periklis**: fix(operator): Use empty initiliazed pod status map when no pods
- [14279](https://github.com/grafana/loki/pull/14279) **periklis**: fix(operator): Add missing groupBy label for all rules on OpenShift

Expand Down
6 changes: 3 additions & 3 deletions operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.4.0
createdAt: "2024-09-10T12:46:25Z"
createdAt: "2024-10-02T08:48:21Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down Expand Up @@ -1681,7 +1681,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.0
value: docker.io/grafana/loki:3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1805,7 +1805,7 @@ spec:
provider:
name: Grafana Loki SIG Operator
relatedImages:
- image: docker.io/grafana/loki:3.1.0
- image: docker.io/grafana/loki:3.2.0
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
6 changes: 3 additions & 3 deletions operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.4.0
createdAt: "2024-09-10T12:46:20Z"
createdAt: "2024-10-02T08:48:19Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1661,7 +1661,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.1
value: docker.io/grafana/loki:3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1773,7 +1773,7 @@ spec:
provider:
name: Grafana Loki SIG Operator
relatedImages:
- image: docker.io/grafana/loki:3.1.1
- image: docker.io/grafana/loki:3.2.0
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
6 changes: 3 additions & 3 deletions operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2024-09-10T12:46:28Z"
createdAt: "2024-10-02T08:48:23Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -1666,7 +1666,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: quay.io/openshift-logging/loki:v3.1.1
value: quay.io/openshift-logging/loki:v3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1790,7 +1790,7 @@ spec:
provider:
name: Red Hat
relatedImages:
- image: quay.io/openshift-logging/loki:v3.1.1
- image: quay.io/openshift-logging/loki:v3.2.0
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
2 changes: 1 addition & 1 deletion operator/config/overlays/community-openshift/manager_related_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.0
value: docker.io/grafana/loki:3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
2 changes: 1 addition & 1 deletion operator/config/overlays/community/manager_related_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.1
value: docker.io/grafana/loki:3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
2 changes: 1 addition & 1 deletion operator/config/overlays/development/manager_related_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.1
value: docker.io/grafana/loki:3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
2 changes: 1 addition & 1 deletion operator/config/overlays/openshift/manager_related_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: quay.io/openshift-logging/loki:v3.1.1
value: quay.io/openshift-logging/loki:v3.2.0
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
1 change: 1 addition & 0 deletions operator/docs/operator/compatibility.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ The versions of Loki compatible to be run with the Loki Operator are:

* v3.1.0
* v3.1.1
* v3.2.0
4 changes: 2 additions & 2 deletions operator/hack/addons_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: logcli
image: docker.io/grafana/logcli:3.1.1-amd64
image: docker.io/grafana/logcli:3.2.0-amd64
imagePullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
spec:
containers:
- name: promtail
image: docker.io/grafana/promtail:3.1.1
image: docker.io/grafana/promtail:3.2.0
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
4 changes: 2 additions & 2 deletions operator/hack/addons_ocp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: logcli
image: docker.io/grafana/logcli:3.1.1-amd64
image: docker.io/grafana/logcli:3.2.0-amd64
imagePullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
spec:
containers:
- name: promtail
image: docker.io/grafana/promtail:3.1.1
image: docker.io/grafana/promtail:3.2.0
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
Loading