Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade golang version to 1.16 #1687

Merged
merged 1 commit into from
Apr 1, 2022
Merged

Upgrade golang version to 1.16 #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ARCH ?= amd64
ALL_ARCH := amd64

# Image to use for building.
BUILD_IMAGE ?= golang:1.13.9-alpine
BUILD_IMAGE ?= golang:1.16-alpine
# Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION).
CONTAINER_PREFIX ?= ingress-gce

Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ LD_FLAGS="-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitComm
if echo "${TARGET}" | grep '.*-test$'; then
go test -c -ldflags "${LD_FLAGS}" -o "${TARGET}" "${BIN_PKG}"
else
go install -i -installsuffix "static" -ldflags "${LD_FLAGS}" "${BIN_PKG}"
go install -installsuffix "static" -ldflags "${LD_FLAGS}" "${BIN_PKG}"
fi
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8s.io/ingress-gce

go 1.13
go 1.16

require (
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0
Expand Down
5 changes: 3 additions & 2 deletions pkg/metrics/l4metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package metrics

import (
"fmt"
"testing"

"github.com/google/go-cmp/cmp"
Expand Down Expand Up @@ -158,7 +159,7 @@ func TestComputeL4ILBMetrics(t *testing.T) {
t.Parallel()
newMetrics := NewControllerMetrics()
for i, serviceState := range tc.serviceStates {
newMetrics.SetL4ILBService(string(i), serviceState)
newMetrics.SetL4ILBService(fmt.Sprint(i), serviceState)
}
got := newMetrics.computeL4ILBMetrics()
if diff := cmp.Diff(tc.expectL4ILBCount, got); diff != "" {
Expand Down Expand Up @@ -308,7 +309,7 @@ func TestComputeL4NetLBMetrics(t *testing.T) {
t.Parallel()
newMetrics := NewControllerMetrics()
for i, serviceState := range tc.serviceStates {
newMetrics.SetL4NetLBService(string(i), serviceState)
newMetrics.SetL4NetLBService(fmt.Sprint(i), serviceState)
}
got := newMetrics.computeL4NetLBMetrics()
if diff := cmp.Diff(tc.expectL4NetLBCount, got); diff != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/metrics/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ func TestComputeNegMetrics(t *testing.T) {
t.Parallel()
newMetrics := NewControllerMetrics()
for i, negState := range tc.negStates {
newMetrics.SetNegService(string(i), negState)
newMetrics.SetNegService(fmt.Sprint(i), negState)
}

gotNegCount := newMetrics.computeNegMetrics()
Expand Down
24 changes: 24 additions & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# cloud.google.com/go v0.97.0
cloud.google.com/go/compute/metadata
# github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0
## explicit
github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud
github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter
github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta
Expand Down Expand Up @@ -86,6 +87,7 @@ github.com/go-openapi/jsonpointer
# github.com/go-openapi/jsonreference v0.19.3
github.com/go-openapi/jsonreference
# github.com/go-openapi/spec v0.19.3
## explicit
github.com/go-openapi/spec
# github.com/go-openapi/swag v0.19.5
github.com/go-openapi/swag
Expand All @@ -108,6 +110,7 @@ github.com/golang/protobuf/ptypes/struct
github.com/golang/protobuf/ptypes/timestamp
github.com/golang/protobuf/ptypes/wrappers
# github.com/google/go-cmp v0.5.6
## explicit
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
Expand All @@ -127,10 +130,12 @@ github.com/googleapis/gnostic/openapiv2
github.com/hashicorp/golang-lru
github.com/hashicorp/golang-lru/simplelru
# github.com/imdario/mergo v0.3.7
## explicit
github.com/imdario/mergo
# github.com/json-iterator/go v1.1.10
github.com/json-iterator/go
# github.com/kr/pretty v0.2.0
## explicit
github.com/kr/pretty
# github.com/kr/text v0.1.0
github.com/kr/text
Expand All @@ -149,10 +154,12 @@ github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
# github.com/prometheus/client_golang v1.7.1
## explicit
github.com/prometheus/client_golang/prometheus
github.com/prometheus/client_golang/prometheus/internal
github.com/prometheus/client_golang/prometheus/promhttp
# github.com/prometheus/client_model v0.2.0
## explicit
github.com/prometheus/client_model/go
# github.com/prometheus/common v0.10.0
github.com/prometheus/common/expfmt
Expand All @@ -163,8 +170,10 @@ github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
# github.com/spf13/pflag v1.0.5
## explicit
github.com/spf13/pflag
# github.com/stretchr/testify v1.6.1
## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/require
# go.opencensus.io v0.23.0
Expand Down Expand Up @@ -197,6 +206,7 @@ golang.org/x/net/idna
golang.org/x/net/internal/timeseries
golang.org/x/net/trace
# golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
## explicit
golang.org/x/oauth2
golang.org/x/oauth2/authhandler
golang.org/x/oauth2/google
Expand All @@ -217,6 +227,7 @@ golang.org/x/text/width
# golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
golang.org/x/time/rate
# google.golang.org/api v0.60.0
## explicit
google.golang.org/api/compute/v0.alpha
google.golang.org/api/compute/v0.beta
google.golang.org/api/compute/v1
Expand Down Expand Up @@ -386,21 +397,25 @@ google.golang.org/protobuf/types/known/structpb
google.golang.org/protobuf/types/known/timestamppb
google.golang.org/protobuf/types/known/wrapperspb
# gopkg.in/gcfg.v1 v1.2.3
## explicit
gopkg.in/gcfg.v1
gopkg.in/gcfg.v1/scanner
gopkg.in/gcfg.v1/token
gopkg.in/gcfg.v1/types
# gopkg.in/inf.v0 v0.9.1
gopkg.in/inf.v0
# gopkg.in/warnings.v0 v0.1.2
## explicit
gopkg.in/warnings.v0
# gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
gopkg.in/yaml.v3
# istio.io/api v0.0.0-20190809125725-591cf32c1d0e
## explicit
istio.io/api/networking/v1alpha3
# k8s.io/api v0.20.0
## explicit
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
k8s.io/api/apiserverinternal/v1alpha1
Expand Down Expand Up @@ -445,6 +460,7 @@ k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.20.0
## explicit
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
Expand All @@ -456,6 +472,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextension
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake
# k8s.io/apimachinery v0.20.0
## explicit
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
Expand Down Expand Up @@ -502,6 +519,7 @@ k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v0.20.0
## explicit
k8s.io/client-go/discovery
k8s.io/client-go/discovery/fake
k8s.io/client-go/dynamic
Expand Down Expand Up @@ -730,27 +748,33 @@ k8s.io/client-go/util/keyutil
k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/cloud-provider v0.20.0
## explicit
k8s.io/cloud-provider
k8s.io/cloud-provider/service/helpers
k8s.io/cloud-provider/volume
k8s.io/cloud-provider/volume/errors
k8s.io/cloud-provider/volume/helpers
# k8s.io/component-base v0.20.0
## explicit
k8s.io/component-base/config
k8s.io/component-base/config/options
k8s.io/component-base/metrics
k8s.io/component-base/metrics/legacyregistry
k8s.io/component-base/version
# k8s.io/klog v1.0.0
## explicit
k8s.io/klog
# k8s.io/klog/v2 v2.4.0
k8s.io/klog/v2
# k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
## explicit
k8s.io/kube-openapi/pkg/common
k8s.io/kube-openapi/pkg/util/proto
# k8s.io/legacy-cloud-providers v0.20.0
## explicit
k8s.io/legacy-cloud-providers/gce
# k8s.io/utils v0.0.0-20201110183641-67b214c5f920
## explicit
k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/net
Expand Down