Skip to content

Commit d4d01ba

Browse files
committed
plugin: adding go-plugins/client/selector/static back. this allow us to use same way as we do with mDNS
1 parent e8b18a6 commit d4d01ba

File tree

9 files changed

+353
-26
lines changed

9 files changed

+353
-26
lines changed

api/account/plugin.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
package main
22

3-
// _ "github.com/micro/go-plugins/transport/nats"
4-
// _ "github.com/micro/go-plugins/broker/nats"
3+
import (
4+
// _ "github.com/micro/go-plugins/transport/nats"
5+
// _ "github.com/micro/go-plugins/broker/nats"
6+
_ "github.com/micro/go-plugins/client/selector/static"
7+
)

deploy/overlays/e2e/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ images:
5858
newTag: 11.5-alpine
5959
- name: microhq/micro
6060
newName: docker.pkg.github.com/xmlking/micro-starter-kit/micro
61-
newTag: $(IMAGE_VERSION)
61+
newTag: v0.1.5
6262
- name: xmlking/account-api
6363
newName: docker.pkg.github.com/xmlking/micro-starter-kit/account-api
6464
newTag: $(IMAGE_VERSION)

deploy/overlays/production/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ images:
6666
newTag: 11.5-alpine
6767
- name: microhq/micro
6868
newName: docker.pkg.github.com/xmlking/micro-starter-kit/micro
69-
newTag: $(IMAGE_VERSION)
69+
newTag: v0.1.5
7070
- name: xmlking/account-api
7171
newName: docker.pkg.github.com/xmlking/micro-starter-kit/account-api
7272
newTag: $(IMAGE_VERSION)

docs/makefile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ make docker-emailer-srv
119119
make docker
120120
make docker DOCKER_REGISTRY=us.gcr.io
121121
make docker DOCKER_REGISTRY=docker.pkg.github.com DOCKER_CONTEXT_PATH=xmlking/micro-starter-kit
122-
122+
make docker DOCKER_REGISTRY=docker.pkg.github.com DOCKER_CONTEXT_PATH=xmlking/micro-starter-kit VERSION=v0.1.5
123123

124124
# publish all microservices images
125125
make docker_push

go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ module github.com/xmlking/micro-starter-kit
22

33
go 1.13.1
44

5+
replace (
6+
k8s.io/api => k8s.io/api v0.0.0-20191010143144-fbf594f18f80
7+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191014065749-fb3eea214746
8+
)
9+
510
require (
11+
github.com/DATA-DOG/go-sqlmock v1.3.3 // indirect
612
github.com/envoyproxy/protoc-gen-validate v0.1.0
713
github.com/golang/protobuf v1.3.2
814
github.com/infobloxopen/atlas-app-toolkit v0.19.0
915
github.com/infobloxopen/protoc-gen-gorm v0.18.0
1016
github.com/jinzhu/gorm v1.9.11
1117
github.com/micro/cli v0.2.0
1218
github.com/micro/go-micro v1.11.3
19+
github.com/micro/go-plugins v1.3.1-0.20191004210925-4b89c7541d81
1320
github.com/onrik/logrus v0.4.1
1421
github.com/sarulabs/di/v2 v2.2.0
1522
github.com/satori/go.uuid v1.2.0

go.sum

Lines changed: 327 additions & 10 deletions
Large diffs are not rendered by default.

srv/account/plugin.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ import (
66
// _ "github.com/jinzhu/gorm/dialects/mysql"
77
// _ "github.com/micro/go-plugins/transport/nats"
88
// _ "github.com/micro/go-plugins/broker/nats"
9+
_ "github.com/micro/go-plugins/client/selector/static"
910
)

srv/emailer/plugin.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package main
22

3-
// import (
4-
// _ "github.com/jinzhu/gorm/dialects/sqlite"
5-
// _ "github.com/jinzhu/gorm/dialects/postgres"
6-
// _ "github.com/jinzhu/gorm/dialects/mysql"
7-
// _ "github.com/micro/go-plugins/transport/nats"
8-
// _ "github.com/micro/go-plugins/broker/nats"
9-
// )
3+
import (
4+
// _ "github.com/micro/go-plugins/broker/nats"
5+
// _ "github.com/micro/go-plugins/transport/nats"
6+
_ "github.com/micro/go-plugins/client/selector/static"
7+
)

srv/greeter/plugin.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

3-
// import (
4-
// _ "github.com/micro/go-plugins/transport/nats"
5-
// _ "github.com/micro/go-plugins/broker/nats"
6-
// )
3+
import (
4+
// _ "github.com/micro/go-plugins/transport/nats"
5+
// _ "github.com/micro/go-plugins/broker/nats"
6+
_ "github.com/micro/go-plugins/client/selector/static"
7+
)

0 commit comments

Comments
 (0)