Skip to content

Commit

Permalink
enable Konflux pipeline (#84)
Browse files Browse the repository at this point in the history
Signed-off-by: Xiangjing Li <[email protected]>
(cherry picked from commit 2487a71a2de1b77380ebee130e35548763b79880)
  • Loading branch information
xiangjingli authored and magic-mirror-bot[bot] committed Jun 3, 2024
1 parent 26b27fa commit a569a27
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
13 changes: 8 additions & 5 deletions build/Dockerfile.rhtap
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS plugin-builder

WORKDIR go/src/open-cluster-management.io/multicloud-operators-channel
WORKDIR /go/src/github.com/stolostron/multicluster-operators-channel
COPY . .
RUN make -f Makefile build
RUN rm -fr vendor && \
go mod vendor && \
make -f Makefile.prow build


FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

Expand All @@ -14,11 +17,11 @@ ENV OPERATOR=/usr/local/bin/multicluster-operators-channel \
USER_NAME=multicluster-operators-channel

# install operator binary
COPY --from=builder go/src/open-cluster-management.io/multicloud-operators-channel/build/_output/bin/multicluster-operators-channel ${OPERATOR}
COPY --from=plugin-builder /go/src/github.com/stolostron/multicluster-operators-channel/build/_output/bin/multicluster-operators-channel ${OPERATOR}

COPY build/bin /usr/local/bin
RUN /usr/local/bin/user_setup

ENTRYPOINT ["/usr/local/bin/entrypoint"]

USER ${USER_UID}
USER ${USER_UID}
3 changes: 2 additions & 1 deletion pkg/webhook/certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ func GenerateWebhookCerts(clt client.Client, certDir, webhookServiceNs, webhookS
return nil, err
}

if err := os.MkdirAll(certDir, os.ModePerm); err != nil {
err = os.MkdirAll(certDir, os.ModePerm) // #nosec G301
if err != nil {
return nil, err
}

Expand Down

0 comments on commit a569a27

Please sign in to comment.