fix router service label

This commit is contained in:
jeff
2018-06-21 19:39:25 +08:00
parent 5e4f040933
commit 04e65c3101

View File

@@ -130,6 +130,7 @@ func CreateRouter(namespace string, routerType coreV1.ServiceType, annotations m
service.Name = constants.IngressControllerPrefix + namespace service.Name = constants.IngressControllerPrefix + namespace
// Add project selector // Add project selector
service.Labels["project"] = namespace
service.Spec.Selector["project"] = namespace service.Spec.Selector["project"] = namespace
service, err := k8sClient.CoreV1().Services(constants.IngressControllerNamespace).Create(service) service, err := k8sClient.CoreV1().Services(constants.IngressControllerNamespace).Create(service)
@@ -145,7 +146,8 @@ func CreateRouter(namespace string, routerType coreV1.ServiceType, annotations m
deployment.Name = constants.IngressControllerPrefix + namespace deployment.Name = constants.IngressControllerPrefix + namespace
// Add project label // Add project label
deployment.Labels["project"] = namespace deployment.Spec.Selector.MatchLabels["project"] = namespace
deployment.Spec.Template.Labels["project"] = namespace
deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace) deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace)
glog.Info(deployment.Spec.Template.Spec.Containers[0].Args) glog.Info(deployment.Spec.Template.Spec.Containers[0].Args)