@@ -1,6 +1,6 @@

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1alpha1.json cascade-kubernetes/api/swagger-spec/apps_v1alpha1.json

-+++ cascade-kubernetes/api/swagger-spec/apps_v1alpha1.json	2018-01-31 02:12:47.000000000 +0000

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1alpha1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1alpha1.json

+--- kubernetes-original/api/swagger-spec/apps_v1alpha1.json	2018-03-20 19:21:10.000000000 +0000

 @@ -1459,6 +1459,10 @@

       "photonPersistentDisk": {

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

@@ -36,10 +36,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1alpha1.json

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta1.json cascade-kubernetes/api/swagger-spec/apps_v1beta1.json

-+++ cascade-kubernetes/api/swagger-spec/apps_v1beta1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -4400,6 +4400,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1beta1.json

+--- kubernetes-original/api/swagger-spec/apps_v1beta1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -4479,6 +4479,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

        "description": "PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine"

       },

@@ -50,7 +50,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta1.json c

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

        "description": "Items for all in one resources secrets, configmaps, and downward API"

-@@ -5123,6 +5127,23 @@

+@@ -5202,6 +5206,23 @@

       },

       "fsType": {

        "type": "string",

@@ -74,10 +74,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta1.json c

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta2.json cascade-kubernetes/api/swagger-spec/apps_v1beta2.json

-+++ cascade-kubernetes/api/swagger-spec/apps_v1beta2.json	2018-01-31 02:12:47.000000000 +0000

-@@ -6730,6 +6730,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta2.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1beta2.json

+--- kubernetes-original/api/swagger-spec/apps_v1beta2.json	2018-03-20 19:21:10.000000000 +0000

+@@ -6845,6 +6845,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

        "description": "PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine"

       },

@@ -88,7 +88,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta2.json c

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

        "description": "Items for all in one resources secrets, configmaps, and downward API"

-@@ -7453,6 +7457,23 @@

+@@ -7568,6 +7572,23 @@

       },

       "fsType": {

        "type": "string",

@@ -112,10 +112,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/apps_v1beta2.json c

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1beta1.json cascade-kubernetes/api/swagger-spec/batch_v1beta1.json

-+++ cascade-kubernetes/api/swagger-spec/batch_v1beta1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -1850,6 +1850,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1beta1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v1beta1.json

+--- kubernetes-original/api/swagger-spec/batch_v1beta1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -1874,6 +1874,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

        "description": "PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine"

       },

@@ -126,7 +126,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1beta1.json

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

        "description": "Items for all in one resources secrets, configmaps, and downward API"

-@@ -2573,6 +2577,23 @@

+@@ -2597,6 +2601,23 @@

       },

       "fsType": {

        "type": "string",

@@ -150,10 +150,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1beta1.json

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1.json cascade-kubernetes/api/swagger-spec/batch_v1.json

-+++ cascade-kubernetes/api/swagger-spec/batch_v1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -1795,6 +1795,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v1.json

+--- kubernetes-original/api/swagger-spec/batch_v1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -1819,6 +1819,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

        "description": "PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine"

       },

@@ -164,7 +164,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1.json casca

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

        "description": "Items for all in one resources secrets, configmaps, and downward API"

-@@ -2518,6 +2522,23 @@

+@@ -2542,6 +2546,23 @@

       },

       "fsType": {

        "type": "string",

@@ -188,10 +188,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v1.json casca

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v2alpha1.json cascade-kubernetes/api/swagger-spec/batch_v2alpha1.json

-+++ cascade-kubernetes/api/swagger-spec/batch_v2alpha1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -1865,6 +1865,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v2alpha1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v2alpha1.json

+--- kubernetes-original/api/swagger-spec/batch_v2alpha1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -1889,6 +1889,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

        "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."

@@ -202,7 +202,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v2alpha1.json

       }

      }

     },

-@@ -2769,6 +2773,23 @@

+@@ -2793,6 +2797,23 @@

       }

      }

     },

@@ -226,10 +226,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/batch_v2alpha1.json

     "v1.Container": {

      "id": "v1.Container",

      "description": "A single application container that you want to run within a pod.",

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/extensions_v1beta1.json cascade-kubernetes/api/swagger-spec/extensions_v1beta1.json

-+++ cascade-kubernetes/api/swagger-spec/extensions_v1beta1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -7363,6 +7363,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/extensions_v1beta1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/extensions_v1beta1.json

+--- kubernetes-original/api/swagger-spec/extensions_v1beta1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -7502,6 +7502,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

        "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."

@@ -240,7 +240,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/extensions_v1beta1.

       }

      }

     },

-@@ -8071,6 +8075,23 @@

