Skip to content

Commit 8809eca

Browse files
authored
Merge branch 'main' into feat-tls
2 parents 53fe43e + b2a03ac commit 8809eca

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

k8s/workload/opensergo-control-plane.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ spec:
2121
ports:
2222
- name: grpc
2323
containerPort: 10246
24-
serviceAccount: opensergo-control-plane
2524
serviceAccountName: opensergo-control-plane
2625

2726
---

pkg/api/v1alpha1/fault_tolerance_rule_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// Copyright 2022, OpenSergo Authors
1+
// Copyright 2022, OpenSergo Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

pkg/controller/k8s_operator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (k *KubernetesOperator) AddWatcher(target model.SubscribeTarget, isSecure b
192192
if err != nil {
193193
return err
194194
}
195-
//_ = crdRunnable.Start(k.ctx)
195+
// _ = crdRunnable.Start(k.ctx)
196196
k.controllers[target.Kind] = crdWatcher
197197

198198
}

pkg/model/subscribe.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type SubscribeTarget struct {
2525
Namespace string
2626
// AppName represents the target app name. Fast path for "app" label.
2727
AppName string
28-
//Labels []LabelKV
28+
// Labels []LabelKV
2929
Kind SubscribeKind
3030
}
3131

pkg/transport/grpc/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (s *TransportServer) SubscribeConfig(stream trpb.OpenSergoUniversalTranspor
129129
return nil
130130
}
131131
if err != nil {
132-
//remove stream
132+
// remove stream
133133
_ = s.connectionManager.RemoveByIdentifier(clientIdentifier)
134134
return err
135135
}

0 commit comments

Comments
 (0)