add controllers

change kiali mux to go-restful

add knative

add health api

pkg/controller/destinationrule/destinationrule_controller.go

@@ -139,10 +139,6 @@ func (v *DestinationRuleController) Run(workers int, stopCh <-chan struct{}) {
 		go wait.Until(v.worker, v.workerLoopPeriod, stopCh)
 	}
 
-	go func() {
-		defer utilruntime.HandleCrash()
-	}()
-
 	<-stopCh
 }
 
@@ -222,9 +218,9 @@ func (v *DestinationRuleController) syncService(key string) error {
 		}
 
 		subset := v1alpha3.Subset{
-			Name: util.NormalizeVersionName(name),
+			Name: util.NormalizeVersionName(version),
 			Labels: map[string]string{
-				util.VersionLabel: name,
+				util.VersionLabel: version,
 			},
 		}
 
@@ -239,10 +235,15 @@ func (v *DestinationRuleController) syncService(key string) error {
 					Name:   service.Name,
 					Labels: service.Labels,
 				},
+				Spec: v1alpha3.DestinationRuleSpec{
+					Host: name,
+				},
 			}
+		} else {
+			log.Error(err, "Couldn't get destinationrule for service", "key", key)
+			return err
 		}
-		log.Error(err, "Couldn't get destinationrule for service", "key", key)
-		return err
+
 	}
 
 	createDestinationRule := len(currentDestinationRule.Spec.Subsets) == 0

pkg/controller/strategy/helper.go

@@ -18,6 +18,7 @@ func getAppNameByStrategy(strategy *v1alpha2.Strategy) string {
 	return ""
 }
 
+// if virtualservice not specified with port number, then fill with service first port
 func fillDestinationPort(vs *v1alpha3.VirtualService, service *v1.Service) error {
 
 	if len(service.Spec.Ports) == 0 {
@@ -27,14 +28,22 @@ func fillDestinationPort(vs *v1alpha3.VirtualService, service *v1.Service) error
 	// fill http port
 	for i := range vs.Spec.Http {
 		for j := range vs.Spec.Http[i].Route {
-			vs.Spec.Http[i].Route[j].Destination.Port.Number = uint32(service.Spec.Ports[0].Port)
+			if vs.Spec.Http[i].Route[j].Destination.Port.Number == 0 {
+				vs.Spec.Http[i].Route[j].Destination.Port.Number = uint32(service.Spec.Ports[0].Port)
+			}
+		}
+
+		if vs.Spec.Http[i].Mirror != nil && vs.Spec.Http[i].Mirror.Port.Number == 0 {
+			vs.Spec.Http[i].Mirror.Port.Number = uint32(service.Spec.Ports[0].Port)
 		}
 	}
 
 	// fill tcp port
 	for i := range vs.Spec.Tcp {
 		for j := range vs.Spec.Tcp[i].Route {
-			vs.Spec.Tcp[i].Route[j].Destination.Port.Number = uint32(service.Spec.Ports[0].Port)
+			if vs.Spec.Tcp[i].Route[j].Destination.Port.Number == 0 {
+				vs.Spec.Tcp[i].Route[j].Destination.Port.Number = uint32(service.Spec.Ports[0].Port)
+			}
 		}
 	}
 

pkg/controller/virtualservice/util/util.go

@@ -16,7 +16,6 @@ const (
 // resource with these following labels considered as part of servicemesh
 var ApplicationLabels = [...]string{
 	ApplicationNameLabel,
-	ApplicationVersionLabel,
 	ServiceMeshEnabledLabel,
 	AppLabel,
 }

pkg/controller/virtualservice/virtualservice_controller.go

@@ -128,7 +128,7 @@ func NewVirtualServiceController(serviceInformer coreinformers.ServiceInformer,
 }
 
 func (v *VirtualServiceController) Start(stopCh <-chan struct{}) error {
-	v.Run(5, stopCh)
+	v.Run(1, stopCh)
 	return nil
 }
 
@@ -147,10 +147,6 @@ func (v *VirtualServiceController) Run(workers int, stopCh <-chan struct{}) {
 		go wait.Until(v.worker, v.workerLoopPeriod, stopCh)
 	}
 
-	go func() {
-		defer utilruntime.HandleCrash()
-	}()
-
 	<-stopCh
 }
 
@@ -202,7 +198,6 @@ func (v *VirtualServiceController) syncService(key string) error {
 		if err != nil && !errors.IsNotFound(err) {
 			return err
 		}
-
 		return nil
 	}
 
@@ -278,9 +273,7 @@ func (v *VirtualServiceController) syncService(key string) error {
 		if len(vs.Spec.Http) > 0 || len(vs.Spec.Tcp) > 0 {
 			_, err := v.virtualServiceClient.NetworkingV1alpha3().VirtualServices(namespace).Create(vs)
 			if err != nil {
-
 				v.eventRecorder.Eventf(vs, v1.EventTypeWarning, "FailedToCreateVirtualService", "Failed to create virtualservice for service %v/%v: %v", service.Namespace, service.Name, err)
-
 				log.Error(err, "create virtualservice for service failed.", "service", service)
 				return err
 			}
@@ -288,7 +281,6 @@ func (v *VirtualServiceController) syncService(key string) error {
 			log.Info("service doesn't have a tcp port.")
 			return nil
 		}
-
 	}
 
 	return nil
@@ -328,7 +320,6 @@ func (v *VirtualServiceController) addDestinationRule(obj interface{}) {
 
 func (v *VirtualServiceController) deleteStrategy(obj interface{}) {
 	// nothing to do right now
-
 }
 
 func (v *VirtualServiceController) handleErr(err error, key interface{}) {
@@ -343,7 +334,7 @@ func (v *VirtualServiceController) handleErr(err error, key interface{}) {
 		return
 	}
 
-	log.V(0).Info("Dropping service %q out of the queue: %v", "key", key, "error", err)
+	log.V(4).Info("Dropping service out of the queue.", "key", key, "error", err)
 	v.queue.Forget(key)
 	utilruntime.HandleError(err)
 }