adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #286 from squat/fix_pka_peers

Browse Source 
backend: fix Peer persistent keepalive
This commit is contained in:
Lucas Servén Marín 2022-03-31 21:35:10 +02:00 committed by GitHub
commit fb03520fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/k8s/backend.go
View File

@ -298,7 +298,7 @@ func translateNode(node *v1.Node, topologyLabel string) *mesh.Node {
internalIP = nil internalIP = nil
} }
// Set Wireguard PersistentKeepalive setting for the node. // Set Wireguard PersistentKeepalive setting for the node.
var persistentKeepalive = time.Duration(0) var persistentKeepalive time.Duration
if keepAlive, ok := node.ObjectMeta.Annotations[persistentKeepaliveKey]; ok { if keepAlive, ok := node.ObjectMeta.Annotations[persistentKeepaliveKey]; ok {
// We can ignore the error, because p will be set to 0 if an error occures. // We can ignore the error, because p will be set to 0 if an error occures.
p, _ := strconv.ParseInt(keepAlive, 10, 64) p, _ := strconv.ParseInt(keepAlive, 10, 64)
@ -414,7 +414,7 @@ func translatePeer(peer *v1alpha1.Peer) *mesh.Peer {
} }
var pka time.Duration var pka time.Duration
if peer.Spec.PersistentKeepalive > 0 { if peer.Spec.PersistentKeepalive > 0 {
pka = time.Duration(peer.Spec.PersistentKeepalive) pka = time.Duration(peer.Spec.PersistentKeepalive) * time.Second
} }
return &mesh.Peer{ return &mesh.Peer{
Name: peer.Name, Name: peer.Name,
@ -534,7 +534,7 @@ func (pb *peerBackend) Set(name string, peer *mesh.Peer) error {
if peer.PersistentKeepaliveInterval == nil { if peer.PersistentKeepaliveInterval == nil {
p.Spec.PersistentKeepalive = 0 p.Spec.PersistentKeepalive = 0
} else { } else {
p.Spec.PersistentKeepalive = int(*peer.PersistentKeepaliveInterval) p.Spec.PersistentKeepalive = int(*peer.PersistentKeepaliveInterval / time.Second)
} }
if peer.PresharedKey == nil { if peer.PresharedKey == nil {
p.Spec.PresharedKey = "" p.Spec.PresharedKey = ""

2
pkg/k8s/backend_test.go
View File

@ -511,7 +511,7 @@ func TestTranslatePeer(t *testing.T) {
{ {
name: "valid keepalive", name: "valid keepalive",
spec: v1alpha1.PeerSpec{ spec: v1alpha1.PeerSpec{
PersistentKeepalive: 1 * int(time.Second), PersistentKeepalive: 1,
}, },
out: &mesh.Peer{ out: &mesh.Peer{
Peer: wireguard.Peer{ Peer: wireguard.Peer{