From 90101c6d4efefac87d6f9602741ac525c4579ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Wed, 22 Sep 2021 13:44:43 +0200 Subject: [PATCH] Bump Golang version to 1.16 (#1212) --- .github/workflows/validate.yaml | 6 +++--- go.mod | 2 +- go.sum | 3 --- knative-operator/Dockerfile | 2 +- olm-catalog/serverless-operator/project.yaml | 2 +- openshift-knative-operator/Dockerfile | 2 +- openshift/ci-operator/build-image/Dockerfile | 2 +- serving/ingress/Dockerfile | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 670245f2c2..495d073e47 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -21,7 +21,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.16.x - name: Install prerequisites env: @@ -59,10 +59,10 @@ jobs: env: GOPATH: ${{ github.workspace }} steps: - - name: Set up Go 1.15.x + - name: Set up Go 1.16.x uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.16.x - name: Checkout uses: actions/checkout@v2 diff --git a/go.mod b/go.mod index af2e27191e..a188a69450 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift-knative/serverless-operator -go 1.15 +go 1.16 require ( github.com/go-logr/logr v0.4.0 diff --git a/go.sum b/go.sum index c5c6698841..a115ab5cdd 100644 --- a/go.sum +++ b/go.sum @@ -715,9 +715,7 @@ github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -1747,7 +1745,6 @@ gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDW gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= diff --git a/knative-operator/Dockerfile b/knative-operator/Dockerfile index 00e846c53c..e9a00c895b 100644 --- a/knative-operator/Dockerfile +++ b/knative-operator/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder +FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS builder ENV BASE=github.com/openshift-knative/serverless-operator WORKDIR ${GOPATH}/src/${BASE} diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml index b0e8f73cd5..a14d05883e 100644 --- a/olm-catalog/serverless-operator/project.yaml +++ b/olm-catalog/serverless-operator/project.yaml @@ -14,7 +14,7 @@ olm: requirements: kube: minVersion: 1.19.0 - golang: '1.15' + golang: '1.16' nodejs: 14.x ocpVersion: min: '4.6' diff --git a/openshift-knative-operator/Dockerfile b/openshift-knative-operator/Dockerfile index 40ad528d3c..a6dd9c0275 100644 --- a/openshift-knative-operator/Dockerfile +++ b/openshift-knative-operator/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder +FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS builder ENV BASE=github.com/openshift-knative/serverless-operator WORKDIR ${GOPATH}/src/${BASE} diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index fecffa6758..15d8b4201b 100644 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:golang-1.15 +FROM registry.ci.openshift.org/openshift/release:golang-1.16 # Add kubernetes repository ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/ diff --git a/serving/ingress/Dockerfile b/serving/ingress/Dockerfile index e584e0f48e..34a865e433 100644 --- a/serving/ingress/Dockerfile +++ b/serving/ingress/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder +FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS builder ENV BASE=github.com/openshift-knative/serverless-operator WORKDIR ${GOPATH}/src/${BASE}