+@@ -8210,6 +8214,23 @@

       },

       "fsType": {

        "type": "string",

@@ -264,10 +264,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/extensions_v1beta1.

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/settings.k8s.io_v1alpha1.json cascade-kubernetes/api/swagger-spec/settings.k8s.io_v1alpha1.json

-+++ cascade-kubernetes/api/swagger-spec/settings.k8s.io_v1alpha1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -1661,6 +1661,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/settings.k8s.io_v1alpha1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/settings.k8s.io_v1alpha1.json

+--- kubernetes-original/api/swagger-spec/settings.k8s.io_v1alpha1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -1676,6 +1676,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

        "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."

@@ -278,7 +278,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/settings.k8s.io_v1a

       }

      }

     },

-@@ -2331,6 +2335,23 @@

+@@ -2346,6 +2350,23 @@

       },

       "fsType": {

        "type": "string",

@@ -302,10 +302,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/settings.k8s.io_v1a

        "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."

       }

      }

-diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/v1.json cascade-kubernetes/api/swagger-spec/v1.json

-+++ cascade-kubernetes/api/swagger-spec/v1.json	2018-01-31 02:12:47.000000000 +0000

-@@ -20271,6 +20271,10 @@

+diff -uNr --no-dereference kubernetes-original/api/swagger-spec/v1.json kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/v1.json

+--- kubernetes-original/api/swagger-spec/v1.json	2018-03-20 19:21:10.000000000 +0000

+@@ -20629,6 +20629,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

        "description": "PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine"

       },

@@ -316,7 +316,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/v1.json cascade-kub

       "portworxVolume": {

        "$ref": "v1.PortworxVolumeSource",

        "description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"

-@@ -20834,6 +20838,23 @@

+@@ -21200,6 +21204,23 @@

       }

      }

     },

@@ -340,7 +340,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/v1.json cascade-kub

     "v1.PortworxVolumeSource": {

      "id": "v1.PortworxVolumeSource",

      "description": "PortworxVolumeSource represents a Portworx volume resource.",

-@@ -21265,6 +21286,10 @@

+@@ -21657,6 +21678,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

        "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."

@@ -351,73 +351,56 @@ diff -uNr --no-dereference kubernetes-1.8.1/api/swagger-spec/v1.json cascade-kub

       }

      }

     },

-diff -uNr --no-dereference kubernetes-1.8.1/cmd/kube-controller-manager/app/BUILD cascade-kubernetes/cmd/kube-controller-manager/app/BUILD

-+++ cascade-kubernetes/cmd/kube-controller-manager/app/BUILD	2018-01-31 02:12:47.000000000 +0000

-@@ -42,6 +42,7 @@

-         "//pkg/cloudprovider/providers:go_default_library",

-         "//pkg/cloudprovider/providers/aws:go_default_library",

-         "//pkg/cloudprovider/providers/azure:go_default_library",

-+        "//pkg/cloudprovider/providers/cascade:go_default_library",

-         "//pkg/cloudprovider/providers/gce:go_default_library",

-         "//pkg/cloudprovider/providers/openstack:go_default_library",

-         "//pkg/cloudprovider/providers/photon:go_default_library",

-@@ -84,6 +85,7 @@

+diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/BUILD kubernetes-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD

+--- kubernetes-original/cmd/kube-controller-manager/app/BUILD	2018-03-20 19:21:10.000000000 +0000

+@@ -86,6 +86,7 @@

          "//pkg/volume/aws_ebs:go_default_library",

          "//pkg/volume/azure_dd:go_default_library",

          "//pkg/volume/azure_file:go_default_library",

 +        "//pkg/volume/cascade_disk:go_default_library",

          "//pkg/volume/cinder:go_default_library",

+         "//pkg/volume/csi:go_default_library",

          "//pkg/volume/fc:go_default_library",

-         "//pkg/volume/flexvolume:go_default_library",

-diff -uNr --no-dereference kubernetes-1.8.1/cmd/kube-controller-manager/app/plugins.go cascade-kubernetes/cmd/kube-controller-manager/app/plugins.go

-+++ cascade-kubernetes/cmd/kube-controller-manager/app/plugins.go	2018-01-31 02:12:47.000000000 +0000

-@@ -32,6 +32,7 @@

- 	"k8s.io/kubernetes/pkg/cloudprovider"

- 	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"

- 	"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"

-+	"k8s.io/kubernetes/pkg/cloudprovider/providers/cascade"

- 	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"

- 	"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"

- 	"k8s.io/kubernetes/pkg/cloudprovider/providers/photon"

-@@ -58,6 +59,7 @@

- 	"k8s.io/kubernetes/pkg/volume/storageos"

- 	volumeutil "k8s.io/kubernetes/pkg/volume/util"

- 	"k8s.io/kubernetes/pkg/volume/vsphere_volume"

+diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/plugins.go kubernetes-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go

+--- kubernetes-original/cmd/kube-controller-manager/app/plugins.go	2018-03-20 19:21:10.000000000 +0000

