From 071e4be6a346e0f58cee5d572ff1edca326bcf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6berl?= Date: Thu, 20 Jul 2023 21:42:49 +0000 Subject: [PATCH] Fix config update when config is "null" When the tunnel reads the config from the server and it is "null" then ignore it. Fixes #1029 --- orchestration/orchestrator.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/orchestration/orchestrator.go b/orchestration/orchestrator.go index 0d43e59d..4a5337d8 100644 --- a/orchestration/orchestrator.go +++ b/orchestration/orchestrator.go @@ -74,6 +74,15 @@ func (o *Orchestrator) UpdateConfig(version int32, config []byte) *tunnelpogs.Up LastAppliedVersion: o.currentVersion, } } + + if string(config) == "null" { + o.log.Info().Msg("Ignore null config from server") + o.currentVersion = version + return &tunnelpogs.UpdateConfigurationResponse{ + LastAppliedVersion: o.currentVersion, + } + } + var newConf newRemoteConfig if err := json.Unmarshal(config, &newConf); err != nil { o.log.Err(err).