Merge pull request #3839 from justinsb/avoid_list_for_keypairs_4

Automatic merge from submit-queue.

Force nodeup to use the bundle

We disable fallback entirely for nodeup, so we can still share code, but
won't accidentally be using the wrong code path.

Builds on #3839

cmd/kops/util/factory.go

@@ -108,7 +108,10 @@ func (f *Factory) Clientset() (simple.Clientset, error) {
 				return nil, field.Invalid(field.NewPath("State Store"), registryPath, INVALID_STATE_ERROR)
 			}
 
-			f.clientset = vfsclientset.NewVFSClientset(basePath)
+			// For kops CLI / controller, we do allow vfs list (unlike nodeup!)
+			allowVFSList := true
+
+			f.clientset = vfsclientset.NewVFSClientset(basePath, allowVFSList)
 		}
 	}
 

examples/kops-api-example/apply.go

@@ -22,7 +22,8 @@ import (
 )
 
 func apply() error {
-	clientset := vfsclientset.NewVFSClientset(registryBase)
+	allowList := true
+	clientset := vfsclientset.NewVFSClientset(registryBase, allowList)
 
 	cluster, err := clientset.GetCluster(clusterName)
 	if err != nil {

examples/kops-api-example/up.go

@@ -28,7 +28,8 @@ import (
 )
 
 func up() error {
-	clientset := vfsclientset.NewVFSClientset(registryBase)
+	allowList := true
+	clientset := vfsclientset.NewVFSClientset(registryBase, allowList)
 
 	cluster := &api.Cluster{}
 	cluster.ObjectMeta.Name = clusterName

pkg/client/simple/vfsclientset/clientset.go

@@ -31,7 +31,8 @@ import (
 )
 
 type VFSClientset struct {
-	basePath vfs.Path
+	basePath  vfs.Path
+	allowList bool
 }
 
 var _ simple.Clientset = &VFSClientset{}
@@ -107,7 +108,7 @@ func (c *VFSClientset) KeyStore(cluster *kops.Cluster) (fi.CAStore, error) {
 		return nil, err
 	}
 	basedir := configBase.Join("pki")
-	return fi.NewVFSCAStore(cluster, basedir), nil
+	return fi.NewVFSCAStore(cluster, basedir, c.allowList), nil
 }
 
 func (c *VFSClientset) SSHCredentialStore(cluster *kops.Cluster) (fi.SSHCredentialStore, error) {
@@ -168,9 +169,10 @@ func (c *VFSClientset) DeleteCluster(cluster *kops.Cluster) error {
 	return DeleteAllClusterState(configBase)
 }
 
-func NewVFSClientset(basePath vfs.Path) simple.Clientset {
+func NewVFSClientset(basePath vfs.Path, allowList bool) simple.Clientset {
 	vfsClientset := &VFSClientset{
-		basePath: basePath,
+		basePath:  basePath,
+		allowList: allowList,
 	}
 	return vfsClientset
 }

upup/pkg/fi/cloudup/populatecluster_test.go

@@ -109,7 +109,7 @@ func mockedPopulateClusterSpec(c *api.Cluster) (*api.Cluster, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error building vfspath: %v", err)
 	}
-	clientset := vfsclientset.NewVFSClientset(basePath)
+	clientset := vfsclientset.NewVFSClientset(basePath, true)
 	return PopulateClusterSpec(clientset, c, assetBuilder)
 }
 

upup/pkg/fi/nodeup/command.go

@@ -203,7 +203,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
 			return fmt.Errorf("error building key store path: %v", err)
 		}
 
-		modelContext.KeyStore = fi.NewVFSCAStore(c.cluster, p)
+		modelContext.KeyStore = fi.NewVFSCAStore(c.cluster, p, false)
 	} else {
 		return fmt.Errorf("KeyStore not set")
 	}

upup/pkg/fi/vfs_castore.go

@@ -41,8 +41,9 @@ import (
 )
 
 type VFSCAStore struct {
-	basedir vfs.Path
-	cluster *kops.Cluster
+	basedir   vfs.Path
+	cluster   *kops.Cluster
+	allowList bool
 
 	mutex     sync.Mutex
 	cachedCAs map[string]*cachedEntry
@@ -56,11 +57,12 @@ type cachedEntry struct {
 var _ CAStore = &VFSCAStore{}
 var _ SSHCredentialStore = &VFSCAStore{}
 
-func NewVFSCAStore(cluster *kops.Cluster, basedir vfs.Path) CAStore {
+func NewVFSCAStore(cluster *kops.Cluster, basedir vfs.Path, allowList bool) CAStore {
 	c := &VFSCAStore{
 		basedir:   basedir,
 		cluster:   cluster,
 		cachedCAs: make(map[string]*cachedEntry),
+		allowList: allowList,
 	}
 
 	return c
@@ -314,10 +316,14 @@ func (c *VFSCAStore) loadCertificates(p vfs.Path, useBundle bool) (*keyset, erro
 	if useBundle {
 		bundlePath := p.Join("keyset.yaml")
 		bundle, err := c.loadKeysetBundle(bundlePath)
+		if !c.allowList {
+			return bundle, err
+		}
+
 		if err != nil {
 			glog.Warningf("unable to read bundle %q, falling back to directory-list method: %v", bundlePath, err)
 		} else if bundle == nil {
-			glog.Infof("no certificate bundle %q, falling back to directory-list method", bundlePath)
+			glog.V(2).Infof("no certificate bundle %q, falling back to directory-list method", bundlePath)
 		} else {
 			return bundle, nil
 		}
@@ -647,10 +653,15 @@ func (c *VFSCAStore) loadPrivateKeys(p vfs.Path, useBundle bool) (*keyset, error
 	if useBundle {
 		bundlePath := p.Join("keyset.yaml")
 		bundle, err := c.loadKeysetBundle(bundlePath)
+
+		if !c.allowList {
+			return bundle, err
+		}
+
 		if err != nil {
 			glog.Warningf("unable to read bundle %q, falling back to directory-list method: %v", bundlePath, err)
 		} else if bundle == nil {
-			glog.V(2).Infof("no certificate bundle %q, falling back to directory-list method", bundlePath)
+			glog.V(2).Infof("no private key bundle %q, falling back to directory-list method", bundlePath)
 		} else {
 			return bundle, nil
 		}