+@@ -34,6 +34,7 @@

+ 	"k8s.io/kubernetes/pkg/volume/aws_ebs"

+ 	"k8s.io/kubernetes/pkg/volume/azure_dd"

+ 	"k8s.io/kubernetes/pkg/volume/azure_file"

 +	"k8s.io/kubernetes/pkg/volume/cascade_disk"

- )

- 

- // ProbeAttachableVolumePlugins collects all volume plugins for the attach/

-@@ -78,6 +80,7 @@

- 	allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)

+ 	"k8s.io/kubernetes/pkg/volume/cinder"

+ 	"k8s.io/kubernetes/pkg/volume/csi"

+ 	"k8s.io/kubernetes/pkg/volume/fc"

+@@ -77,6 +78,7 @@

  	allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...)

  	allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...)

+ 	allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...)

 +	allPlugins = append(allPlugins, cascade_disk.ProbeVolumePlugins()...)

- 	return allPlugins

- }

- 

-@@ -104,6 +107,7 @@

+ 	if utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) {

+ 		allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)

+ 	}

+@@ -106,6 +108,7 @@

  	allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)

  	allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)

  	allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...)

 +	allPlugins = append(allPlugins, cascade_disk.ProbeVolumePlugins()...)

- 	return allPlugins

- }

- 

-@@ -168,6 +172,8 @@

- 			allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)

- 		case photon.ProviderName == cloud.ProviderName():

- 			allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...)

-+		case cascade.ProviderName == cloud.ProviderName():

-+			allPlugins = append(allPlugins, cascade_disk.ProbeVolumePlugins()...)

- 		}

+ 	if !utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) {

+ 		allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)

  	}

+@@ -165,6 +168,7 @@

+ 	allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)

+ 	allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)

+ 	allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...)

++	allPlugins = append(allPlugins, cascade_disk.ProbeVolumePlugins()...)

-diff -uNr --no-dereference kubernetes-1.8.1/cmd/kubelet/app/BUILD cascade-kubernetes/cmd/kubelet/app/BUILD

-+++ cascade-kubernetes/cmd/kubelet/app/BUILD	2018-01-31 02:12:47.000000000 +0000

-@@ -73,6 +73,7 @@

+ 	return allPlugins

+ }

+diff -uNr --no-dereference kubernetes-original/cmd/kubelet/app/BUILD kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/app/BUILD

+--- kubernetes-original/cmd/kubelet/app/BUILD	2018-03-20 19:21:10.000000000 +0000

+@@ -74,6 +74,7 @@

          "//pkg/volume/aws_ebs:go_default_library",

          "//pkg/volume/azure_dd:go_default_library",

          "//pkg/volume/azure_file:go_default_library",

@@ -425,9 +408,9 @@ diff -uNr --no-dereference kubernetes-1.8.1/cmd/kubelet/app/BUILD cascade-kubern

          "//pkg/volume/cephfs:go_default_library",

          "//pkg/volume/cinder:go_default_library",

          "//pkg/volume/configmap:go_default_library",

-diff -uNr --no-dereference kubernetes-1.8.1/cmd/kubelet/app/plugins.go cascade-kubernetes/cmd/kubelet/app/plugins.go

-+++ cascade-kubernetes/cmd/kubelet/app/plugins.go	2018-01-31 02:12:47.000000000 +0000

+diff -uNr --no-dereference kubernetes-original/cmd/kubelet/app/plugins.go kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/app/plugins.go

+--- kubernetes-original/cmd/kubelet/app/plugins.go	2018-03-20 19:21:10.000000000 +0000

 @@ -32,6 +32,7 @@

  	"k8s.io/kubernetes/pkg/volume/aws_ebs"

  	"k8s.io/kubernetes/pkg/volume/azure_dd"

@@ -436,54 +419,266 @@ diff -uNr --no-dereference kubernetes-1.8.1/cmd/kubelet/app/plugins.go cascade-k

  	"k8s.io/kubernetes/pkg/volume/cephfs"

  	"k8s.io/kubernetes/pkg/volume/cinder"

  	"k8s.io/kubernetes/pkg/volume/configmap"

-@@ -96,6 +97,7 @@

+@@ -100,6 +101,7 @@

  	allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)

  	allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)

  	allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)

 +	allPlugins = append(allPlugins, cascade_disk.ProbeVolumePlugins()...)

- 	return allPlugins

- }

- 

-diff -uNr --no-dereference kubernetes-1.8.1/federation/apis/openapi-spec/swagger.json cascade-kubernetes/federation/apis/openapi-spec/swagger.json

-+++ cascade-kubernetes/federation/apis/openapi-spec/swagger.json	2018-01-31 02:12:47.000000000 +0000

-@@ -10540,6 +10540,22 @@

-      }

-     }

-    },

