Merge remote-tracking branch 'origin/feature/k8s-client' into feature/k8s-client

Author: panxiaojun233

pkg/controller/env/env_checker.go

@@ -23,6 +23,7 @@ func GetENV() string {
 	_, err := client.GetDeployment(context.Background(), ISTIO_DEPLOYMENT_NAME, ISTIO_NAMESPACE)
 	if err != nil {
 		env = K8S_ENV
+		return env
 	}
 	env = ISTIO_ENV
 	return env

pkg/controller/transform/virtual_workload_transform.go

@@ -36,6 +36,7 @@ func buildLbPolicy(trafficPolicy *traffic.TrafficPolicy) clusterv3.Cluster_LbPol
 		return clusterv3.Cluster_ROUND_ROBIN
 	}
 	sample := trafficPolicy.LoadBalancer.Simple
+
 	switch sample {
 	case traffic.LoadBalancerSettings_LEAST_REQUEST:
 		return clusterv3.Cluster_LEAST_REQUEST
@@ -45,8 +46,6 @@ func buildLbPolicy(trafficPolicy *traffic.TrafficPolicy) clusterv3.Cluster_LbPol
 		return clusterv3.Cluster_ROUND_ROBIN
 	case traffic.LoadBalancerSettings_PASSTHROUGH:
 		return clusterv3.Cluster_CLUSTER_PROVIDED
-	default:
-		return clusterv3.Cluster_ROUND_ROBIN
 	}
 
 	consistentHash := trafficPolicy.LoadBalancer.ConsistentHash