Skip to content

feat: add controller proxy for vsctl communication #117

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

Merged
merged 13 commits into from
Jun 27, 2022
Merged

feat: add controller proxy for vsctl communication #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
95b0ab0
feat: add proxy for controller in gateway
wenfengwang Jun 24, 2022
5052c27
update
wenfengwang Jun 24, 2022
7bfd1c7
update
wenfengwang Jun 24, 2022
114e6a5
update
wenfengwang Jun 24, 2022
1233892
update
wenfengwang Jun 24, 2022
556d045
update
wenfengwang Jun 24, 2022
e0195bc
update
wenfengwang Jun 24, 2022
9745a6e
update
wenfengwang Jun 24, 2022
2c4da5f
update k8s files
wenfengwang Jun 25, 2022
924dc3d
update
wenfengwang Jun 25, 2022
7e22b17
update all-in-one
wenfengwang Jun 25, 2022
92f1e4d
update
wenfengwang Jun 25, 2022
09a90b0
update
wenfengwang Jun 27, 2022
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
8 changes: 8 additions & 0 deletions cmd/gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ func main() {
go gateway.MustStartHTTP(*cfg)

ga := gateway.NewGateway(*cfg)
err = ga.StartCtrlProxy(context.Background())
if err != nil {
log.Error(context.Background(), "start controller proxy failed", map[string]interface{}{
log.KeyError: err,
})
os.Exit(-1)
}

err = ga.StartReceive(context.Background())
if err != nil {
log.Error(context.Background(), "start CloudEvents gateway failed", map[string]interface{}{
Expand Down
57 changes: 9 additions & 48 deletions deploy/all-in-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ data:
name: ${POD_NAME}
ip: ${POD_IP}
port: 2048
gateway_endpoint: http://192.168.49.2:30001
etcd:
- vanus-controller-0.vanus-controller.vanus.svc:2379
- vanus-controller-1.vanus-controller.vanus.svc:2379
Expand Down Expand Up @@ -96,48 +95,6 @@ spec:
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-0
namespace: vanus
spec:
ports:
- name: grpc
nodePort: 32000
port: 2048
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-0
type: NodePort
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-1
namespace: vanus
spec:
ports:
- name: grpc
nodePort: 32001
port: 2048
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-1
type: NodePort
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-2
namespace: vanus
spec:
ports:
- name: grpc
nodePort: 32002
port: 2048
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-2
type: NodePort
---
apiVersion: v1
kind: Service
metadata:
name: vanus-gateway
namespace: vanus
Expand All @@ -151,6 +108,10 @@ spec:
nodePort: 30002
port: 8081
targetPort: 8081
- name: ctrl-proxy
nodePort: 30003
port: 8082
targetPort: 8082
selector:
app: vanus-gateway
type: NodePort
Expand All @@ -173,7 +134,7 @@ spec:
app: vanus-gateway
spec:
containers:
- image: public.ecr.aws/vanus/gateway:v0.0.5
- image: public.ecr.aws/vanus/gateway:v0.1.0
imagePullPolicy: IfNotPresent
name: gateway
ports:
Expand Down Expand Up @@ -214,7 +175,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: public.ecr.aws/vanus/trigger:v0.0.5
image: public.ecr.aws/vanus/trigger:v0.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -264,7 +225,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: public.ecr.aws/vanus/controller:v0.0.5
image: public.ecr.aws/vanus/controller:v0.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -322,15 +283,15 @@ spec:
- command:
- /bin/sh
- -c
- export VOLUME_ID=${HOSTNAME##*-}; /vanus/bin/store
- VOLUME_ID=${HOSTNAME##*-} /vanus/bin/store
env:
- name: VANUS_LOG_LEVEL
value: DEBUG
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: public.ecr.aws/vanus/store:v0.0.5
image: public.ecr.aws/vanus/store:v0.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
45 changes: 1 addition & 44 deletions deploy/yaml/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ data:
name: ${POD_NAME}
ip: ${POD_IP}
port: 2048
gateway_endpoint: http://192.168.49.2:30001
etcd:
- vanus-controller-0.vanus-controller.vanus.svc:2379
- vanus-controller-1.vanus-controller.vanus.svc:2379
Expand Down Expand Up @@ -57,48 +56,6 @@ spec:
- port: 2048
name: vanus-controller
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-0
namespace: vanus
spec:
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-0
type: NodePort
ports:
- port: 2048
nodePort: 32000
name: grpc
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-1
namespace: vanus
spec:
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-1
type: NodePort
ports:
- port: 2048
nodePort: 32001
name: grpc
---
apiVersion: v1
kind: Service
metadata:
name: vanus-controller-2
namespace: vanus
spec:
selector:
statefulset.kubernetes.io/pod-name: vanus-controller-2
type: NodePort
ports:
- port: 2048
nodePort: 32002
name: grpc
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
Expand Down Expand Up @@ -130,7 +87,7 @@ spec:
spec:
containers:
- name: controller
image: public.ecr.aws/vanus/controller:v0.0.5
image: public.ecr.aws/vanus/controller:v0.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
grpc:
Expand Down
9 changes: 7 additions & 2 deletions deploy/yaml/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ spec:
targetPort: 8081
nodePort: 30002
name: get

- name: ctrl-proxy
nodePort: 30003
port: 8082
targetPort: 8082
---
apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -64,13 +67,15 @@ spec:
spec:
containers:
- name: gateway
image: public.ecr.aws/vanus/gateway:v0.0.5
image: public.ecr.aws/vanus/gateway:v0.1.0
imagePullPolicy: IfNotPresent
ports:
- name: httpput
containerPort: 8080
- name: httpget
containerPort: 8081
- name: ctrl-proxy
containerPort: 8082
volumeMounts:
- name: config-gateway
mountPath: /vanus/config
Expand Down
2 changes: 1 addition & 1 deletion deploy/yaml/store.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
spec:
containers:
- name: store
image: public.ecr.aws/vanus/store:v0.0.5
image: public.ecr.aws/vanus/store:v0.1.0
imagePullPolicy: IfNotPresent
command: ["/bin/sh", "-c", "VOLUME_ID=${HOSTNAME##*-} /vanus/bin/store"]
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion deploy/yaml/trigger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
spec:
containers:
- name: trigger
image: public.ecr.aws/vanus/trigger:v0.0.5
image: public.ecr.aws/vanus/trigger:v0.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
grpc:
Expand Down
22 changes: 0 additions & 22 deletions deploy/yaml/vsctl.yaml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ require (
github.com/linkall-labs/vanus/client v0.1.0
github.com/linkall-labs/vanus/proto v0.1.0
github.com/linkall-labs/vanus/raft v0.1.0
github.com/mwitkow/grpc-proxy v0.0.0
github.com/ncw/directio v1.0.5
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.1
Expand All @@ -45,6 +46,7 @@ replace (
github.com/linkall-labs/vanus/client => ./client
github.com/linkall-labs/vanus/proto => ./proto
github.com/linkall-labs/vanus/raft => ./raft
github.com/mwitkow/grpc-proxy => github.com/linkall-labs/grpc-proxy v0.0.0-20220624142509-a3b0cb2bb86c
)

require (
Expand Down
7 changes: 7 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o
github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
github.com/linkall-labs/embed-etcd v0.0.1 h1:k1707kTZXS/HRqvt08K8fI3INJHiX1/VMPft5GWml0I=
github.com/linkall-labs/embed-etcd v0.0.1/go.mod h1:2vIGENtcpLaQZ1JZvKq0LRUjvTlNCeY0r3ySTKwX0EA=
github.com/linkall-labs/grpc-proxy v0.0.0-20220624142509-a3b0cb2bb86c h1:Psf/nuPqSfn3yF/AInrDmIs9bY2Rv56Cmf855i6//K0=
github.com/linkall-labs/grpc-proxy v0.0.0-20220624142509-a3b0cb2bb86c/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down Expand Up @@ -644,6 +646,7 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
Expand Down Expand Up @@ -673,6 +676,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -729,6 +733,7 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand Down Expand Up @@ -895,6 +900,7 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210401141331-865547bb08e2/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
Expand Down Expand Up @@ -973,6 +979,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
k8s.io/api v0.23.4/go.mod h1:i77F4JfyNNrhOjZF7OwwNJS5Y1S9dpwvb9iYRYRczfI=
k8s.io/apimachinery v0.23.4 h1:fhnuMd/xUL3Cjfl64j5ULKZ1/J9n8NuQEgNL+WXWfdM=
k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ type Config struct {
EtcdConfig embedetcd.Config `yaml:"embed_etcd"`
Topology map[string]string `yaml:"topology"`
Replicas uint `yaml:"replicas"`
GatewayEndpoint string `yaml:"gateway_endpoint"`
}

func (c *Config) GetEtcdConfig() embedetcd.Config {
Expand All @@ -51,7 +50,6 @@ func (c *Config) GetEventbusCtrlConfig() eventbus.Config {
KVKeyPrefix: c.MetadataConfig.KeyPrefix,
Replicas: c.Replicas,
Topology: c.Topology,
GatewayEndpoint: c.GatewayEndpoint,
}
}

Expand Down
1 change: 0 additions & 1 deletion internal/controller/eventbus/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ type Config struct {
EtcdConfig embedetcd.Config `yaml:"etcd"`
Replicas uint `yaml:"replicas"`
Topology map[string]string `yaml:"topology"`
GatewayEndpoint string `yaml:"gateway_endpoint"`
}
3 changes: 1 addition & 2 deletions internal/controller/eventbus/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,7 @@ func (ctrl *controller) ReportSegmentBlockIsFull(ctx context.Context,

func (ctrl *controller) Ping(_ context.Context, _ *emptypb.Empty) (*ctrlpb.PingResponse, error) {
return &ctrlpb.PingResponse{
LeaderAddr: ctrl.member.GetLeaderAddr(),
GatewayAddr: ctrl.cfg.GatewayEndpoint,
LeaderAddr: ctrl.member.GetLeaderAddr(),
}, nil
}

Expand Down
Loading