-+   "io.k8s.api.core.v1.CascadeDiskVolumeSource": {

-+    "description": "Represents a Cascade persistent disk resource.",

-+    "required": [

-+     "diskID"

-+    ],

-+    "properties": {

-+     "fsType": {

-+      "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",

-+      "type": "string"

-+     },

-+     "diskID": {

-+      "description": "ID that identifies Cascade persistent disk",

-+      "type": "string"

-+     }

-+    }

-+   },

-    "io.k8s.api.core.v1.Capabilities": {

-     "description": "Adds and removes POSIX capabilities from running containers.",

-     "properties": {

-@@ -12865,6 +12881,10 @@

-      "vsphereVolume": {

-       "description": "VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine",

-       "$ref": "#/definitions/io.k8s.api.core.v1.VsphereVirtualDiskVolumeSource"

-+     },

-+     "cascadeDisk": {

-+      "description": "CascadeDisk represents a Cascade persistent disk attached and mounted on kubelets host machine",

-+      "$ref": "#/definitions/io.k8s.api.core.v1.CascadeDiskVolumeSource"

-      }

-     }

-    },

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/types.go cascade-kubernetes/pkg/api/types.go

-+++ cascade-kubernetes/pkg/api/types.go	2018-01-31 02:12:47.000000000 +0000

+ 	if utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) {

+ 		allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)

+ 	}

+diff -uNr --no-dereference kubernetes-original/.idea/kubernetes.iml kubernetes-modified/src/k8s.io/kubernetes/.idea/kubernetes.iml

+--- kubernetes-original/.idea/kubernetes.iml	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,9 @@

++<?xml version="1.0" encoding="UTF-8"?>

++<module type="JAVA_MODULE" version="4">

++  <component name="NewModuleRootManager" inherit-compiler-output="true">

++    <exclude-output />

++    <content url="file://$MODULE_DIR$" />

++    <orderEntry type="inheritedJdk" />

++    <orderEntry type="sourceFolder" forTests="false" />

++  </component>

++</module>

+\ No newline at end of file

+diff -uNr --no-dereference kubernetes-original/.idea/modules.xml kubernetes-modified/src/k8s.io/kubernetes/.idea/modules.xml

+--- kubernetes-original/.idea/modules.xml	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,8 @@

++<?xml version="1.0" encoding="UTF-8"?>

++<project version="4">

++  <component name="ProjectModuleManager">

++    <modules>

++      <module fileurl="file://$PROJECT_DIR$/.idea/kubernetes.iml" filepath="$PROJECT_DIR$/.idea/kubernetes.iml" />

++    </modules>

++  </component>

++</project>

+\ No newline at end of file

+diff -uNr --no-dereference kubernetes-original/.idea/workspace.xml kubernetes-modified/src/k8s.io/kubernetes/.idea/workspace.xml

+--- kubernetes-original/.idea/workspace.xml	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,217 @@

++<?xml version="1.0" encoding="UTF-8"?>

++<project version="4">

++  <component name="ChangeListManager">

++    <list default="true" id="76c7d3c7-31f8-4430-8717-7c15514d1ce9" name="Default" comment="" />

++    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />

++    <option name="TRACKING_ENABLED" value="true" />

++    <option name="SHOW_DIALOG" value="false" />

++    <option name="HIGHLIGHT_CONFLICTS" value="true" />

++    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

++    <option name="LAST_RESOLUTION" value="IGNORE" />

++  </component>

++  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />

++  <component name="GradleLocalSettings">

++    <option name="externalProjectsViewState">

++      <projects_view />

++    </option>

++  </component>

++  <component name="ProjectFrameBounds">

++    <option name="x" value="1680" />

++    <option name="y" value="-235" />

++    <option name="width" value="2560" />

++    <option name="height" value="1417" />

++  </component>

++  <component name="ProjectView">

++    <navigator currentView="ProjectPane" proportions="" version="1">

++      <flattenPackages />

++      <showMembers />

++      <showModules />

++      <showLibraryContents />

++      <hideEmptyPackages />

++      <abbreviatePackageNames />

++      <autoscrollToSource />

++      <autoscrollFromSource />

++      <sortByType />

++      <manualOrder />

++      <foldersAlwaysOnTop value="true" />

++    </navigator>

++    <panes>

++      <pane id="Scope" />

++      <pane id="Scratches" />

++      <pane id="PackagesPane" />

++      <pane id="ProjectPane">

++        <subPane>

++          <PATH>

++            <PATH_ELEMENT>

++              <option name="myItemId" value="kubernetes" />

++              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />

++            </PATH_ELEMENT>

++            <PATH_ELEMENT>

++              <option name="myItemId" value="kubernetes" />

++              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />

++            </PATH_ELEMENT>

++          </PATH>

++        </subPane>

++      </pane>

++    </panes>

++  </component>

++  <component name="PropertiesComponent">

++    <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider$1" />

