Skip to content

Commit

Permalink
Merge pull request k8snetworkplumbingwg#45 from openshift-bot/art-con…
Browse files Browse the repository at this point in the history
…sistency-openshift-4.12-ose-multus-admission-controller

Updating ose-multus-admission-controller images to be consistent with ART
  • Loading branch information
openshift-ci[bot] authored Jul 5, 2022
2 parents f38aae4 + 550a057 commit 1f87307
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.18-openshift-4.11
tag: rhel-8-release-golang-1.18-openshift-4.12
4 changes: 2 additions & 2 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This dockerfile is specific to building Multus admission controller for OpenShift
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder

# Add everything
ENV PKG_NAME=github.com/k8snetworkplumbingwg/net-attach-def-admission-controller
Expand All @@ -14,7 +14,7 @@ RUN ./build.sh

WORKDIR /

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/bin/webhook /usr/bin/

LABEL io.k8s.display-name="Container Networking Plugins" \
Expand Down

0 comments on commit 1f87307

Please sign in to comment.