Skip to content

Bug 1867510: fix CVP issues due to incorrect labels set #83

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 10, 2020
Merged

Bug 1867510: fix CVP issues due to incorrect labels set #83

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
12 changes: 7 additions & 5 deletions Dockerfile.config-reloader.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Dockerfile used by OSBS and by prow CI.
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
WORKDIR /go/src/github.com/coreos/prometheus-operator
COPY . .
ENV GO111MODULE=on
ENV GOFLAGS="-mod=vendor"
RUN OS=$(go env GOOS) ARCH=$(go env GOARCH) make prometheus-config-reloader

FROM registry.svc.ci.openshift.org/ocp/4.0:base
LABEL io.k8s.display-name="Prometheus config reloader" \
io.k8s.description="This component reloads a Prometheus server in a controlled and configurable way." \
io.openshift.tags="prometheus" \
summary="This component reloads a Prometheus server in a controlled and configurable way." \
maintainer="OpenShift Monitoring Team <team-monitoring@redhat.com>"

COPY --from=builder /go/src/github.com/coreos/prometheus-operator/prometheus-config-reloader /usr/bin/
# doesn't require a root user.
USER 1001
ENTRYPOINT ["/usr/bin/prometheus-config-reloader"]
LABEL io.k8s.display-name="Prometheus config reloader" \
io.k8s.description="This component reloads a Prometheus server in a controlled and configurable way." \
io.openshift.tags="prometheus" \
maintainer="Frederic Branczyk <fbranczy@redhat.com>"
12 changes: 7 additions & 5 deletions Dockerfile.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Dockerfile used by OSBS and by prow CI.
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
WORKDIR /go/src/github.com/coreos/prometheus-operator
COPY . .
ENV GO111MODULE=on
ENV GOFLAGS="-mod=vendor"
RUN OS=$(go env GOOS) ARCH=$(go env GOARCH) make operator-no-deps

FROM registry.svc.ci.openshift.org/ocp/4.0:base
LABEL io.k8s.display-name="Prometheus Operator" \
io.k8s.description="This component manages the lifecycle and configuration of a Prometheus monitoring server as well as Prometheus Alertmanager clusters." \
io.openshift.tags="prometheus" \
summary="This component manages the lifecycle and configuration of a Prometheus monitoring server as well as Prometheus Alertmanager clusters." \
maintainer="OpenShift Monitoring Team <team-monitoring@redhat.com>"

COPY --from=builder /go/src/github.com/coreos/prometheus-operator/operator /usr/bin/
# doesn't require a root user.
USER 1001
ENTRYPOINT ["/usr/bin/operator"]
LABEL io.k8s.display-name="Prometheus Operator" \
io.k8s.description="This component manages the lifecycle and configuration of a Prometheus monitoring server as well as Prometheus Alertmanager clusters." \
io.openshift.tags="prometheus" \
maintainer="Frederic Branczyk <fbranczy@redhat.com>"