++    <property name="configurable.Global.libraries.is.expanded" value="true" />

++    <property name="last_opened_file_path" value="$PROJECT_DIR$" />

++  </component>

++  <component name="RunDashboard">

++    <option name="ruleStates">

++      <list>

++        <RuleState>

++          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />

++        </RuleState>

++        <RuleState>

++          <option name="name" value="StatusDashboardGroupingRule" />

++        </RuleState>

++      </list>

++    </option>

++  </component>

++  <component name="RunManager">

++    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">

++      <module name="" />

++      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />

++      <option name="PROGRAM_PARAMETERS" />

++      <predefined_log_file id="idea.log" enabled="true" />

++      <method />

++    </configuration>

++    <configuration default="true" type="Applet" factoryName="Applet">

++      <option name="HTML_USED" value="false" />

++      <option name="WIDTH" value="400" />

++      <option name="HEIGHT" value="300" />

++      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />

++      <module />

++      <method />

++    </configuration>

++    <configuration default="true" type="Application" factoryName="Application">

++      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

++      <option name="MAIN_CLASS_NAME" />

++      <option name="VM_PARAMETERS" />

++      <option name="PROGRAM_PARAMETERS" />

++      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />

++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

++      <option name="ALTERNATIVE_JRE_PATH" />

++      <option name="ENABLE_SWING_INSPECTOR" value="false" />

++      <option name="ENV_VARIABLES" />

++      <option name="PASS_PARENT_ENVS" value="true" />

++      <module name="" />

++      <envs />

++      <method />

++    </configuration>

++    <configuration default="true" type="JUnit" factoryName="JUnit">

++      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

++      <module name="" />

++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

++      <option name="ALTERNATIVE_JRE_PATH" />

++      <option name="PACKAGE_NAME" />

++      <option name="MAIN_CLASS_NAME" />

++      <option name="METHOD_NAME" />

++      <option name="TEST_OBJECT" value="class" />

++      <option name="VM_PARAMETERS" value="-ea" />

++      <option name="PARAMETERS" />

++      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />

++      <option name="ENV_VARIABLES" />

++      <option name="PASS_PARENT_ENVS" value="true" />

++      <option name="TEST_SEARCH_SCOPE">

++        <value defaultName="singleModule" />

++      </option>

++      <envs />

++      <patterns />

++      <method />

++    </configuration>

++    <configuration default="true" type="Remote" factoryName="Remote">

++      <option name="USE_SOCKET_TRANSPORT" value="true" />

++      <option name="SERVER_MODE" value="false" />

++      <option name="SHMEM_ADDRESS" value="javadebug" />

++      <option name="HOST" value="localhost" />

++      <option name="PORT" value="5005" />

++      <method />

++    </configuration>

++    <configuration default="true" type="TestNG" factoryName="TestNG">

++      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

++      <module name="" />

++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

++      <option name="ALTERNATIVE_JRE_PATH" />

++      <option name="SUITE_NAME" />

++      <option name="PACKAGE_NAME" />

++      <option name="MAIN_CLASS_NAME" />

++      <option name="METHOD_NAME" />

++      <option name="GROUP_NAME" />

++      <option name="TEST_OBJECT" value="CLASS" />

++      <option name="VM_PARAMETERS" value="-ea" />

++      <option name="PARAMETERS" />

++      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />

++      <option name="OUTPUT_DIRECTORY" />

++      <option name="ANNOTATION_TYPE" />

++      <option name="ENV_VARIABLES" />

++      <option name="PASS_PARENT_ENVS" value="true" />

++      <option name="TEST_SEARCH_SCOPE">

++        <value defaultName="singleModule" />

++      </option>

++      <option name="USE_DEFAULT_REPORTERS" value="false" />

++      <option name="PROPERTIES_FILE" />

++      <envs />

++      <properties />

++      <listeners />

++      <method />

++    </configuration>

++  </component>

++  <component name="ShelveChangesManager" show_recycled="false">

++    <option name="remove_strategy" value="false" />

++  </component>

++  <component name="TaskManager">

++    <task active="true" id="Default" summary="Default task">

++      <changelist id="76c7d3c7-31f8-4430-8717-7c15514d1ce9" name="Default" comment="" />

++      <created>1510772775522</created>

++      <option name="number" value="Default" />

++      <option name="presentableId" value="Default" />

++      <updated>1510772775522</updated>

++    </task>

++    <servers />

++  </component>

++  <component name="ToolWindowManager">

++    <frame x="1680" y="-235" width="2560" height="1417" extended-state="6" />

++    <layout>

++      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />

++      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />

++      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

++      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

++      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25178713" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />

++      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

++      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

++      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

++      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />

++      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

++      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />

++      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />

++      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />

++      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />

++      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />

++      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

++    </layout>

++  </component>

