Merge pull request #18 from carmark/upgrade

add default tenant for service and endpoint

Author: feiskyer

pkg/apiserver/resthandler.go

@@ -848,16 +848,18 @@ func filterListInTenant(obj runtime.Object, tenant string, kind string, namer Sc
 				}
 			}
 		}
-	} else if kind == "Namespace" || kind == "Network" || kind == "Pod" || kind == "Serviceaccount" || kind == "Secret" {
+	} else {
 		for i := range items {
 			if name, err := namer.ObjectTenant(items[i]); err == nil {
 				if tenant == name {
 					result = append(result, items[i])
+					continue
+				}
+				if name == "" {
+					result = append(result, items[i])
 				}
 			}
 		}
-	} else {
-		result = items
 	}
 
 	return runtime.SetList(obj, result)

pkg/controller/endpoint/endpoints_controller.go

@@ -366,6 +366,12 @@ func (e *EndpointController) syncService(key string) {
 	newEndpoints := currentEndpoints
 	newEndpoints.Subsets = subsets
 	newEndpoints.Labels = service.Labels
+	ns, err := e.client.Namespaces().Get(service.Namespace)
+	if err != nil {
+		glog.Error(err)
+		return
+	}
+	newEndpoints.Tenant = ns.Tenant
 
 	if len(currentEndpoints.ResourceVersion) == 0 {
 		// No previous endpoints, create them

pkg/controller/resourcequota/resource_quota_controller.go

@@ -117,6 +117,7 @@ func (rm *ResourceQuotaController) syncResourceQuota(quota api.ResourceQuota) (e
 		ObjectMeta: api.ObjectMeta{
 			Name:            quota.Name,
 			Namespace:       quota.Namespace,
+			Tenant:          quota.Tenant,
 			ResourceVersion: quota.ResourceVersion,
 			Labels:          quota.Labels,
 			Annotations:     quota.Annotations},

pkg/kubectl/cmd/create.go

@@ -92,7 +92,6 @@ func RunCreate(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *C
 	if err != nil {
 		return err
 	}
-	fmt.Printf("tenant input is %s\n", cmdTenant)
 	mapper, typer := f.Object()
 	r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).
 		Schema(schema).

pkg/kubectl/cmd/get.go

@@ -113,6 +113,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
 	selector := cmdutil.GetFlagString(cmd, "selector")
 	allNamespaces := cmdutil.GetFlagBool(cmd, "all-namespaces")
 	mapper, typer := f.Object()
+	var all bool = allNamespaces
 
 	cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
 	if err != nil {
@@ -129,12 +130,16 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
 `)
 		return cmdutil.UsageError(cmd, "Required resource not specified.")
 	}
+	userNamespace := cmdutil.GetFlagString(cmd, "namespace")
+	if userNamespace == "" {
+		all = true
+	}
 
 	// handle watch separately since we cannot watch multiple resource types
 	isWatch, isWatchOnly := cmdutil.GetFlagBool(cmd, "watch"), cmdutil.GetFlagBool(cmd, "watch-only")
 	if isWatch || isWatchOnly {
 		r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).
-			NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(true).
+			NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(all).
 			TenantParam(cmdTenant).DefaultTenant().
 			FilenameParam(enforceTenant, enforceNamespace, options.Filenames...).
 			SelectorParam(selector).
@@ -189,7 +194,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
 	}
 
 	b := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).
-		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(true).
+		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(all).
 		FilenameParam(enforceTenant, enforceNamespace, options.Filenames...).
 		SelectorParam(selector).
 		ResourceTypeOrNameArgs(true, args...).

pkg/master/controller.go

@@ -208,6 +208,7 @@ func (c *Controller) CreateMasterServiceIfNeeded(serviceName string, serviceIP n
 		ObjectMeta: api.ObjectMeta{
 			Name:      serviceName,
 			Namespace: api.NamespaceDefault,
+			Tenant:    api.TenantDefault,
 			Labels:    map[string]string{"provider": "kubernetes", "component": "apiserver"},
 		},
 		Spec: api.ServiceSpec{
@@ -251,6 +252,7 @@ func (c *Controller) SetEndpoints(serviceName string, ip net.IP, port int) error
 			ObjectMeta: api.ObjectMeta{
 				Name:      serviceName,
 				Namespace: api.NamespaceDefault,
+				Tenant:    api.TenantDefault,
 			},
 		}
 	}