Skip to content

Commit

Permalink
Merge pull request kubernetes#36267 from vishh/gci-mounter-scope
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Make GCI nodes mount non tmpfs, ext* & bind mounts using an external mounter 

This PR downloads the stage1 & gci-mounter ACIs as part of cluster bring up instead of downloading them dynamically from gcr.io, which was the cause for kubernetes#36206.

I have also optimized the containerized mounter to pre-load the mounter image once to avoid fetch latency while using it.

Original PR which got reverted: kubernetes#35821

```release-note
GCI nodes use an external mounter script to mount NFS & GlusterFS storage volumes
```

@mtaufen Node e2e is not re-enabled in this PR.

cc @jingxu97
  • Loading branch information
Kubernetes Submit Queue authored Nov 9, 2016
2 parents e5022f4 + 4476976 commit 3f05350
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/openstack/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func getMetadataFromConfigDrive() (*Metadata, error) {

glog.V(4).Infof("Attempting to mount configdrive %s on %s", dev, mntdir)

mounter := mount.New()
mounter := mount.New("" /* default mount path */)
err = mounter.Mount(dev, mntdir, "iso9660", []string{"ro"})
if err != nil {
err = mounter.Mount(dev, mntdir, "vfat", []string{"ro"})
Expand Down

0 comments on commit 3f05350

Please sign in to comment.