From 38447771f156197521f34f2c89f6b4fb4c42b28c Mon Sep 17 00:00:00 2001 From: Lvbo163 Date: Mon, 6 Aug 2018 17:14:07 +0800 Subject: delete all rules delete all routerules if the service array from consul is empty Issue-ID: MSB-261 Change-Id: I6c8b31e42d5c7d0d4403fb2851f9f7bd00707925 Signed-off-by: Lvbo163 --- msb2pilot/src/msb2pilot/pilot/msb.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/msb2pilot/src/msb2pilot/pilot/msb.go b/msb2pilot/src/msb2pilot/pilot/msb.go index a1b5b5f..d81b2f1 100644 --- a/msb2pilot/src/msb2pilot/pilot/msb.go +++ b/msb2pilot/src/msb2pilot/pilot/msb.go @@ -32,6 +32,9 @@ const ( ) func SyncMsbData(newServices []*models.MsbService) { + if len(cachedServices) == 0 { + deleteAllMsbRules() + } log.Log.Debug("sync msb rewrite rule to pilot") createServices, updateServices, deleteServices := compareServices(cachedServices, newServices) @@ -55,6 +58,31 @@ func saveService(operation Operation, services []*models.MsbService) { log.Log.Debug("%d services need to %s, %d fails. \n", len(services), operation, len(fails)) } +func deleteAllMsbRules() { + log.Log.Informational("delete all msb rules") + configs, err := List("route-rule", "") + + if err != nil { + return + } + + deleteList := msbRuleFilter(configs) + + Save(OperationDelete, deleteList) +} + +func msbRuleFilter(configs []istioModel.Config) []istioModel.Config { + res := make([]istioModel.Config, 0, len(configs)) + + for _, config := range configs { + if strings.HasPrefix(config.Name, routerulePrefix) { + res = append(res, config) + } + } + + return res +} + func compareServices(oldServices, newServices []*models.MsbService) (createServices, updateServices, deleteServices []*models.MsbService) { oldServiceMap := toServiceMap(oldServices) newServiceMap := toServiceMap(newServices) -- cgit 1.2.3-korg