++  <component name="VcsContentAnnotationSettings">

++    <option name="myLimit" value="2678400000" />

++  </component>

++  <component name="XDebuggerManager">

++    <breakpoint-manager />

++    <watches-manager />

++  </component>

++</project>

+\ No newline at end of file

+diff -uNr --no-dereference kubernetes-original/pkg/apis/core/types.go kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/types.go

+--- kubernetes-original/pkg/apis/core/types.go	2018-03-20 19:21:10.000000000 +0000

 @@ -316,6 +316,8 @@

  	// StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod

  	// +optional

@@ -493,16 +688,16 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/types.go cascade-kubernetes/

  }

  // Similar to VolumeSource but meant for the administrator who creates PVs.

-@@ -391,6 +393,8 @@

- 	// More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md

+@@ -394,6 +396,8 @@

+ 	// CSI (Container Storage Interface) represents storage that handled by an external CSI driver

  	// +optional

- 	StorageOS *StorageOSPersistentVolumeSource

+ 	CSI *CSIPersistentVolumeSource

 +	// CascadeDisk represents a Cascade persistent disk attached and mounted on kubelets host machine

 +	CascadeDisk *CascadeDiskVolumeSource

  }

  type PersistentVolumeClaimVolumeSource struct {

-@@ -1333,6 +1337,16 @@

+@@ -1471,6 +1475,16 @@

  	SecretRef *ObjectReference

  }

@@ -519,10 +714,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/types.go cascade-kubernetes/

  // Adapts a ConfigMap into a volume.

  //

  // The contents of the target ConfigMap's Data field will be presented in a

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/validation/validation.go cascade-kubernetes/pkg/api/validation/validation.go

-+++ cascade-kubernetes/pkg/api/validation/validation.go	2018-01-31 02:12:47.000000000 +0000

-@@ -612,6 +612,14 @@

+diff -uNr --no-dereference kubernetes-original/pkg/apis/core/validation/validation.go kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/validation/validation.go

+--- kubernetes-original/pkg/apis/core/validation/validation.go	2018-03-20 19:21:10.000000000 +0000

+@@ -681,6 +681,14 @@

  			allErrs = append(allErrs, validateScaleIOVolumeSource(source.ScaleIO, fldPath.Child("scaleIO"))...)

  		}

  	}

@@ -537,11 +732,11 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/validation/validation.go cas

  	if numVolumes == 0 {

  		allErrs = append(allErrs, field.Required(fldPath, "must specify a volume type"))

-@@ -1283,6 +1291,14 @@

+@@ -1440,6 +1448,14 @@

  	return allErrs

  }

-+func validateCascadeDiskVolumeSource(cd *api.CascadeDiskVolumeSource, fldPath *field.Path) field.ErrorList {

++func validateCascadeDiskVolumeSource(cd *core.CascadeDiskVolumeSource, fldPath *field.Path) field.ErrorList {

 +	allErrs := field.ErrorList{}

 +	if len(cd.DiskID) == 0 {

 +		allErrs = append(allErrs, field.Required(fldPath.Child("diskID"), ""))

@@ -552,10 +747,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/validation/validation.go cas

  // ValidatePersistentVolumeName checks that a name is appropriate for a

  // PersistentVolumeName object.

  var ValidatePersistentVolumeName = NameIsDNSSubdomain

-@@ -1504,6 +1520,14 @@

- 			allErrs = append(allErrs, validateStorageOSPersistentVolumeSource(pv.Spec.StorageOS, specPath.Child("storageos"))...)

+@@ -1674,6 +1690,15 @@

  		}

  	}

+ 

 +	if pv.Spec.CascadeDisk != nil {

 +		if numVolumes > 0 {

 +			allErrs = append(allErrs, field.Forbidden(specPath.Child("cascadeDisk"), "may not specify more than 1 volume type"))

@@ -564,24 +759,25 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/api/validation/validation.go cas

 +			allErrs = append(allErrs, validateCascadeDiskVolumeSource(pv.Spec.CascadeDisk, specPath.Child("cascadeDisk"))...)

 +		}

 +	}

- 

++

  	if numVolumes == 0 {

  		allErrs = append(allErrs, field.Required(specPath, "must specify a volume type"))

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/apis/extensions/types.go cascade-kubernetes/pkg/apis/extensions/types.go

-+++ cascade-kubernetes/pkg/apis/extensions/types.go	2018-01-31 02:12:47.000000000 +0000

-@@ -1002,6 +1002,7 @@

- 	Projected             FSType = "projected"

+ 	}

+diff -uNr --no-dereference kubernetes-original/pkg/apis/extensions/types.go kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/extensions/types.go

+--- kubernetes-original/pkg/apis/extensions/types.go	2018-03-20 19:21:10.000000000 +0000

+@@ -925,6 +925,7 @@

  	PortworxVolume        FSType = "portworxVolume"

  	ScaleIO               FSType = "scaleIO"

+ 	CSI                   FSType = "csi"

 +	CascadeDisk           FSType = "cascadeDisk"

  	All                   FSType = "*"

  )

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/BUILD cascade-kubernetes/pkg/cloudprovider/providers/BUILD

