Skip to content

Commit 9b58462

Browse files
committed
Update makefile and scripts to use go 1.13 to satisfy kube 1.18 deps
1 parent c3d3bb8 commit 9b58462

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
1+
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-operator
33
COPY . .
44
RUN NO_DOCKER=1 make build

Dockerfile.rhel7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
1+
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-operator
33
COPY . .
44
RUN NO_DOCKER=1 make build

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(NO_DOCKER), 1)
2424
DOCKER_CMD =
2525
IMAGE_BUILD_CMD = imagebuilder
2626
else
27-
DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.12
27+
DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
2828
IMAGE_BUILD_CMD = docker build
2929
endif
3030

hack/go-fmt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ else
1111
--workdir /go/src/github.com/openshift/machine-api-operator \
1212
--env GO111MODULE="$GO111MODULE" \
1313
--env GOFLAGS="$GOFLAGS" \
14-
openshift/origin-release:golang-1.12 \
14+
openshift/origin-release:golang-1.13 \
1515
./hack/go-fmt.sh "${@}"
1616
fi

hack/go-lint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ else
1010
--workdir /go/src/github.com/openshift/machine-api-operator \
1111
--env GO111MODULE="$GO111MODULE" \
1212
--env GOFLAGS="$GOFLAGS" \
13-
openshift/origin-release:golang-1.12 \
13+
openshift/origin-release:golang-1.13 \
1414
./hack/go-lint.sh "${@}"
1515
fi

hack/go-vet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ else
88
--workdir /go/src/github.com/openshift/machine-api-operator \
99
--env GO111MODULE="$GO111MODULE" \
1010
--env GOFLAGS="$GOFLAGS" \
11-
openshift/origin-release:golang-1.12 \
11+
openshift/origin-release:golang-1.13 \
1212
./hack/go-vet.sh "${@}"
1313
fi;

hack/goimports.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ else
1111
--env IS_CONTAINER=TRUE \
1212
--volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \
1313
--workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \
14-
openshift/origin-release:golang-1.12 \
14+
openshift/origin-release:golang-1.13 \
1515
./hack/goimports.sh "${@}"
1616
fi

0 commit comments

Comments
 (0)