InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnetwork: controller.handleKeyChange: slight cleanup of logs

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-11-11 23:39:13 +01:00
parent a03d6bd071
commit c9f0314f21
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
daemon/libnetwork/agent.go
View File

@@ -109,7 +109,7 @@ func resolveAddr(addrOrInterface string) (net.IP, error) {
return addr.IP, nil return addr.IP, nil
} }
func (c *Controller) handleKeyChange(keys []*types.EncryptionKey) error { func (c *Controller) handleKeyChange(encryptionKeys []*types.EncryptionKey) error {
drvEnc := discoverapi.DriverEncryptionUpdate{} drvEnc := discoverapi.DriverEncryptionUpdate{}
agent := c.getAgent() agent := c.getAgent()
@@ -126,7 +126,7 @@ func (c *Controller) handleKeyChange(keys []*types.EncryptionKey) error {
j := len(c.keys) j := len(c.keys)
for i := 0; i < j; { for i := 0; i < j; {
same := false same := false
for _, key := range keys { for _, key := range encryptionKeys {
if same = key.LamportTime == c.keys[i].LamportTime; same { if same = key.LamportTime == c.keys[i].LamportTime; same {
break break
} }
@@ -150,7 +150,7 @@ func (c *Controller) handleKeyChange(keys []*types.EncryptionKey) error {
c.keys = c.keys[:j] c.keys = c.keys[:j]
// Find the new key and add it to the key ring // Find the new key and add it to the key ring
for _, key := range keys { for _, key := range encryptionKeys {
same := false same := false
for _, cKey := range c.keys { for _, cKey := range c.keys {
if same = cKey.LamportTime == key.LamportTime; same { if same = cKey.LamportTime == key.LamportTime; same {
@@ -198,16 +198,23 @@ func (c *Controller) handleKeyChange(keys []*types.EncryptionKey) error {
return false return false
} }
if err := dr.DiscoverNew(discoverapi.EncryptionKeysUpdate, drvEnc); err != nil { if err := dr.DiscoverNew(discoverapi.EncryptionKeysUpdate, drvEnc); err != nil {
log.G(context.TODO()).Warnf("Failed to update datapath keys in driver %s: %v", name, err) log.G(context.TODO()).WithFields(log.Fields{
"error": err,
"driver": name,
}).Warn("Failed to update datapath keys; resetting datapath keys")
// Attempt to reconfigure keys in case of a update failure // Attempt to reconfigure keys in case of a update failure
// which can arise due to a mismatch of keys // which can arise due to a mismatch of keys
// if worker nodes get temporarily disconnected // if worker nodes get temporarily disconnected
log.G(context.TODO()).Warnf("Reconfiguring datapath keys for %s", name) keys, tags := c.getKeys(subsysIPSec)
drvCfgEnc := discoverapi.DriverEncryptionConfig{} err = dr.DiscoverNew(discoverapi.EncryptionKeysConfig, discoverapi.DriverEncryptionConfig{
drvCfgEnc.Keys, drvCfgEnc.Tags = c.getKeys(subsysIPSec) Keys: keys,
err = dr.DiscoverNew(discoverapi.EncryptionKeysConfig, drvCfgEnc) Tags: tags,
})
if err != nil { if err != nil {
log.G(context.TODO()).Warnf("Failed to reset datapath keys in driver %s: %v", name, err) log.G(context.TODO()).WithFields(log.Fields{
"error": err,
"driver": name,
}).Warn("Failed to reset datapath keys")
} }
} }
return false return false