Upgrade go mod default: k8s.io/xxx v0.18.8 (#645)

* ⬆️ use k8s.io/* v0.18.8 Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * ⬆️ update go.mod, go.sum Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * 🐛 fix pre-commit hook Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * 🐛 fix Makefile: compatible with macOS Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * 💚 run builds and tests when go.mod and go.sum updated Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * ✅ fix tests: internal/version Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>
vdaas · Aug 27, 2020 · 99a0b9e · 99a0b9e
1 parent cfcf27a
commit 99a0b9e
Show file tree

Hide file tree

Showing 18 changed files with 815 additions and 61 deletions.
diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -22,6 +24,8 @@ on:
       - 'versions/NGT_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -22,6 +24,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-backup-manager-cassandra-image.yml b/.github/workflows/dockers-backup-manager-cassandra-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -23,6 +25,8 @@ on:
       - 'versions/NGT_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-backup-manager-mysql-image.yml b/.github/workflows/dockers-backup-manager-mysql-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -22,6 +24,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -20,6 +22,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-gateway-vald-image.yml b/.github/workflows/dockers-gateway-vald-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -21,6 +23,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-loadtest-image.yml b/.github/workflows/dockers-loadtest-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -21,6 +23,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-manager-compressor-image.yml b/.github/workflows/dockers-manager-compressor-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -21,6 +23,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-manager-index-image.yml b/.github/workflows/dockers-manager-index-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -21,6 +23,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-meta-cassandra-image.yml b/.github/workflows/dockers-meta-cassandra-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -22,6 +24,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/dockers-meta-redis-image.yml b/.github/workflows/dockers-meta-redis-image.yml
@@ -9,6 +9,8 @@ on:
        - '*.*.*-*'
        - 'v*.*.*-*'
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'
@@ -22,6 +24,8 @@ on:
       - 'versions/GO_VERSION'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - 'internal/**'
       - '!internal/**/*_test.go'
       - '!internal/db/**'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,12 +4,16 @@ on:
     branches:
       - master
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - '.github/workflows/test.yml'
       - 'internal/**'
       - 'pkg/**'
       - 'cmd/**'
   pull_request:
     paths:
+      - 'go.mod'
+      - 'go.sum'
       - '.github/workflows/test.yml'
       - 'internal/**'
       - 'pkg/**'

diff --git a/Makefile b/Makefile
@@ -62,7 +62,13 @@ SWAP_TAG             ?= latest
 BINDIR ?= /usr/local/bin
 
 UNAME := $(eval UNAME := $(shell uname))$(UNAME)
+
+ifeq ($(UNAME),Linux)
 CPU_INFO_FLAGS := $(eval CPU_INFO_FLAGS := $(shell cat /proc/cpuinfo | grep flags | cut -d " " -f 2- | head -1))$(CPU_INFO_FLAGS)
+else
+CPU_INFO_FLAGS := ""
+endif
+
 GIT_COMMIT := $(eval GIT_COMMIT := $(shell git rev-list -1 HEAD))$(GIT_COMMIT)
 
 MAKELISTS := Makefile $(shell find Makefile.d -type f -regex ".*\.mk")
@@ -243,7 +249,6 @@ format: \
 	license \
 	update/goimports \
 	format/yaml
-	# format/docker
 
 .PHONY: update/goimports
 ## run goimports for all go files
@@ -322,11 +327,16 @@ ngt/install: /usr/local/include/NGT/Capi.h
 .PHONY: tensorflow/install
 ## install TensorFlow for C
 tensorflow/install: /usr/local/lib/libtensorflow.so
+ifeq ($(UNAME),Darwin)
+/usr/local/lib/libtensorflow.so:
+	brew install libtensorflow@1
+else
 /usr/local/lib/libtensorflow.so:
 	curl -LO https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
 	tar -C /usr/local -xzf libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
 	rm -f libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
 	ldconfig
+endif
 
 .PHONY: lint
 ## run lints

diff --git a/go.mod b/go.mod
@@ -6,34 +6,76 @@ replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.33.21
 	github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1
-	github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.5.1-0.20200617111016-cc0024f9c4d3
+	github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.7.4-0.20200821164133-7540597692ae
 	github.com/coreos/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
 	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
 	github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.4.0
-	github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.1-0.20200531100419-12508c83901b
-	github.com/gocql/gocql => github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e
-	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
+	github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.1-0.20200818111213-46351a889297
+	github.com/gocql/gocql => github.com/gocql/gocql v0.0.0-20200815110948-5378c8f664e9
+	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2-0.20200807193113-deb6fe8ca7c6
+	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
 	github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.12.0
-	github.com/gorilla/mux => github.com/gorilla/mux v1.7.5-0.20200517040254-948bec34b516
-	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
+	github.com/gorilla/mux => github.com/gorilla/mux v1.8.0
+	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.3-0.20200822210332-78ab81e2420a
 	github.com/tensorflow/tensorflow => github.com/tensorflow/tensorflow v2.1.0+incompatible
-	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
-	k8s.io/api => k8s.io/api v0.18.5
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.5
-	k8s.io/client-go => k8s.io/client-go v0.18.5
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.0
+	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+	k8s.io/api => k8s.io/api v0.18.8
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.8
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.8
+	k8s.io/client-go => k8s.io/client-go v0.18.8
+	k8s.io/metrics => k8s.io/metrics v0.18.8
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.2
 )
 
 require (
-	github.com/cockroachdb/errors v0.0.0-00010101000000-000000000000
-	github.com/golang/protobuf v1.4.2 // indirect
+	cloud.google.com/go v0.64.0
+	code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48
+	contrib.go.opencensus.io/exporter/jaeger v0.2.1
+	contrib.go.opencensus.io/exporter/prometheus v0.2.0
+	contrib.go.opencensus.io/exporter/stackdriver v0.13.4
+	github.com/aws/aws-sdk-go v1.23.20
+	github.com/cespare/xxhash/v2 v2.1.1
+	github.com/cockroachdb/errors v1.6.1
+	github.com/danielvladco/go-proto-gql/pb v0.6.1
+	github.com/envoyproxy/protoc-gen-validate v0.1.0
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/go-redis/redis/v7 v7.4.0
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/gocql/gocql v0.0.0-20200131111108-92af2e088537
+	github.com/gocraft/dbr/v2 v2.7.0
+	github.com/gogo/protobuf v1.3.1
+	github.com/google/go-cmp v0.5.2
+	github.com/google/gofuzz v1.2.0
+	github.com/gorilla/mux v1.7.1
+	github.com/hashicorp/go-version v1.2.1
+	github.com/json-iterator/go v1.1.10
+	github.com/klauspost/compress v1.10.11
+	github.com/kpango/fastime v1.0.16
+	github.com/kpango/fuid v0.0.0-20200823100533-287aa95e0641
+	github.com/kpango/gache v1.2.3
 	github.com/kpango/glg v1.5.1
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
-	golang.org/x/text v0.3.3 // indirect
-	golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1 // indirect
-	google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3 // indirect
-	google.golang.org/grpc v1.30.0 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.0.3
+	github.com/pierrec/lz4/v3 v3.3.2
+	github.com/scylladb/gocqlx v1.5.0
+	github.com/tensorflow/tensorflow v0.0.0-00010101000000-000000000000
+	github.com/yahoojapan/gongt v0.0.0-20190517050727-966dcc7aa5e8
+	github.com/yahoojapan/ngtd v0.0.0-20200424071638-9872bbae3700
+	go.opencensus.io v0.22.4
+	go.uber.org/automaxprocs v1.3.0
+	go.uber.org/goleak v1.1.10
+	golang.org/x/net v0.0.0-20200822124328-c89045814202
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
+	gonum.org/v1/hdf5 v0.0.0-20200504100616-496fefe91614
+	gonum.org/v1/netlib v0.0.0-20200824093956-f0ca4b3a5ef5 // indirect
+	gonum.org/v1/plot v0.7.0
+	google.golang.org/api v0.30.0
+	google.golang.org/genproto v0.0.0-20200825200019-8632dd797987
+	google.golang.org/grpc v1.31.1
+	gopkg.in/yaml.v2 v2.3.0
+	k8s.io/api v0.18.8
+	k8s.io/apimachinery v0.18.8
+	k8s.io/client-go v0.18.8
+	k8s.io/metrics v0.0.0-00010101000000-000000000000
+	sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
 )