Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions operator/Dockerfile.art
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
FROM registry-proxy.engineering.redhat.com/rh-osbs/openshift-golang-builder:v1.25.7-202602171210.g5015a16.el9 AS builder

ENV GOEXPERIMENT=strictfipsruntime
ENV CGO_ENABLED=1
ENV GOOS=linux
ENV GOFLAGS="-p=4"

COPY . /opt/app-root/src/operator
WORKDIR /opt/app-root/src/operator

RUN go build -tags strictfipsruntime -a -o ./manager ./cmd/loki-operator/main.go

FROM registry.redhat.io/ubi9/ubi-minimal:9.7

COPY --from=builder /opt/app-root/src/operator/manager /manager

ENTRYPOINT ["/manager"]

LABEL com.redhat.component="loki-operator-container" \
description="OpenShift Loki Operator to manage LokiStack installs for Openshift Logging." \
distribution-scope="subscription" \
io.k8s.description="OpenShift Loki Operator to manage LokiStack installs for Openshift Logging." \
io.k8s.display-name="OpenShift Loki Operator" \
io.openshift.maintainer.component="Logging" \
io.openshift.maintainer.product="OpenShift Container Platform" \
io.openshift.tags="openshift,logging,loki,loki-operator" \
maintainer="AOS Logging <team-logging@redhat.com>" \
name="openshift-logging/loki-rhel9-operator" \
summary="OpenShift Loki Operator to manage LokiStack installs for Openshift Logging." \
url="https://catalog.redhat.com/en/software/containers/openshift-logging/loki-rhel9-operator/64479927e1820602a81cdf13" \
vendor="Red Hat, Inc." \
version_minor="v6.2" \
version="6.2.10"
11 changes: 11 additions & 0 deletions operator/bundle/art.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
updates:
# relative to this file
- file: "openshift/manifests/loki-operator.clusterserviceversion.yaml"
update_list:
- search: "quay.io/openshift/origin-kube-rbac-proxy:latest"
replace: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:b30b0bcd2199e73ce519ed106ba4a923b2c5aadc8698816a53ea56b770caf683"
- search: "0.1.0"
replace: "6.2.10"
- search: "olm.skipRange: '>=6.0.0-0 <6.2.0'"
replace: "olm.skipRange: '>=6.0.0-0 <6.2.10'"
21 changes: 21 additions & 0 deletions operator/bundle/image-references
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
kind: ImageStream
apiVersion: image.openshift.io/v1
spec:
tags:
- name: logging-loki-rhel9
from:
kind: DockerImage
name: quay.io/openshift-logging/loki:v3.4.2
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be?

Suggested change
name: quay.io/openshift-logging/loki:v3.4.2
name: quay.io/openshift-logging/loki:v3.6.5

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, this needs to match the Loki version mentioned in the generated CSV.

- name: lokistack-gateway-rhel9
from:
kind: DockerImage
name: quay.io/observatorium/api:latest
- name: opa-openshift-rhel9
from:
kind: DockerImage
name: quay.io/observatorium/opa-openshift:latest
- name: loki-rhel9-operator
from:
kind: DockerImage
name: quay.io/openshift-logging/loki-operator:0.1.0
5 changes: 5 additions & 0 deletions operator/bundle/loki-operator.package.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
packageName: loki-operator
channels:
- name: stable-6.2
currentCSV: loki-operator.v6.2.10