From 82dab92c5b9918e316b398c83ae4900222b68073 Mon Sep 17 00:00:00 2001 From: Kuromesi Date: Thu, 21 Sep 2023 09:15:06 +0800 Subject: [PATCH] store configuration when ensure routes Signed-off-by: Kuromesi --- lua_configuration/lua.go | 2 +- pkg/trafficrouting/manager.go | 2 +- .../custom_network_provider.go} | 0 .../custom_network_provider_test.go} | 0 .../networking.error.io/LuaError/trafficRouting.lua | 0 .../networking.istio.io/DestinationRule/trafficRouting.lua | 0 .../networking.istio.io/VirtualService/trafficRouting.lua | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename pkg/trafficrouting/network/{custom/custom.go => customNetworkProvider/custom_network_provider.go} (100%) rename pkg/trafficrouting/network/{custom/custom_test.go => customNetworkProvider/custom_network_provider_test.go} (100%) rename pkg/trafficrouting/network/{custom => customNetworkProvider}/lua_configuration/networking.error.io/LuaError/trafficRouting.lua (100%) rename pkg/trafficrouting/network/{custom => customNetworkProvider}/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua (100%) rename pkg/trafficrouting/network/{custom => customNetworkProvider}/lua_configuration/networking.istio.io/VirtualService/trafficRouting.lua (100%) diff --git a/lua_configuration/lua.go b/lua_configuration/lua.go index 5435292..f712557 100644 --- a/lua_configuration/lua.go +++ b/lua_configuration/lua.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/openkruise/rollouts/api/v1alpha1" - "github.com/openkruise/rollouts/pkg/trafficrouting/network/custom" + custom "github.com/openkruise/rollouts/pkg/trafficrouting/network/customNetworkProvider" "github.com/openkruise/rollouts/pkg/util/luamanager" lua "github.com/yuin/gopher-lua" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/trafficrouting/manager.go b/pkg/trafficrouting/manager.go index 136f32b..7fc6251 100644 --- a/pkg/trafficrouting/manager.go +++ b/pkg/trafficrouting/manager.go @@ -23,7 +23,7 @@ import ( "github.com/openkruise/rollouts/api/v1alpha1" "github.com/openkruise/rollouts/pkg/trafficrouting/network" - "github.com/openkruise/rollouts/pkg/trafficrouting/network/custom" + custom "github.com/openkruise/rollouts/pkg/trafficrouting/network/customNetworkProvider" "github.com/openkruise/rollouts/pkg/trafficrouting/network/gateway" "github.com/openkruise/rollouts/pkg/trafficrouting/network/ingress" "github.com/openkruise/rollouts/pkg/util" diff --git a/pkg/trafficrouting/network/custom/custom.go b/pkg/trafficrouting/network/customNetworkProvider/custom_network_provider.go similarity index 100% rename from pkg/trafficrouting/network/custom/custom.go rename to pkg/trafficrouting/network/customNetworkProvider/custom_network_provider.go diff --git a/pkg/trafficrouting/network/custom/custom_test.go b/pkg/trafficrouting/network/customNetworkProvider/custom_network_provider_test.go similarity index 100% rename from pkg/trafficrouting/network/custom/custom_test.go rename to pkg/trafficrouting/network/customNetworkProvider/custom_network_provider_test.go diff --git a/pkg/trafficrouting/network/custom/lua_configuration/networking.error.io/LuaError/trafficRouting.lua b/pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.error.io/LuaError/trafficRouting.lua similarity index 100% rename from pkg/trafficrouting/network/custom/lua_configuration/networking.error.io/LuaError/trafficRouting.lua rename to pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.error.io/LuaError/trafficRouting.lua diff --git a/pkg/trafficrouting/network/custom/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua b/pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua similarity index 100% rename from pkg/trafficrouting/network/custom/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua rename to pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua diff --git a/pkg/trafficrouting/network/custom/lua_configuration/networking.istio.io/VirtualService/trafficRouting.lua b/pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.istio.io/VirtualService/trafficRouting.lua similarity index 100% rename from pkg/trafficrouting/network/custom/lua_configuration/networking.istio.io/VirtualService/trafficRouting.lua rename to pkg/trafficrouting/network/customNetworkProvider/lua_configuration/networking.istio.io/VirtualService/trafficRouting.lua