Skip to content

Commit

Permalink
Merge pull request kubernetes#47824 from mbohlool/revert2
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 47851, 47824, 47858, 46099)

Revert 44714 manually

kubernetes#44714 broke backward compatibility for old swagger spec that kubectl still uses. The decision on kubernetes#47448 was to revert this change but the change was not automatically revertible. Here I semi-manually remove all references to UnixUserID and UnixGroupID and updated generated files accordingly.

Please wait for tests to pass then review that as there may still be tests that are failing.

Fixes kubernetes#47448

Adding release note just because the original PR has a release note. If possible, we should remove both release notes as they cancel each other.

**Release note**: (removed by caesarxuchao)

UnixUserID and UnixGroupID is reverted back as int64 to keep backward compatibility.
  • Loading branch information
Kubernetes Submit Queue committed Jun 21, 2017
2 parents 9fc70f2 + 10bdf7f commit 8335505
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/volume/cinder/cinder.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,12 @@ func (b *cinderVolumeMounter) CanMount() error {
return nil
}

func (b *cinderVolumeMounter) SetUp(fsGroup *types.UnixGroupID) error {
func (b *cinderVolumeMounter) SetUp(fsGroup *int64) error {
return b.SetUpAt(b.GetPath(), fsGroup)
}

// SetUp bind mounts to the volume path.
func (b *cinderVolumeMounter) SetUpAt(dir string, fsGroup *types.UnixGroupID) error {
func (b *cinderVolumeMounter) SetUpAt(dir string, fsGroup *int64) error {
glog.V(5).Infof("Cinder SetUp %s to %s", b.pdName, dir)

b.plugin.volumeLocks.LockKey(b.pdName)
Expand Down

0 comments on commit 8335505

Please sign in to comment.