-+++ cascade-kubernetes/pkg/cloudprovider/providers/BUILD	2018-01-31 02:12:47.000000000 +0000

-@@ -11,6 +11,7 @@

+diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/BUILD kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/BUILD

+--- kubernetes-original/pkg/cloudprovider/providers/BUILD	2018-03-20 19:21:10.000000000 +0000

+@@ -12,6 +12,7 @@

      deps = [

          "//pkg/cloudprovider/providers/aws:go_default_library",

          "//pkg/cloudprovider/providers/azure:go_default_library",

@@ -597,17 +793,19 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/BUILD ca

          "//pkg/cloudprovider/providers/cloudstack:all-srcs",

          "//pkg/cloudprovider/providers/fake:all-srcs",

          "//pkg/cloudprovider/providers/gce:all-srcs",

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/apitypes.go cascade-kubernetes/pkg/cloudprovider/providers/cascade/apitypes.go

-+++ cascade-kubernetes/pkg/cloudprovider/providers/cascade/apitypes.go	2018-01-31 02:12:47.000000000 +0000

-@@ -0,0 +1,224 @@

+diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/cascade/apitypes.go kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/cascade/apitypes.go

+--- kubernetes-original/pkg/cloudprovider/providers/cascade/apitypes.go	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,227 @@

 +package cascade

 +

 +import "fmt"

 +

 +const (

 +	NotFoundError     = 1408

++	VMNotFoundError   = 2006

 +	DiskNotFoundError = 3011

++	DiskInUseError    = 3012

 +)

 +

 +// Represents APIError returned by the API in case of an error.

@@ -763,7 +961,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	SelfLink    string           `json:"selfLink,omitempty"`

 +	State       *string          `json:"state"`

 +	Tags        []string         `json:"tags"`

-+	VM          string            `json:"vm"`

++	VM          string           `json:"vm"`

 +	MountDevice string           `json:"mountDevice,omitempty"`

 +	Zone        *string          `json:"zone"`

 +}

@@ -796,6 +994,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	Name        *string                  `json:"name"`

 +	PortMaps    []*LoadBalancerPortMap   `json:"portMaps"`

 +	Type        *string                  `json:"type"`

++	SubDomain   *string                  `json:"subDomain"`

 +}

 +

 +// Represents the health check spec for a load balancer.

@@ -825,10 +1024,9 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +type LoadBalancerVMUpdate struct {

 +	VMIds []*LoadBalancerVM `json:"vmIds"`

 +}

-\ No newline at end of file

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/auth.go cascade-kubernetes/pkg/cloudprovider/providers/cascade/auth.go

-+++ cascade-kubernetes/pkg/cloudprovider/providers/cascade/auth.go	2018-01-31 02:12:47.000000000 +0000

+diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/cascade/auth.go kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/cascade/auth.go

+--- kubernetes-original/pkg/cloudprovider/providers/cascade/auth.go	1970-01-01 00:00:00.000000000 +0000

 @@ -0,0 +1,145 @@

 +package cascade

 +

@@ -928,7 +1126,7 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +

 +func buildOIDCClient(authEndpoint string) (*OIDCClient, error) {

 +	options := &OIDCClientOptions{

-+		IgnoreCertificate: true,

++		IgnoreCertificate: false,

 +		RootCAs:           nil,

 +		TokenScope:        tScope,

 +	}

@@ -976,9 +1174,9 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	return pwd, nil

 +}

 \ No newline at end of file

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/BUILD cascade-kubernetes/pkg/cloudprovider/providers/cascade/BUILD

-+++ cascade-kubernetes/pkg/cloudprovider/providers/cascade/BUILD	2018-01-31 02:12:47.000000000 +0000

+diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/cascade/BUILD kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/cascade/BUILD

+--- kubernetes-original/pkg/cloudprovider/providers/cascade/BUILD	1970-01-01 00:00:00.000000000 +0000

 @@ -0,0 +1,44 @@

 +package(default_visibility = ["//visibility:public"])

 +

@@ -1024,45 +1222,56 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +    srcs = [":package-srcs"],

 +    tags = ["automanaged"],

 +)

-diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/cascade_disks.go cascade-kubernetes/pkg/cloudprovider/providers/cascade/cascade_disks.go

-+++ cascade-kubernetes/pkg/cloudprovider/providers/cascade/cascade_disks.go	2018-01-31 02:12:47.000000000 +0000

-@@ -0,0 +1,197 @@

+diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/cascade/cascade_disks.go kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/cascade/cascade_disks.go

