Merge pull request #3240 from justinsb/create_and_update_functions

Automatic merge from submit-queue

Explicit CreateCluster & UpdateCluster functions

cmd/kops/create.go

@@ -159,7 +159,7 @@ func RunCreate(f *util.Factory, out io.Writer, c *CreateOptions) error {
 				if err != nil {
 					return fmt.Errorf("error populating configuration: %v", err)
 				}
-				_, err = clientset.ClustersFor(v).Create(v)
+				_, err = clientset.CreateCluster(v)
 				if err != nil {
 					if apierrors.IsAlreadyExists(err) {
 						return fmt.Errorf("cluster %q already exists", v.ObjectMeta.Name)

cmd/kops/edit_cluster.go

@@ -237,7 +237,7 @@ func RunEditCluster(f *util.Factory, cmd *cobra.Command, args []string, out io.W
 		}
 
 		// Note we perform as much validation as we can, before writing a bad config
-		_, err = clientset.ClustersFor(newCluster).Update(newCluster)
+		_, err = clientset.UpdateCluster(newCluster)
 		if err != nil {
 			return preservedFile(err, file, out)
 		}

cmd/kops/replace.go

@@ -115,7 +115,7 @@ func RunReplace(f *util.Factory, cmd *cobra.Command, out io.Writer, c *replaceOp
 				}
 
 			case *kopsapi.Cluster:
-				_, err = clientset.ClustersFor(v).Update(v)
+				_, err = clientset.UpdateCluster(v)
 				if err != nil {
 					return fmt.Errorf("error replacing cluster: %v", err)
 				}

cmd/kops/upgrade_cluster.go

@@ -301,7 +301,7 @@ func (c *UpgradeClusterCmd) Run(args []string) error {
 		}
 
 		// Note we perform as much validation as we can, before writing a bad config
-		_, err = clientset.ClustersFor(cluster).Update(cluster)
+		_, err = clientset.UpdateCluster(cluster)
 		if err != nil {
 			return err
 		}

examples/kops-api-example/up.go

@@ -67,7 +67,7 @@ func up() error {
 		return err
 	}
 
-	_, err := clientset.ClustersFor(cluster).Create(cluster)
+	_, err := clientset.CreateCluster(cluster)
 	if err != nil {
 		return err
 	}

pkg/apis/kops/registry/helpers.go

@@ -37,7 +37,7 @@ func CreateClusterConfig(clientset simple.Clientset, cluster *api.Cluster, group
 		}
 	}
 
-	_, err := clientset.ClustersFor(cluster).Create(cluster)
+	_, err := clientset.CreateCluster(cluster)
 	if err != nil {
 		return err
 	}

pkg/client/simple/clientset.go

@@ -26,12 +26,15 @@ import (
 )
 
 type Clientset interface {
-	// ClustersFor returns the ClusterInterface bound to the namespace for a particular Cluster
-	ClustersFor(cluster *kops.Cluster) kopsinternalversion.ClusterInterface
-
 	// GetCluster reads a cluster by name
 	GetCluster(name string) (*kops.Cluster, error)
 
+	// CreateCluster creates a cluster
+	CreateCluster(cluster *kops.Cluster) (*kops.Cluster, error)
+
+	// UpdateCluster updates a cluster
+	UpdateCluster(cluster *kops.Cluster) (*kops.Cluster, error)
+
 	// ListClusters returns all clusters
 	ListClusters(options metav1.ListOptions) (*kops.ClusterList, error)
 
@@ -57,31 +60,43 @@ type RESTClientset struct {
 	KopsClient kopsinternalversion.KopsInterface
 }
 
-func (c *RESTClientset) ClustersFor(cluster *kops.Cluster) kopsinternalversion.ClusterInterface {
+// GetCluster implements the GetCluster method of Clientset for a kubernetes-API state store
-	namespace := restNamespaceForClusterName(cluster.Name)
-	return c.KopsClient.Clusters(namespace)
-}
-
 func (c *RESTClientset) GetCluster(name string) (*kops.Cluster, error) {
 	namespace := restNamespaceForClusterName(name)
 	return c.KopsClient.Clusters(namespace).Get(name, metav1.GetOptions{})
 }
 
+// CreateCluster implements the CreateCluster method of Clientset for a kubernetes-API state store
+func (c *RESTClientset) CreateCluster(cluster *kops.Cluster) (*kops.Cluster, error) {
+	namespace := restNamespaceForClusterName(cluster.Name)
+	return c.KopsClient.Clusters(namespace).Create(cluster)
+}
+
+// UpdateCluster implements the UpdateCluster method of Clientset for a kubernetes-API state store
+func (c *RESTClientset) UpdateCluster(cluster *kops.Cluster) (*kops.Cluster, error) {
+	namespace := restNamespaceForClusterName(cluster.Name)
+	return c.KopsClient.Clusters(namespace).Update(cluster)
+}
+
+// ConfigBaseFor implements the ConfigBaseFor method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) ConfigBaseFor(cluster *kops.Cluster) (vfs.Path, error) {
 	// URL for clusters looks like  https://<server>/apis/kops/v1alpha2/namespaces/<cluster>/clusters/<cluster>
 	// We probably want to add a subresource for full resources
 	return vfs.Context.BuildVfsPath(c.BaseURL.String())
 }
 
+// ListClusters implements the ListClusters method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) ListClusters(options metav1.ListOptions) (*kops.ClusterList, error) {
 	return c.KopsClient.Clusters(metav1.NamespaceAll).List(options)
 }
 
+// InstanceGroupsFor implements the InstanceGroupsFor method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) InstanceGroupsFor(cluster *kops.Cluster) kopsinternalversion.InstanceGroupInterface {
 	namespace := restNamespaceForClusterName(cluster.Name)
 	return c.KopsClient.InstanceGroups(namespace)
 }
 
