From ae2c9d3b4c082ce36667c1aa097a00222ef31aca Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Tue, 9 Apr 2019 11:56:17 +0200 Subject: [PATCH 1/2] Switch origin to go1.11 --- .../openshift/origin/openshift-origin-master.yaml | 14 +++++++------- .../infra/openshift/origin/images-ocp-images.yaml | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml index 4d5c548077dfa..9a02807e4240f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml @@ -31,42 +31,42 @@ images: inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - dockerfile_path: images/cli/Dockerfile.rhel from: base to: cli inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel from: cli to: cli-artifacts inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - dockerfile_path: images/hypershift/Dockerfile.rhel from: base to: hypershift inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - dockerfile_path: images/hyperkube/Dockerfile.rhel from: base to: hyperkube inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - dockerfile_path: images/tests/Dockerfile.rhel from: cli to: tests inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - context_dir: images/deployer/ dockerfile_path: Dockerfile.rhel from: cli @@ -81,7 +81,7 @@ images: inputs: bin: as: - - registry.svc.ci.openshift.org/ocp/builder:golang-1.10 + - registry.svc.ci.openshift.org/ocp/builder:golang-1.11 - context_dir: images/os/ from: base inputs: diff --git a/ci-operator/infra/openshift/origin/images-ocp-images.yaml b/ci-operator/infra/openshift/origin/images-ocp-images.yaml index 6fe967a6084d2..b3931a3a5cc44 100644 --- a/ci-operator/infra/openshift/origin/images-ocp-images.yaml +++ b/ci-operator/infra/openshift/origin/images-ocp-images.yaml @@ -69,6 +69,14 @@ spec: scheduled: true referencePolicy: type: Local + - name: golang-1.11 + from: + kind: DockerImage + name: docker.io/openshift/origin-release:golang-1.11 + importPolicy: + scheduled: true + referencePolicy: + type: Local --- kind: ImageStream apiVersion: image.openshift.io/v1 From f649a1f0b4b89be47a828896bd580a37bc27ea5e Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Tue, 9 Apr 2019 12:13:03 +0200 Subject: [PATCH 2/2] Bump go1.10 and go1.11 to latest available versions --- projects/origin-release/golang-1.10/Dockerfile | 2 +- projects/origin-release/golang-1.11/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/origin-release/golang-1.10/Dockerfile b/projects/origin-release/golang-1.10/Dockerfile index b99a5b0d43e40..d4d548415b121 100644 --- a/projects/origin-release/golang-1.10/Dockerfile +++ b/projects/origin-release/golang-1.10/Dockerfile @@ -6,7 +6,7 @@ # FROM centos:7 -ENV VERSION=1.10.3 \ +ENV VERSION=1.10.8 \ GOCACHE=/go/.cache \ GOARM=5 \ GOPATH=/go \ diff --git a/projects/origin-release/golang-1.11/Dockerfile b/projects/origin-release/golang-1.11/Dockerfile index 1ed33bbb208ff..8b2ea9c8a8bf0 100644 --- a/projects/origin-release/golang-1.11/Dockerfile +++ b/projects/origin-release/golang-1.11/Dockerfile @@ -6,7 +6,7 @@ # FROM centos:7 -ENV VERSION=1.11.5 \ +ENV VERSION=1.11.8 \ GOCACHE=/go/.cache \ GOARM=5 \ GOPATH=/go \