Merge pull request #21 from carmark/rc

add tenant metadata for replicationcontroller and it's pods

Author: feiskyer

pkg/controller/controller_utils.go

@@ -283,12 +283,22 @@ func (r RealPodControl) createPods(nodeName, namespace string, template *api.Pod
 		return fmt.Errorf("object does not have ObjectMeta, %v", err)
 	}
 	prefix := getPodsPrefix(meta.Name)
+	tenant := meta.Tenant
+	if tenant == "" {
+		ns, err := r.KubeClient.Namespaces().Get(namespace)
+		if err != nil {
+			glog.Error(err)
+			return err
+		}
+		tenant = ns.Tenant
+	}
 
 	pod := &api.Pod{
 		ObjectMeta: api.ObjectMeta{
 			Labels:       desiredLabels,
 			Annotations:  desiredAnnotations,
 			GenerateName: prefix,
+			Tenant:       tenant,
 		},
 	}
 	if err := api.Scheme.Convert(&template.Spec, &pod.Spec); err != nil {

pkg/controller/replication/replication_controller.go

@@ -428,6 +428,12 @@ func (rm *ReplicationManager) syncReplicationController(key string) error {
 		rm.enqueueController(&rc)
 		return nil
 	}
+	ns, err := rm.kubeClient.Namespaces().Get(rc.Namespace)
+	if err != nil {
+		glog.Error(err)
+		return err
+	}
+	rc.Tenant = ns.Tenant
 
 	// Check the expectations of the rc before counting active pods, otherwise a new pod can sneak in
 	// and update the expectations after we've retrieved active pods from the store. If a new pod enters

pkg/kubectl/cmd/describe.go

@@ -95,6 +95,10 @@ func NewCmdDescribe(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 
 func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string, options *DescribeOptions) error {
 	selector := cmdutil.GetFlagString(cmd, "selector")
+	var all bool = true
+	if cmdutil.GetFlagString(cmd, "namespace") != "" {
+		all = false
+	}
 	cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
 	if err != nil {
 		return err
@@ -111,7 +115,7 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s
 	mapper, typer := f.Object()
 	r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).
 		ContinueOnError().
-		NamespaceParam(cmdNamespace).DefaultNamespace().
+		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(all).
 		TenantParam(cmdTenant).DefaultTenant().
 		FilenameParam(enforceTenant, enforceNamespace, options.Filenames...).
 		SelectorParam(selector).