bump golang

openshift · Jun 22, 2021 · f8efac2 · f8efac2
1 parent 5d1ae11
commit f8efac2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt
 COPY . .
 RUN go build -o machine-controller-manager ./cmd/manager
 
-FROM docker.io/centos:7
+FROM docker.io/fedora:35
 RUN INSTALL_PKGS=" \
       libvirt-libs openssh-clients genisoimage \
       " && \

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -1,11 +1,11 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
 RUN yum install -y libvirt-devel
 
 WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt
 COPY . .
 RUN go build -o machine-controller-manager ./cmd/manager
 
-FROM registry.svc.ci.openshift.org/ocp/4.6:base
+FROM registry.ci.openshift.org/ocp/4.9:base
 RUN INSTALL_PKGS=" \
       libvirt-libs openssh-clients genisoimage \
       " && \

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ PROJECT     ?= cluster-api-provider-libvirt
 ORG_PATH    ?= github.com/openshift
 REPO_PATH   ?= $(ORG_PATH)/$(PROJECT)
 CLUSTER_API ?= github.com/openshift/cluster-api
-IMAGE        = origin-libvirt-machine-controllers
+IMAGE       ?= origin-libvirt-machine-controllers
 
 ifeq ($(DBG),1)
 GOGCFLAGS ?= -gcflags=all="-N -l"
@@ -22,7 +22,7 @@ ifeq ($(NO_DOCKER), 1)
   IMAGE_BUILD_CMD = imagebuilder
   CGO_ENABLED = 1
 else
-  DOCKER_CMD := $(CONTAINER_RUNTIME) run --rm -e CGO_ENABLED=1 -v "$(PWD):/go/src/$(REPO_PATH):Z" -w "/go/src/$(REPO_PATH)" openshift/origin-release:golang-1.13
+  DOCKER_CMD := $(CONTAINER_RUNTIME) run --rm -e CGO_ENABLED=1 -v "$(PWD):/go/src/$(REPO_PATH):Z" -w "/go/src/$(REPO_PATH)" registry.ci.openshift.org/openshift/release:golang-1.16
   IMAGE_BUILD_CMD = $(CONTAINER_RUNTIME) build
 endif
 

diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh
@@ -11,6 +11,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-libvirt:z" \
     --workdir /go/src/github.com/openshift/cluster-api-provider-libvirt \
-    openshift/origin-release:golang-1.13 \
+    registry.ci.openshift.org/openshift/release:golang-1.16 \
     ./hack/go-fmt.sh "${@}"
 fi
diff --git a/hack/go-lint.sh b/hack/go-lint.sh
@@ -10,6 +10,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-libvirt:z" \
     --workdir /go/src/github.com/openshift/cluster-api-provider-libvirt \
-    openshift/origin-release:golang-1.13 \
+    registry.ci.openshift.org/openshift/release:golang-1.16 \
     ./hack/go-lint.sh "${@}"
 fi
diff --git a/hack/go-vet.sh b/hack/go-vet.sh
@@ -9,6 +9,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-libvirt:z" \
     --workdir /go/src/github.com/openshift/cluster-api-provider-libvirt \
-    openshift/origin-release:golang-1.13 \
+    registry.ci.openshift.org/openshift/release:golang-1.16 \
     ./hack/go-vet.sh "${@}"
 fi;