fix: handle the signal removeManagedRoutes before creating config map (…

…#37) * fix: handle the signal removeManagedRoutes before creating config map Signed-off-by: Philipp Plotnikov <philipp.plotnikov@icloud.com> * refactor: rename CreateConfigMap func to GetOrCreateConfigMap Signed-off-by: Philipp Plotnikov <philipp.plotnikov@icloud.com> * refactor: update config on removeHTTPManagedRoutes only it needs Signed-off-by: Philipp Plotnikov <philipp.plotnikov@icloud.com> --------- Signed-off-by: Philipp Plotnikov <philipp.plotnikov@icloud.com>
argoproj-labs · Feb 19, 2024 · d059156 · d059156
1 parent 59f8145
commit d059156
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/internal/utils/common.go b/internal/utils/common.go
@@ -52,7 +52,7 @@ func CreateFormatter(logFormat string) log.Formatter {
 	return formatType
 }
 
-func CreateConfigMap(name string, options CreateConfigMapOptions) (*v1.ConfigMap, error) {
+func GetOrCreateConfigMap(name string, options CreateConfigMapOptions) (*v1.ConfigMap, error) {
 	clientset := options.Clientset
 	ctx := options.Ctx
 	configMap, err := clientset.Get(ctx, name, metav1.GetOptions{})

diff --git a/pkg/plugin/httproute.go b/pkg/plugin/httproute.go
@@ -84,7 +84,7 @@ func (r *RpcPlugin) setHTTPHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
 		httpRouteClient = gatewayV1beta1.HTTPRoutes(gatewayAPIConfig.Namespace)
 		clientset = r.Clientset.CoreV1().ConfigMaps(gatewayAPIConfig.Namespace)
 	}
-	configMap, err := utils.CreateConfigMap(gatewayAPIConfig.ConfigMap, utils.CreateConfigMapOptions{
+	configMap, err := utils.GetOrCreateConfigMap(gatewayAPIConfig.ConfigMap, utils.CreateConfigMapOptions{
 		Clientset: clientset,
 		Ctx:       ctx,
 	})
@@ -259,7 +259,10 @@ func (r *RpcPlugin) removeHTTPManagedRoutes(managedRouteNameList []v1alpha1.Mang
 		httpRouteClient = gatewayV1beta1.HTTPRoutes(gatewayAPIConfig.Namespace)
 		clientset = r.Clientset.CoreV1().ConfigMaps(gatewayAPIConfig.Namespace)
 	}
-	configMap, err := clientset.Get(ctx, gatewayAPIConfig.ConfigMap, metav1.GetOptions{})
+	configMap, err := utils.GetOrCreateConfigMap(gatewayAPIConfig.ConfigMap, utils.CreateConfigMapOptions{
+		Clientset: clientset,
+		Ctx:       ctx,
+	})
 	if err != nil {
 		return pluginTypes.RpcError{
 			ErrorString: err.Error(),
@@ -278,20 +281,25 @@ func (r *RpcPlugin) removeHTTPManagedRoutes(managedRouteNameList []v1alpha1.Mang
 		}
 	}
 	httpRouteRuleList := HTTPRouteRuleList(httpRoute.Spec.Rules)
+	isHTTPRouteRuleListChanged := false
 	for _, managedRoute := range managedRouteNameList {
 		managedRouteName := managedRoute.Name
 		_, isOk := managedRouteMap[managedRouteName]
 		if !isOk {
 			r.LogCtx.Logger.Info(fmt.Sprintf("%s is not in httpHeaderManagedRouteMap", managedRouteName))
 			continue
 		}
+		isHTTPRouteRuleListChanged = true
 		httpRouteRuleList, err = removeManagedRouteEntry(managedRouteMap, httpRouteRuleList, managedRouteName)
 		if err != nil {
 			return pluginTypes.RpcError{
 				ErrorString: err.Error(),
 			}
 		}
 	}
+	if !isHTTPRouteRuleListChanged {
+		return pluginTypes.RpcError{}
+	}
 	oldHTTPRuleList := httpRoute.Spec.Rules
 	httpRoute.Spec.Rules = httpRouteRuleList
 	oldConfigMapData := make(map[string]int)