Merge pull request kubernetes-retired#1016 from iawia002/go-1.11

Bump golang version to 1.11.1
huangyutongs · Oct 16, 2018 · 87f0009 · 87f0009
2 parents dd2dadf + 7334ed9
commit 87f0009
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
 
 language: go
 go:
-  - 1.10.3
+  - 1.11.1
 services: docker
 
 go_import_path: github.com/kubernetes-incubator/external-storage

diff --git a/aws/efs/Makefile b/aws/efs/Makefile
@@ -36,7 +36,7 @@ all build:
 		-v $$(pwd):/go/bin \
 		-v $$(pwd)/.go/stdlib:/usr/local/go/pkg/linux_amd64_asdf \
 		-w /go/src/github.com/kubernetes-incubator/external-storage/aws/efs \
-		golang:1.10.3-alpine \
+		golang:1.11.1-alpine \
 		go install -installsuffix "asdf" ./cmd/efs-provisioner
 .PHONY: all build
 

diff --git a/gluster/block/Makefile b/gluster/block/Makefile
@@ -36,7 +36,7 @@ all build:
 		-v $$(pwd):/go/bin \
 		-v $$(pwd)/.go/stdlib:/usr/local/go/pkg/linux_amd64_asdf \
 		-w /go/src/github.com/kubernetes-incubator/external-storage/gluster/block \
-		golang:1.10.3-alpine \
+		golang:1.11.1-alpine \
 		go install -installsuffix "asdf" ./cmd/glusterblock-provisioner
 .PHONY: all build
 

diff --git a/gluster/file/Makefile b/gluster/file/Makefile
@@ -36,7 +36,7 @@ all build:
 		-v $$(pwd):/go/bin \
 		-v $$(pwd)/.go/stdlib:/usr/local/go/pkg/linux_amd64_asdf \
 		-w /go/src/github.com/kubernetes-incubator/external-storage/gluster/file \
-		golang:1.10.3-alpine \
+		golang:1.11.1-alpine \
 		go install -installsuffix "asdf" ./cmd/glusterfile-provisioner
 .PHONY: all build
 

diff --git a/iscsi/targetd/Makefile b/iscsi/targetd/Makefile
@@ -36,7 +36,7 @@ all build:
 		-v $$(pwd):/go/bin \
 		-v $$(pwd)/.go/stdlib:/usr/local/go/pkg/linux_amd64_asdf \
 		-w /go/src/github.com/kubernetes-incubator/external-storage/iscsi/targetd \
-		golang:1.10.3-alpine \
+		golang:1.11.1-alpine \
 		go install -installsuffix "asdf" .
 .PHONY: all build
 

diff --git a/lib/controller/controller.go b/lib/controller/controller.go
@@ -1002,12 +1002,12 @@ func (ctrl *ProvisionController) provisionClaimOperation(claim *v1.PersistentVol
 
 	options := VolumeOptions{
 		PersistentVolumeReclaimPolicy: reclaimPolicy,
-		PVName:            pvName,
-		PVC:               claim,
-		MountOptions:      mountOptions,
-		Parameters:        parameters,
-		SelectedNode:      selectedNode,
-		AllowedTopologies: allowedTopologies,
+		PVName:                        pvName,
+		PVC:                           claim,
+		MountOptions:                  mountOptions,
+		Parameters:                    parameters,
+		SelectedNode:                  selectedNode,
+		AllowedTopologies:             allowedTopologies,
 	}
 
 	ctrl.eventRecorder.Event(claim, v1.EventTypeNormal, "Provisioning", fmt.Sprintf("External provisioner is provisioning volume for claim %q", claimToClaimKey(claim)))

diff --git a/lib/controller/controller_test.go b/lib/controller/controller_test.go
@@ -904,8 +904,8 @@ func constructProvisionedVolumeWithoutStorageClassInfo(claim *v1.PersistentVolum
 	// pv.Spec MUST be set to match requirements in claim.Spec, especially access mode and PV size. The provisioned volume size MUST NOT be smaller than size requested in the claim, however it MAY be larger.
 	options := VolumeOptions{
 		PersistentVolumeReclaimPolicy: reclaimPolicy,
-		PVName: "pvc-" + string(claim.ObjectMeta.UID),
-		PVC:    claim,
+		PVName:                        "pvc-" + string(claim.ObjectMeta.UID),
+		PVC:                           claim,
 	}
 	volume, _ := newTestProvisioner().Provision(options)
 

diff --git a/nfs/pkg/volume/provision_test.go b/nfs/pkg/volume/provision_test.go
@@ -59,9 +59,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "succeed creating volume",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-1",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-1",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "1.1.1.1",
@@ -75,9 +75,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "succeed creating volume again",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-2",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-2",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "1.1.1.1",
@@ -91,9 +91,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "bad parameter",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-3",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{"foo": "bar"},
+				PVName:                        "pvc-3",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{"foo": "bar"},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "",
@@ -108,9 +108,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "bad server",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-4",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-4",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           serviceEnv,
 			expectedServer:   "",
@@ -125,9 +125,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "dir already exists",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-1",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-1",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "",
@@ -142,9 +142,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "error exporting",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "FAIL_TO_EXPORT_ME",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "FAIL_TO_EXPORT_ME",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "",
@@ -158,9 +158,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "succeed creating volume last slot",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-3",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-3",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "1.1.1.1",
@@ -174,9 +174,9 @@ func TestCreateVolume(t *testing.T) {
 			name: "max export limit exceeded",
 			options: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName:     "pvc-3",
-				PVC:        newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
-				Parameters: map[string]string{},
+				PVName:                        "pvc-3",
+				PVC:                           newClaim(resource.MustParse("1Ki"), []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce, v1.ReadOnlyMany}, nil),
+				Parameters:                    map[string]string{},
 			},
 			envKey:           podIPEnv,
 			expectedServer:   "",
@@ -589,7 +589,6 @@ func TestGetServer(t *testing.T) {
 		expectedServer string
 		expectError    bool
 	}{
-
 		{
 			name:           "valid node only",
 			objs:           []runtime.Object{},
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ os: @@
     language: go
     go:
-      - 1.10.3
+      - 1.11.1
     services: docker
     go_import_path: github.com/kubernetes-incubator/external-storage
@@ Expand Down @@