Skip to content

Commit

Permalink
feat(operator): Update Loki operand to v3.1.1 (#14042)
Browse files Browse the repository at this point in the history
  • Loading branch information
periklis committed Sep 4, 2024
1 parent 677d217 commit 7ae1588
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 28 deletions.
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.6.1
createdAt: "2024-07-05T08:22:21Z"
createdAt: "2024-09-04T13:09:06Z"
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
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.6.1
createdAt: "2024-07-05T08:22:19Z"
createdAt: "2024-09-04T13:09:04Z"
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 @@ -1712,7 +1712,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.1.0
value: docker.io/grafana/loki:3.1.1
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1824,7 +1824,7 @@ spec:
provider:
name: Grafana Loki SIG Operator
relatedImages:
- image: docker.io/grafana/loki:3.1.0
- image: docker.io/grafana/loki:3.1.1
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
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-07-05T08:22:23Z"
createdAt: "2024-09-04T13:09:07Z"
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 @@ -1717,7 +1717,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: quay.io/openshift-logging/loki:v3.1.0
value: quay.io/openshift-logging/loki:v3.1.1
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1841,7 +1841,7 @@ spec:
provider:
name: Red Hat
relatedImages:
- image: quay.io/openshift-logging/loki:v3.1.0
- image: quay.io/openshift-logging/loki:v3.1.1
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
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.1.1
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
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.0
value: docker.io/grafana/loki:3.1.1
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
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.0
value: quay.io/openshift-logging/loki:v3.1.1
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
14 changes: 1 addition & 13 deletions operator/docs/operator/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,5 @@ Due to the use of apiextensions.k8s.io/v1 CustomResourceDefinitions, requires Ku

The versions of Loki compatible to be run with the Loki Operator are:

* v2.7.1
* v2.7.2
* v2.7.3
* v2.7.4
* v2.8.0
* v2.8.3
* v2.9.0
* v2.9.1
* v2.9.2
* v2.9.3
* v2.9.4
* v2.9.6
* v2.9.8
* v3.1.0
* v3.1.1
4 changes: 2 additions & 2 deletions operator/hack/addons_dev.yaml
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.0-amd64
image: docker.io/grafana/logcli:3.1.1-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.0
image: docker.io/grafana/promtail:3.1.1
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
4 changes: 2 additions & 2 deletions operator/hack/addons_ocp.yaml
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.0-amd64
image: docker.io/grafana/logcli:3.1.1-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.0
image: docker.io/grafana/promtail:3.1.1
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
2 changes: 1 addition & 1 deletion operator/internal/manifests/var.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const (
EnvRelatedImageGateway = "RELATED_IMAGE_GATEWAY"

// DefaultContainerImage declares the default fallback for loki image.
DefaultContainerImage = "docker.io/grafana/loki:3.1.0"
DefaultContainerImage = "docker.io/grafana/loki:3.1.1"

// DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway.
DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"
Expand Down

0 comments on commit 7ae1588

Please sign in to comment.