+--- kubernetes-original/pkg/cloudprovider/providers/cascade/cascade_disks.go	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,225 @@

 +package cascade

 +

 +import (

 +	"github.com/golang/glog"

 +	k8stypes "k8s.io/apimachinery/pkg/types"

-+	"k8s.io/kubernetes/pkg/volume"

 +	"k8s.io/apimachinery/pkg/util/sets"

 +	"k8s.io/kubernetes/pkg/kubelet/apis"

++	"k8s.io/kubernetes/pkg/volume"

 +)

 +

 +// Attaches given virtual disk volume to the node running kubelet.

 +func (cc *CascadeCloud) AttachDisk(diskID string, nodeName k8stypes.NodeName) (string, error) {

-+	operation := &VMDiskOperation{

-+		DiskID: StringPtr(diskID),

-+	}

-+

-+	vmID, err := cc.InstanceID(nodeName)

++	// Check if disk is already attached to that node.

++	attached, err := cc.DiskIsAttached(diskID, nodeName)

 +	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: cc.InstanceID failed for AttachDisk. Error[%v]", err)

++		glog.Errorf("Cascade Cloud Provider: cc.DiskIsAttached failed during AttachDisk. Error[%v]", err)

 +		return "", err

 +	}

 +

-+	task, err := cc.apiClient.AttachDisk(vmID, operation)

-+	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: Failed to attach disk with ID %s. Error[%v]", diskID, err)

-+		return "", err

-+	}

++	// If not already attached, attach the disk.

++	if !attached {

++		operation := &VMDiskOperation{

++			DiskID: StringPtr(diskID),

++		}

 +

-+	_, err = cc.apiClient.WaitForTask(StringVal(task.ID))

-+	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: Failed to wait for task to attach disk with ID %s. Error[%v]",

-+			diskID, err)

-+		return "", err

++		vmID, err := cc.InstanceID(nodeName)

++		if err != nil {

++			glog.Errorf("Cascade Cloud Provider: cc.InstanceID failed for AttachDisk. Error[%v]", err)

++			return "", err

++		}

++

++		task, err := cc.apiClient.AttachDisk(vmID, operation)

++		if err != nil {

++			glog.Errorf("Cascade Cloud Provider: Failed to attach disk with ID %s. Error[%v]", diskID, err)

++			return "", err

++		}

++

++		_, err = cc.apiClient.WaitForTask(StringVal(task.ID))

++		if err != nil {

++			glog.Errorf("Cascade Cloud Provider: Failed to wait for task to attach disk with ID %s. Error[%v]",

++				diskID, err)

++			return "", err

++		}

 +	}

 +

++	// Get mount device of the attached disk.

 +	disk, err := cc.apiClient.GetDisk(diskID)

 +	if err != nil {

 +		glog.Errorf("Cascade Cloud Provider: Failed to Get disk with diskID %s. Error[%v]", diskID, err)

@@ -1102,15 +1311,29 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +

 +// DiskIsAttached returns if disk is attached to the VM using controllers supported by the plugin.

 +func (cc *CascadeCloud) DiskIsAttached(diskID string, nodeName k8stypes.NodeName) (bool, error) {

-+	disk, err := cc.apiClient.GetDisk(diskID)

++	vmID, err := cc.InstanceID(nodeName)

 +	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: Failed to Get disk with diskID %s. Error[%v]", diskID, err)

++		glog.Errorf("Cascade Cloud Provider: cc.InstanceID failed for DiskIsAttached. Error[%v]", err)

 +		return false, err

 +	}

 +

-+	vmID, err := cc.InstanceID(nodeName)

++	_, err = cc.apiClient.GetVM(vmID)

 +	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: cc.InstanceID failed for DiskIsAttached. Error[%v]", err)

++		switch err.(type) {

++		case APIError:

++			if err.(APIError).ErrorCode == VMNotFoundError {

++				// If instance no longer exists, we will assume that the volume is not attached.

++				glog.Warningf("Cascade Cloud Provider: Instance %s does not exist. DiskIsAttached will assume"+

++					" disk %s is not attached to it.", nodeName, diskID)

++				return false, nil

++			}

++		}

++		return false, err

++	}

++

++	disk, err := cc.apiClient.GetDisk(diskID)

++	if err != nil {

++		glog.Errorf("Cascade Cloud Provider: Failed to Get disk with diskID %s. Error[%v]", diskID, err)

 +		return false, err

 +	}

 +

@@ -1198,6 +1421,9 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +			if err.(APIError).ErrorCode == DiskNotFoundError {

 +				return nil

 +			}

++			if err.(APIError).ErrorCode == DiskInUseError {

++				return volume.NewDeletedVolumeInUseError(err.Error())

++			}

 +		}

 +		return err

 +	}

@@ -1223,12 +1449,11 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	labels[apis.LabelZoneFailureDomain] = StringVal(disk.Zone)