fix bugs

Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
koderover · Dec 5, 2023 · e11b914 · e11b914
1 parent e88d128
commit e11b914
Showing 1 changed file with 39 additions and 13 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/kube/istio_grayscale.go b/pkg/microservice/aslan/core/common/service/kube/istio_grayscale.go
@@ -234,6 +234,8 @@ func generateGrayscaleWeightVirtualService(ctx context.Context, envMap map[strin
 	vsObj.Name = vsName
 	vsObj.Namespace = ns
 
+	baseEnv := ""
+
 	if vsObj.Labels == nil {
 		vsObj.Labels = map[string]string{}
 	}
@@ -245,6 +247,14 @@ func generateGrayscaleWeightVirtualService(ctx context.Context, envMap map[strin
 			return nil, fmt.Errorf("env %s is not found", weightConfig.Env)
 		}
 
+		if baseEnv == "" {
+			if envMap[weightConfig.Env].IstioGrayscale.IsBase {
+				baseEnv = envMap[weightConfig.Env].EnvName
+			} else {
+				baseEnv = envMap[weightConfig.Env].IstioGrayscale.BaseEnv
+			}
+		}
+
 		if !skipWorkloadCheck {
 			// If there is no workloads in this environment, then service is not updated.
 			hasWorkload, err := doesSvcHasWorkload(ctx, envMap[weightConfig.Env].Namespace, labels.SelectorFromSet(labels.Set(svc.Spec.Selector)), kclient)
@@ -280,6 +290,7 @@ func generateGrayscaleWeightVirtualService(ctx context.Context, envMap map[strin
 		httpRoutes = append(httpRoutes, httpRoute)
 	}
 
+	weightSum := 0
 	routes := []*networkingv1alpha3.HTTPRouteDestination{}
 	for _, weightConfig := range weightConfigs {
 		if envMap[weightConfig.Env] == nil {
@@ -298,6 +309,7 @@ func generateGrayscaleWeightVirtualService(ctx context.Context, envMap map[strin
 			}
 		}
 
+		weightSum += int(weightConfig.Weight)
 		route := &networkingv1alpha3.HTTPRouteDestination{
 			Destination: &networkingv1alpha3.Destination{
 				Host: fmt.Sprintf("%s.%s.svc.cluster.local", svcName, envMap[weightConfig.Env].Namespace),
@@ -313,6 +325,19 @@ func generateGrayscaleWeightVirtualService(ctx context.Context, envMap map[strin
 		}
 		routes = append(routes, route)
 	}
+	if weightSum != 100 {
+		log.Warnf("The sum of weight is not 100 for the service %s, the full-path grayscale may not work correctly", svcName)
+		if baseEnv == "" {
+			return nil, fmt.Errorf("base env is not found")
+		}
+
+		route := &networkingv1alpha3.HTTPRouteDestination{
+			Destination: &networkingv1alpha3.Destination{
+				Host: fmt.Sprintf("%s.%s.svc.cluster.local", svcName, envMap[baseEnv].Namespace),
+			},
+		}
+		routes = append([]*networkingv1alpha3.HTTPRouteDestination{}, route)
+	}
 	httpRoutes = append(httpRoutes, &networkingv1alpha3.HTTPRoute{
 		Route: routes,
 	})
@@ -359,8 +384,8 @@ func generateGrayscaleHeaderMatchVirtualService(ctx context.Context, envMap map[
 
 		configedEnvSet.Insert(headerMatchConfig.Env)
 
-		header := map[string]*networkingv1alpha3.StringMatch{}
 		for _, headerMatch := range headerMatchConfig.HeaderMatchs {
+			header := map[string]*networkingv1alpha3.StringMatch{}
 			if headerMatch.Match == commonmodels.StringMatchPrefix {
 				header[headerMatch.Key] = &networkingv1alpha3.StringMatch{
 					MatchType: &networkingv1alpha3.StringMatch_Prefix{
@@ -382,21 +407,22 @@ func generateGrayscaleHeaderMatchVirtualService(ctx context.Context, envMap map[
 			} else {
 				return nil, fmt.Errorf("unsupported header match type: %s", headerMatch.Match)
 			}
-		}
-		httpRoutes = append(httpRoutes, &networkingv1alpha3.HTTPRoute{
-			Match: []*networkingv1alpha3.HTTPMatchRequest{
-				{
-					Headers: header,
+
+			httpRoutes = append(httpRoutes, &networkingv1alpha3.HTTPRoute{
+				Match: []*networkingv1alpha3.HTTPMatchRequest{
+					{
+						Headers: header,
+					},
 				},
-			},
-			Route: []*networkingv1alpha3.HTTPRouteDestination{
-				{
-					Destination: &networkingv1alpha3.Destination{
-						Host: fmt.Sprintf("%s.%s.svc.cluster.local", svcName, envMap[headerMatchConfig.Env].Namespace),
+				Route: []*networkingv1alpha3.HTTPRouteDestination{
+					{
+						Destination: &networkingv1alpha3.Destination{
+							Host: fmt.Sprintf("%s.%s.svc.cluster.local", svcName, envMap[headerMatchConfig.Env].Namespace),
+						},
 					},
 				},
-			},
-		})
+			})
+		}
 	}
 
 	for _, env := range envMap {