Skip to content

Commit

Permalink
Merge branch 'master' into test/pkg/implement-agent-ngt-handler-remov…
Browse files Browse the repository at this point in the history
…e-test
  • Loading branch information
kpango authored May 16, 2022
2 parents 9eeb9d2 + 6d6a6c4 commit a7bf98d
Show file tree
Hide file tree
Showing 20 changed files with 522 additions and 194 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Go Version: 1.18.1
- Go Version: 1.18.2
- Docker Version: 20.10.8
- Kubernetes Version: 1.22.0
- NGT Version: 1.14.3
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/security_issue_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Go Version: 1.18.1
- Go Version: 1.18.2
- Docker Version: 20.10.8
- Kubernetes Version: 1.22.0
- NGT Version: 1.14.3
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<!--- Please change the versions below along with your environment -->

- Go Version: 1.18.1
- Go Version: 1.18.2
- Docker Version: 20.10.8
- Kubernetes Version: 1.22.0
- NGT Version: 1.14.3
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ TENSORFLOW_C_VERSION := $(eval TENSORFLOW_C_VERSION := $(shell cat versions/TENS

OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION)

KIND_VERSION ?= v0.12.0
KIND_VERSION ?= v0.13.0
HELM_VERSION ?= v3.8.2
HELM_DOCS_VERSION ?= 1.8.1
YQ_VERSION ?= v4.24.5
VALDCLI_VERSION ?= v1.5.1
TELEPRESENCE_VERSION ?= 2.5.6
HELM_DOCS_VERSION ?= 1.10.0
YQ_VERSION ?= v4.25.1
VALDCLI_VERSION ?= v1.5.2
TELEPRESENCE_VERSION ?= 2.5.8
KUBELINTER_VERSION ?= 0.2.6
GOLANGCILINT_VERSION ?= v1.45.2
REVIEWDOG_VERSION ?= v0.14.0
PROTOBUF_VERSION ?= 3.20.0
GOLANGCILINT_VERSION ?= v1.46.0
REVIEWDOG_VERSION ?= v0.14.1
PROTOBUF_VERSION ?= 3.20.1

SWAP_DEPLOYMENT_TYPE ?= deployment
SWAP_IMAGE ?= ""
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/functions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ blue = printf "\x1b[34m\#\# %s\x1b[0m\n" $1
pink = printf "\x1b[35m\#\# %s\x1b[0m\n" $1
cyan = printf "\x1b[36m\#\# %s\x1b[0m\n" $1

define go-get
define go-install
GO111MODULE=on go install $1@latest
endef

Expand Down
20 changes: 10 additions & 10 deletions Makefile.d/proto.mk
Original file line number Diff line number Diff line change
Expand Up @@ -105,34 +105,34 @@ $(GOPATH)/src/google.golang.org/genproto:
$(GOPATH)/src/google.golang.org/genproto

$(GOPATH)/bin/google.golang.org/genproto:
$(call go-get, google.golang.org/genproto/...)
$(call go-get-no-mod, google.golang.org/genproto/...)

$(GOPATH)/bin/protoc-gen-go:
$(call go-get, google.golang.org/protobuf/cmd/protoc-gen-go)
$(call go-install, google.golang.org/protobuf/cmd/protoc-gen-go)

$(GOPATH)/bin/protoc-gen-go-grpc:
$(call go-get-no-mod, google.golang.org/grpc/cmd/protoc-gen-go-grpc)
$(call go-install, google.golang.org/grpc/cmd/protoc-gen-go-grpc)

$(GOPATH)/bin/protoc-gen-grpc-gateway:
$(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway)
$(call go-install, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway)

$(GOPATH)/bin/protoc-gen-swagger:
$(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger)
$(call go-install, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger)

$(GOPATH)/bin/protoc-gen-validate:
$(call go-get, github.com/envoyproxy/protoc-gen-validate)
$(call go-install, github.com/envoyproxy/protoc-gen-validate)

$(GOPATH)/bin/prototool:
$(call go-get, github.com/uber/prototool/cmd/prototool)
$(call go-install, github.com/uber/prototool/cmd/prototool)

$(GOPATH)/bin/protoc-gen-doc:
$(call go-get, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc)
$(call go-install, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc)

$(GOPATH)/bin/protoc-gen-go-vtproto:
$(call go-get, github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto)
$(call go-install, github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto)

$(GOPATH)/bin/swagger:
$(call go-get, github.com/go-swagger/go-swagger/cmd/swagger)
$(call go-install, github.com/go-swagger/go-swagger/cmd/swagger)

$(PBGOS): \
$(PROTOS) \
Expand Down
4 changes: 2 additions & 2 deletions Makefile.d/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ coverage:
.PHONY: tparse/install
## install tparse
tparse/install:
go get -u github.com/mfridman/tparse
$(call go-install, github.com/mfridman/tparse)

.PHONY: gotests/install
## install gotests
gotests/install:
go get -u github.com/cweill/gotests/...
$(call go-install, github.com/cweill/gotests/gotests)

.PHONY: gotests/gen
## generate missing go test files
Expand Down
8 changes: 4 additions & 4 deletions Makefile.d/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@ $(BINDIR)/golangci-lint:
goimports/install: $(GOPATH)/bin/goimports

$(GOPATH)/bin/goimports:
go install golang.org/x/tools/cmd/goimports@latest
$(call go-install, golang.org/x/tools/cmd/goimports)

.PHONY: strictgoimports/install
strictgoimports/install: $(GOPATH)/bin/strictgoimports

$(GOPATH)/bin/strictgoimports:
go install github.com/momotaro98/strictgoimports/cmd/strictgoimports@latest
$(call go-install, github.com/momotaro98/strictgoimports/cmd/strictgoimports)

.PHONY: gofumpt/install
gofumpt/install: $(GOPATH)/bin/gofumpt

$(GOPATH)/bin/gofumpt:
go install mvdan.cc/gofumpt@latest
$(call go-install, mvdan.cc/gofumpt)

.PHONY: golines/install
golines/install: $(GOPATH)/bin/golines

$(GOPATH)/bin/golines:
go install github.com/segmentio/golines@latest
$(call go-install, github.com/segmentio/golines)

.PHONY: prettier/install
prettier/install: $(BINDIR)/prettier
Expand Down
10 changes: 5 additions & 5 deletions example/client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ replace (
github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
github.com/kpango/glg => github.com/kpango/glg v1.6.10
github.com/pkg/sftp => github.com/pkg/sftp v1.13.4
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88
golang.org/x/net => golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/text => golang.org/x/text v0.3.7
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
google.golang.org/grpc => google.golang.org/grpc v1.46.0
google.golang.org/protobuf => google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99
)

require (
github.com/kpango/fuid v0.0.0-20220209050620-e5987ba1ea5e
github.com/kpango/glg v1.6.10
github.com/vdaas/vald-client-go v1.5.1
github.com/vdaas/vald-client-go v1.5.2
gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946
google.golang.org/grpc v1.45.0
google.golang.org/grpc v1.46.0
)

require (
Expand Down
12 changes: 6 additions & 6 deletions example/client/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/vdaas/vald-client-go v1.5.1 h1:cHRVa186T3YkJGt31LYQJh8UO6JH5XpKQbV35t/XtYE=
github.com/vdaas/vald-client-go v1.5.1/go.mod h1:MAaX058wFsHlhHjqH53DSWHIbl/QPU6ypxuhjeCwtgA=
github.com/vdaas/vald-client-go v1.5.2 h1:gHXEkHDsPnerwiDD6sRipoZ9N6uF56TdDy9D63wBozA=
github.com/vdaas/vald-client-go v1.5.2/go.mod h1:1aOgWp2dS/Qo0hgSzaw0MEpxllmbuZ7gCspdztNRMOE=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
Expand Down Expand Up @@ -86,12 +86,12 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 h1:vJpL69PeUullhJyKtTjHjENEmZU3BkO4e+fod7nKzgM=
gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946/go.mod h1:BQUWDHIAygjdt1HnUPQ0eWqLN2n5FwJycrpYUVUOx2I=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731 h1:nquqdM9+ps0JZcIiI70+tqoaIFS5Ql4ZuK8UXnz3HfE=
google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 h1:q1kiSVscqoDeqTF27eQ2NnLLDmqF0I373qQNXYMy0fo=
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Loading

0 comments on commit a7bf98d

Please sign in to comment.