@@ -15,8 +15,9 @@ import (
1515 "github.com/ihcsim/cbt-aggapi/pkg/apis/cbt/v1alpha1"
1616 "github.com/ihcsim/cbt-aggapi/pkg/generated/cbt/clientset/versioned"
1717 cbtgrpc "github.com/ihcsim/cbt-aggapi/pkg/grpc"
18+ "github.com/kubernetes-csi/csi-lib-utils/connection"
19+ "github.com/kubernetes-csi/csi-lib-utils/metrics"
1820 "google.golang.org/grpc"
19- "google.golang.org/grpc/credentials/insecure"
2021 apierrors "k8s.io/apimachinery/pkg/api/errors"
2122 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2223 "k8s.io/apimachinery/pkg/runtime"
@@ -29,17 +30,28 @@ const defaultPort = 8080
2930
3031var (
3132 listenAddr = flag .String ("listen-addr" , fmt .Sprintf (":%d" , defaultPort ), "Address to listen at" )
32- grpcTarget = flag .String ("grpc-target " , ":9779 " , "Address of the GRPC server " )
33+ csiAddress = flag .String ("csi-address " , "/run/csi/socket " , "Address of the CSI driver socket. " )
3334)
3435
3536func main () {
3637 flag .Parse ()
3738
38- if _ , err := registerDriver (); err != nil {
39+ var (
40+ driver = os .Getenv ("CSI_DRIVER_NAME" )
41+ svc = os .Getenv ("SVC_NAME" )
42+ namespace = os .Getenv ("SVC_NAMESPACE" )
43+ )
44+ svcPort , err := strconv .ParseInt (os .Getenv ("SVC_PORT" ), 10 , 32 )
45+ if err != nil {
46+ klog .Error (err )
47+ svcPort = defaultPort
48+ }
49+
50+ if _ , err := registerDriver (driver , svc , namespace , svcPort ); err != nil {
3951 klog .Fatal (err )
4052 }
4153
42- server , err := newServer ()
54+ server , err := newServer (driver , * csiAddress )
4355 if err != nil {
4456 klog .Fatal (err )
4557 }
@@ -53,7 +65,7 @@ func main() {
5365 }
5466}
5567
56- func registerDriver () (runtime.Object , error ) {
68+ func registerDriver (driver , svc , namespace string , svcPort int64 ) (runtime.Object , error ) {
5769 restConfig , err := rest .InClusterConfig ()
5870 if err != nil {
5971 return nil , err
@@ -64,22 +76,16 @@ func registerDriver() (runtime.Object, error) {
6476 return nil , err
6577 }
6678
67- svcPort , err := strconv .ParseInt (os .Getenv ("SVC_PORT" ), 10 , 32 )
68- if err != nil {
69- klog .Error (err )
70- svcPort = defaultPort
71- }
72-
7379 var (
7480 endpoint = & v1alpha1.DriverDiscovery {
7581 ObjectMeta : metav1.ObjectMeta {
76- Name : os . Getenv ( "CSI_DRIVER_NAME" ) ,
82+ Name : driver ,
7783 },
7884 Spec : v1alpha1.DriverDiscoverySpec {
79- Driver : os . Getenv ( "CSI_DRIVER_NAME" ) ,
85+ Driver : driver ,
8086 Service : v1alpha1.Service {
81- Name : os . Getenv ( "SVC_NAME" ) ,
82- Namespace : os . Getenv ( "SVC_NAMESPACE" ) ,
87+ Name : svc ,
88+ Namespace : namespace ,
8389 Path : "/" ,
8490 Port : svcPort ,
8591 },
@@ -107,10 +113,10 @@ func registerDriver() (runtime.Object, error) {
107113 return created , err
108114}
109115
110- func newServer () (* http.Server , error ) {
111- serveMux , err := newServeMux (* grpcTarget )
116+ func newServer (driver , grpcTarget string ) (* http.Server , error ) {
117+ serveMux , err := newServeMux (driver , grpcTarget )
112118 if err != nil {
113- klog . Fatal ( err )
119+ return nil , err
114120 }
115121
116122 return & http.Server {
@@ -136,10 +142,13 @@ type serveMux struct {
136142 * http.ServeMux
137143}
138144
139- func newServeMux (grpcTarget string ) (* serveMux , error ) {
140- klog .Infof ("connecting to GRPC target at %s" , grpcTarget )
141- opts := grpc .WithTransportCredentials (insecure .NewCredentials ())
142- clientConn , err := grpc .Dial (grpcTarget , opts )
145+ func newServeMux (driverName , grpcTarget string ) (* serveMux , error ) {
146+ klog .Infof ("connecting to CSI driver at %s" , grpcTarget )
147+ metricsManager := metrics .NewCSIMetricsManager (driverName )
148+ csiConn , err := connection .Connect (
149+ grpcTarget ,
150+ metricsManager ,
151+ connection .OnConnectionLoss (connection .ExitOnConnectionLoss ()))
143152 if err != nil {
144153 return nil , err
145154 }
@@ -148,7 +157,7 @@ func newServeMux(grpcTarget string) (*serveMux, error) {
148157 mux := http .NewServeMux ()
149158 mux .HandleFunc ("/" , s .handle )
150159
151- s .grpc = clientConn
160+ s .grpc = csiConn
152161 s .ServeMux = mux
153162 return s , nil
154163}
0 commit comments