+// FederationsFor implements the FederationsFor method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) FederationsFor(federation *kops.Federation) kopsinternalversion.FederationInterface {
 	// Unsure if this should be namespaced or not - probably, so that we can RBAC it...
 	panic("Federations are curently not supported by the server API")
@@ -89,10 +104,12 @@ func (c *RESTClientset) FederationsFor(federation *kops.Federation) kopsinternal
 	//return c.KopsClient.Federations(namespace)
 }
 
+// ListFederations implements the ListFederations method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) ListFederations(options metav1.ListOptions) (*kops.FederationList, error) {
 	return c.KopsClient.Federations(metav1.NamespaceAll).List(options)
 }
 
+// GetFederation implements the GetFederation method of Clientset for a kubernetes-API state store
 func (c *RESTClientset) GetFederation(name string) (*kops.Federation, error) {
 	namespace := restNamespaceForFederationName(name)
 	return c.KopsClient.Federations(namespace).Get(name, metav1.GetOptions{})

pkg/client/simple/vfsclientset/clientset.go

@@ -30,26 +30,36 @@ type VFSClientset struct {
 
 var _ simple.Clientset = &VFSClientset{}
 
-func (c *VFSClientset) ClustersFor(cluster *kops.Cluster) kopsinternalversion.ClusterInterface {
-	return c.clusters()
-}
-
 func (c *VFSClientset) clusters() *ClusterVFS {
 	return newClusterVFS(c.basePath)
 }
 
+// GetCluster implements the GetCluster method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) GetCluster(name string) (*kops.Cluster, error) {
 	return c.clusters().Get(name, metav1.GetOptions{})
 }
 
+// UpdateCluster implements the UpdateCluster method of simple.Clientset for a VFS-backed state store
+func (c *VFSClientset) UpdateCluster(cluster *kops.Cluster) (*kops.Cluster, error) {
+	return c.clusters().Update(cluster)
+}
+
+// CreateCluster implements the CreateCluster method of simple.Clientset for a VFS-backed state store
+func (c *VFSClientset) CreateCluster(cluster *kops.Cluster) (*kops.Cluster, error) {
+	return c.clusters().Create(cluster)
+}
+
+// ListClusters implements the ListClusters method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) ListClusters(options metav1.ListOptions) (*kops.ClusterList, error) {
 	return c.clusters().List(options)
 }
 
+// ConfigBaseFor implements the ConfigBaseFor method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) ConfigBaseFor(cluster *kops.Cluster) (vfs.Path, error) {
 	return c.clusters().configBase(cluster.Name)
 }
 
+// InstanceGroupsFor implements the InstanceGroupsFor method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) InstanceGroupsFor(cluster *kops.Cluster) kopsinternalversion.InstanceGroupInterface {
 	clusterName := cluster.Name
 	return newInstanceGroupVFS(c, clusterName)
@@ -59,14 +69,17 @@ func (c *VFSClientset) federations() kopsinternalversion.FederationInterface {
 	return newFederationVFS(c)
 }
 
+// FederationsFor implements the FederationsFor method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) FederationsFor(federation *kops.Federation) kopsinternalversion.FederationInterface {
 	return c.federations()
 }
 
+// ListFederations implements the ListFederations method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) ListFederations(options metav1.ListOptions) (*kops.FederationList, error) {
 	return c.federations().List(options)
 }
 
+// GetFederation implements the GetFederation method of simple.Clientset for a VFS-backed state store
 func (c *VFSClientset) GetFederation(name string) (*kops.Federation, error) {
 	return c.federations().Get(name, metav1.GetOptions{})
 }

pkg/client/simple/vfsclientset/cluster.go

@@ -21,12 +21,12 @@ import (
 	"github.com/golang/glog"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/watch"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/apis/kops/v1alpha1"
 	"k8s.io/kops/pkg/apis/kops/validation"
-	kopsinternalversion "k8s.io/kops/pkg/client/clientset_generated/clientset/typed/kops/internalversion"
 	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"strings"
@@ -45,8 +45,6 @@ func newClusterVFS(basePath vfs.Path) *ClusterVFS {
 	return c
 }
 
-var _ kopsinternalversion.ClusterInterface = &ClusterVFS{}
-
 func (c *ClusterVFS) Get(name string, options metav1.GetOptions) (*api.Cluster, error) {
 	if options.ResourceVersion != "" {
 		return nil, fmt.Errorf("ResourceVersion not supported in ClusterVFS::Get")
@@ -121,7 +119,7 @@ func (r *ClusterVFS) Update(c *api.Cluster) (*api.Cluster, error) {
 
 	clusterName := c.ObjectMeta.Name
 	if clusterName == "" {
-		return nil, fmt.Errorf("clusterName is required")
+		return nil, field.Required(field.NewPath("Name"), "clusterName is required")
 	}
 
 	if err := r.writeConfig(r.basePath.Join(clusterName, registry.PathCluster), c, vfs.WriteOptionOnlyIfExists); err != nil {