From 7fa8854abc984bdd8621275da3e14ee612f1edda Mon Sep 17 00:00:00 2001 From: Marian Lobur Date: Wed, 23 Oct 2019 12:17:05 +0200 Subject: [PATCH] Switch all components to 1.13. --- .travis.yml | 3 +-- custom-metrics-stackdriver-adapter/Dockerfile | 2 +- event-adapter/pkg/apiserver/installer/apiserver_test.go | 2 +- event-exporter/Dockerfile | 2 +- hack/for-go-proj.sh | 9 +++------ hack/verify-flags/exceptions.txt | 7 +++++-- prometheus-to-sd/Dockerfile | 2 +- prometheus-to-sd/translator/prometheus_test.go | 1 - prometheus-to-sd/translator/translator.go | 4 ++-- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e88e9c92..2a816dfd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,7 @@ language: go matrix: include: - - go: "1.9" - - go: "1.10" + - go: "1.13" go_import_path: github.com/GoogleCloudPlatform/k8s-stackdriver diff --git a/custom-metrics-stackdriver-adapter/Dockerfile b/custom-metrics-stackdriver-adapter/Dockerfile index ede8f2a78..396674485 100644 --- a/custom-metrics-stackdriver-adapter/Dockerfile +++ b/custom-metrics-stackdriver-adapter/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.10-alpine as builder +FROM golang:1.13-alpine as builder WORKDIR ${GOPATH}/src/github.com/GoogleCloudPlatform/k8s-stackdriver/custom-metrics-stackdriver-adapter COPY . ./ RUN CGO_ENABLED=0 GOOS=linux go build -o /adapter diff --git a/event-adapter/pkg/apiserver/installer/apiserver_test.go b/event-adapter/pkg/apiserver/installer/apiserver_test.go index a9e9ae046..fe97a2c47 100644 --- a/event-adapter/pkg/apiserver/installer/apiserver_test.go +++ b/event-adapter/pkg/apiserver/installer/apiserver_test.go @@ -232,7 +232,7 @@ func TestEventsAPI(t *testing.T) { if err != nil { bodyPart = fmt.Sprintf("[error extracting body: %v]", err) } - t.Errorf("request: %s", request) + t.Errorf("request: %v", request) t.Errorf("Expected %d for %s (%s), Got %#v -- %s", v.Status, v.Method, k, response, bodyPart) } } diff --git a/event-exporter/Dockerfile b/event-exporter/Dockerfile index a3e13f085..8348198b0 100644 --- a/event-exporter/Dockerfile +++ b/event-exporter/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.9-alpine as builder +FROM golang:1.13-alpine as builder WORKDIR ${GOPATH}/src/github.com/GoogleCloudPlatform/k8s-stackdriver/event-exporter COPY . ./ RUN CGO_ENABLED=0 GOOS=linux go build -o /event-exporter diff --git a/hack/for-go-proj.sh b/hack/for-go-proj.sh index 0996545d0..24e86c48d 100755 --- a/hack/for-go-proj.sh +++ b/hack/for-go-proj.sh @@ -45,11 +45,8 @@ for dep_file in ${dep_projects}; do ( project="${dep_file%Gopkg.toml}" - if [[ ( $TRAVIS_GO_VERSION =~ ^1\.9 && ! $project =~ 'custom-metrics-stackdriver-adapter' ) || - ( $TRAVIS_GO_VERSION =~ ^1\.10 && $project =~ 'custom-metrics-stackdriver-adapter' ) ]]; then - echo "go ${CMD}ing ${project}" - cd "${project}" - go "${CMD}" ./... - fi + echo "go ${CMD}ing ${project}" + cd "${project}" + go "${CMD}" ./... ) done; diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 32bfceddc..4a7f3d9d3 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -92,6 +92,9 @@ kubelet-to-gcm/monitor/kubelet/translate.go: "pod_id": "machine", kubelet-to-gcm/monitor/kubelet/translate.go: "pod_id": podID, kubelet-to-gcm/monitor/kubelet/translate.go: "project_id": t.project, kubelet-to-gcm/monitor/kubelet/translate.go: "project_id": t.project, +prometheus-to-sd/.idea/workspace.xml: +prometheus-to-sd/.idea/workspace.xml: