Merge branch 'main' into feat-tls

opensergo · Mar 2, 2023 · 8809eca · 8809eca
2 parents 53fe43e + b2a03ac
commit 8809eca
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/k8s/workload/opensergo-control-plane.yaml b/k8s/workload/opensergo-control-plane.yaml
@@ -21,7 +21,6 @@ spec:
           ports:
             - name: grpc
               containerPort: 10246
-      serviceAccount: opensergo-control-plane
       serviceAccountName: opensergo-control-plane
 
 ---

diff --git a/pkg/api/v1alpha1/fault_tolerance_rule_types.go b/pkg/api/v1alpha1/fault_tolerance_rule_types.go
@@ -1,4 +1,4 @@
-/// Copyright 2022, OpenSergo Authors
+// Copyright 2022, OpenSergo Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/controller/k8s_operator.go b/pkg/controller/k8s_operator.go
@@ -192,7 +192,7 @@ func (k *KubernetesOperator) AddWatcher(target model.SubscribeTarget, isSecure b
 		if err != nil {
 			return err
 		}
-		//_ = crdRunnable.Start(k.ctx)
+		// _ = crdRunnable.Start(k.ctx)
 		k.controllers[target.Kind] = crdWatcher
 
 	}

diff --git a/pkg/model/subscribe.go b/pkg/model/subscribe.go
@@ -25,7 +25,7 @@ type SubscribeTarget struct {
 	Namespace string
 	// AppName represents the target app name. Fast path for "app" label.
 	AppName string
-	//Labels  []LabelKV
+	// Labels  []LabelKV
 	Kind SubscribeKind
 }
 

diff --git a/pkg/transport/grpc/server.go b/pkg/transport/grpc/server.go
@@ -129,7 +129,7 @@ func (s *TransportServer) SubscribeConfig(stream trpb.OpenSergoUniversalTranspor
 			return nil
 		}
 		if err != nil {
-			//remove stream
+			// remove stream
 			_ = s.connectionManager.RemoveByIdentifier(clientIdentifier)
 			return err
 		}