Merge pull request #742 from irfanurrehman/federate-fixes

Kubefed2 Federate fixes
kubernetes-retired · Apr 10, 2019 · 0d12bc3 · 0d12bc3
2 parents 022976e + 42bfb4e
commit 0d12bc3
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 31 deletions.
diff --git a/pkg/kubefed2/disable.go b/pkg/kubefed2/disable.go
@@ -89,12 +89,12 @@ func NewCmdTypeDisable(cmdOut io.Writer, config util.FedConfig) *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			err := opts.Complete(args)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 
 			err = opts.Run(cmdOut, config)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 		},
 	}

diff --git a/pkg/kubefed2/enable/enable.go b/pkg/kubefed2/enable/enable.go
@@ -102,12 +102,12 @@ func NewCmdTypeEnable(cmdOut io.Writer, config util.FedConfig) *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			err := opts.Complete(args)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 
 			err = opts.Run(cmdOut, config)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 		},
 	}

diff --git a/pkg/kubefed2/federate/federate.go b/pkg/kubefed2/federate/federate.go
@@ -54,8 +54,8 @@ var (
 		flag otherwise.`
 
 	federate_example = `
-		# Federate resource named "my-dep" in namespace "my-ns" of kubernetes type "deploy"
-		kubefed2 federate deploy my-dep -n "my-ns" --host-cluster-context=cluster1`
+		# Federate resource named "my-cm" in namespace "my-ns" of kubernetes type "configmaps" (identified by short name "cm")
+		kubefed2 federate cm "my-cm" -n "my-ns" --host-cluster-context=cluster1`
 	// TODO(irfanurrehman): implement —contents flag applicable to namespaces
 )
 
@@ -107,12 +107,12 @@ func NewCmdFederateResource(cmdOut io.Writer, config util.FedConfig) *cobra.Comm
 		Run: func(cmd *cobra.Command, args []string) {
 			err := opts.Complete(args)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 
 			err = opts.Run(cmdOut, config)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 		},
 	}
@@ -239,32 +239,40 @@ func getTargetResource(hostConfig *rest.Config, typeConfig typeconfig.Interface,
 	return resource, nil
 }
 
-func FederatedResourceFromTargetResource(typeConfig typeconfig.Interface, targetResource *unstructured.Unstructured) (*unstructured.Unstructured, error) {
+func FederatedResourceFromTargetResource(typeConfig typeconfig.Interface, resource *unstructured.Unstructured) (*unstructured.Unstructured, error) {
 	fedAPIResource := typeConfig.GetFederatedType()
+	targetResource := resource.DeepCopy()
 
 	// Special handling is needed for some controller set fields.
-	if typeConfig.GetTarget().Kind == ctlutil.ServiceAccountKind {
-		unstructured.RemoveNestedField(targetResource.Object, ctlutil.SecretsField)
-	}
-
-	if typeConfig.GetTarget().Kind == ctlutil.ServiceKind {
-		var targetPorts []interface{}
-		targetPorts, ok, err := unstructured.NestedSlice(targetResource.Object, "spec", "ports")
-		if err != nil {
-			return nil, err
+	switch typeConfig.GetTarget().Kind {
+	case ctlutil.NamespaceKind:
+		{
+			unstructured.RemoveNestedField(targetResource.Object, "spec", "finalizers")
 		}
-		if ok {
-			for index := range targetPorts {
-				port := targetPorts[index].(map[string]interface{})
-				delete(port, "nodePort")
-				targetPorts[index] = port
-			}
-			err := unstructured.SetNestedSlice(targetResource.Object, targetPorts, "spec", "ports")
+	case ctlutil.ServiceAccountKind:
+		{
+			unstructured.RemoveNestedField(targetResource.Object, ctlutil.SecretsField)
+		}
+	case ctlutil.ServiceKind:
+		{
+			var targetPorts []interface{}
+			targetPorts, ok, err := unstructured.NestedSlice(targetResource.Object, "spec", "ports")
 			if err != nil {
 				return nil, err
 			}
+			if ok {
+				for index := range targetPorts {
+					port := targetPorts[index].(map[string]interface{})
+					delete(port, "nodePort")
+					targetPorts[index] = port
+				}
+				err := unstructured.SetNestedSlice(targetResource.Object, targetPorts, "spec", "ports")
+				if err != nil {
+					return nil, err
+				}
+			}
+			unstructured.RemoveNestedField(targetResource.Object, "spec", "clusterIP")
 		}
-		unstructured.RemoveNestedField(targetResource.Object, "spec", "clusterIP")
 	}
 
 	qualifiedName := ctlutil.NewQualifiedName(targetResource)

diff --git a/pkg/kubefed2/federate/util.go b/pkg/kubefed2/federate/util.go
@@ -25,14 +25,16 @@ import (
 var systemMetadataFields = []string{"selfLink", "uid", "resourceVersion", "generation", "creationTimestamp", "deletionTimestamp", "deletionGracePeriodSeconds"}
 
 func RemoveUnwantedFields(resource *unstructured.Unstructured) {
-	unstructured.RemoveNestedField(resource.Object, "status")
 	for _, field := range systemMetadataFields {
 		unstructured.RemoveNestedField(resource.Object, "metadata", field)
 		// For resources with pod template subresource (jobs, deployments, replicasets)
 		unstructured.RemoveNestedField(resource.Object, "spec", "template", "metadata", field)
 	}
 	unstructured.RemoveNestedField(resource.Object, "metadata", "name")
 	unstructured.RemoveNestedField(resource.Object, "metadata", "namespace")
+	unstructured.RemoveNestedField(resource.Object, "apiVersion")
+	unstructured.RemoveNestedField(resource.Object, "kind")
+	unstructured.RemoveNestedField(resource.Object, "status")
 }
 
 func SetBasicMetaFields(resource *unstructured.Unstructured, apiResource metav1.APIResource, name, namespace, generateName string) {

diff --git a/pkg/kubefed2/join.go b/pkg/kubefed2/join.go
@@ -125,12 +125,12 @@ func NewCmdJoin(cmdOut io.Writer, config util.FedConfig) *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			err := opts.Complete(args)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 
 			err = opts.Run(cmdOut, config)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 		},
 	}

diff --git a/pkg/kubefed2/unjoin.go b/pkg/kubefed2/unjoin.go
@@ -93,12 +93,12 @@ func NewCmdUnjoin(cmdOut io.Writer, config util.FedConfig) *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			err := opts.Complete(args)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 
 			err = opts.Run(cmdOut, config)
 			if err != nil {
-				glog.Fatalf("error: %v", err)
+				glog.Fatalf("Error: %v", err)
 			}
 		},
 	}