Merge pull request #877 from sofat1989/addhealthserver

use grpc health probe for virtlet
Mirantis · Jun 24, 2019 · 5a0c02c · 5a0c02c
2 parents 6ef2793 + b76cc75
commit 5a0c02c
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/deploy/data/virtlet-ds.yaml b/deploy/data/virtlet-ds.yaml
@@ -226,7 +226,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
       - name: vms
         image: mirantis/virtlet
         imagePullPolicy: IfNotPresent

diff --git a/images/Dockerfile.virtlet b/images/Dockerfile.virtlet
@@ -16,5 +16,8 @@ COPY _output/virtletctl /usr/local/bin
 COPY _output/virtlet-longevity-tests /usr/local/bin
 COPY _output/vmwrapper /
 COPY _output/virtlet-e2e-tests /
+RUN GRPC_HEALTH_PROBE_VERSION=v0.2.2 && \
+    curl -L -s -o /usr/local/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+    chmod +x /usr/local/bin/grpc_health_probe
 
 CMD ["/start.sh"]
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
@@ -35,6 +35,8 @@ import (
 	"github.com/Mirantis/virtlet/pkg/stream"
 	"github.com/Mirantis/virtlet/pkg/tapmanager"
 	"github.com/Mirantis/virtlet/pkg/utils"
+	"google.golang.org/grpc/health"
+	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
 const (
@@ -146,6 +148,9 @@ func (v *VirtletManager) Run() error {
 	v.server = NewServer()
 	v.server.Register(runtimeService, imageService)
 
+	healthServer := health.NewServer()
+	grpc_health_v1.RegisterHealthServer(v.server.server, healthServer)
+
 	if err := v.recoverAndGC(); err != nil {
 		// we consider recover / gc errors non-fatal
 		glog.Warning(err)

diff --git a/pkg/tools/TestGenCommand__compat.out.yaml b/pkg/tools/TestGenCommand__compat.out.yaml
@@ -73,7 +73,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
         resources: {}
         securityContext:
           privileged: true

diff --git a/pkg/tools/TestGenCommand__compat_dev.out.yaml b/pkg/tools/TestGenCommand__compat_dev.out.yaml
@@ -75,7 +75,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
         resources: {}
         securityContext:
           privileged: true

diff --git a/pkg/tools/TestGenCommand__dev.out.yaml b/pkg/tools/TestGenCommand__dev.out.yaml
@@ -75,7 +75,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
         resources: {}
         securityContext:
           privileged: true

diff --git a/pkg/tools/TestGenCommand__plain.out.yaml b/pkg/tools/TestGenCommand__plain.out.yaml
@@ -73,7 +73,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
         resources: {}
         securityContext:
           privileged: true

diff --git a/pkg/tools/TestGenCommand__tag.out.yaml b/pkg/tools/TestGenCommand__tag.out.yaml
@@ -73,7 +73,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - socat - UNIX:/run/virtlet.sock </dev/null
+            - grpc_health_probe -addr UNIX:/run/virtlet.sock
         resources: {}
         securityContext:
           privileged: true

diff --git a/pkg/tools/bindata.go b/pkg/tools/bindata.go