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

Jump to bottom

cluster-logging-operator: Apply #51317 to release-5.9 #51478

Merged
merged 1 commit into from
Apr 30, 2024
+19 −2
Merged

cluster-logging-operator: Apply #51317 to release-5.9 #51478

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 19 additions & 2 deletions ...ig/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-5.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,25 @@ images:
- dockerfile_path: olm_deploy/operatorregistry/Dockerfile
from: base
to: cluster-logging-operator-registry
- dockerfile_path: Dockerfile.e2e
from: elasticsearch-operator-src
- dockerfile_literal: |
FROM registry.ci.openshift.org/logging/5.8:elasticsearch-operator-src AS es-src
FROM registry.redhat.io/ubi9/go-toolset:latest
ADD . /go/src/github.com/openshift/cluster-logging-operator
COPY --from=es-src /go/src/github.com/openshift/elasticsearch-operator /go/src/github.com/openshift/elasticsearch-operator
WORKDIR /go/src/github.com/openshift/cluster-logging-operator
USER 0
RUN mkdir -p /go/src/github.com/openshift/cluster-logging-operator/bin/
RUN go mod download
RUN make tools
RUN chmod -R 777 /go
RUN make bin/functional-benchmarker
inputs:
base:
as:
- registry.redhat.io/ubi9/go-toolset:latest
elasticsearch-operator-src:
as:
- registry.ci.openshift.org/logging/5.8:elasticsearch-operator-src
to: cluster-logging-operator-e2e
operator:
bundles:
Expand Down