@@ -1,13 +1,13 @@

 Summary:        Calico networking for CNI

 Name:           calico-cni

-Version:        1.11.0

-Release:        2%{?dist}

+Version:        1.11.2

+Release:        1%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/projectcalico/cni-plugin

 Source0:        %{name}-%{version}.tar.gz

-%define sha1 calico-cni=0fee124daa5e3a5f72e9af28ca1df61e6c2443c3

+%define sha1 calico-cni=c12ce655eb5b1cd42c3976d6bf4ac3ebcbc4dc86

 Source1:        %{name}-vendor-cache-%{version}.tar.gz

-%define sha1 calico-cni-vendor-cache=8683bb5598d807c8c1c85e0cd13944ac09f6f450

+%define sha1 calico-cni-vendor-cache=7c64de41b90cc74231090441ff359936689737df

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -59,6 +59,8 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/

 /usr/share/calico-cni/k8s/calico.conf.default

 %changelog

+*   Tue Mar 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.11.2-1

+-   calico-cni v1.11.2.

 *   Thu Dec 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-2

 -   Cache build dependencies in our repo.

 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-1

@@ -1,11 +1,11 @@

 Summary:        Calico node and documentation for project calico.

 Name:           calico

-Version:        2.6.3

+Version:        2.6.7

 Release:        1%{?dist}

 License:        Apache-2.0

 URL:            https://github.com/projectcalico/calico

 Source0:        %{name}-%{version}.tar.gz

-%define sha1 calico=6cc983c49618c95fbe6b3d63d6f45725df577c7c

+%define sha1 calico=d74b2103f84ed470322b5f33b75cf552db93d830

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -50,6 +50,8 @@ sed -i 's/. startup.env/source \/startup.env/g' %{buildroot}/usr/share/calico/do

 /usr/share/calico/docker/fs/*

 %changelog

+*   Tue Mar 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 2.6.7-1

+-   Calico Node v2.6.7.

 *   Tue Dec 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.3-1

 -   Calico Node v2.6.3.

 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.2-1

@@ -1,11 +1,11 @@

 Summary:        Kubernetes Dashboard UI

 Name:           kubernetes-dashboard

-Version:        1.6.3

+Version:        1.8.3

 Release:        1%{?dist}

 License:        Apache-2.0

 URL:            https://github.com/kubernetes/dashboard

 Source0:        %{name}-v%{version}.tar.gz

-%define sha1    kubernetes-dashboard=8e06cb5cd145ffa5c691c3af5fc6e49caececfb2

+%define sha1    kubernetes-dashboard=4003c4a6d3ef311fe72ac81fa7b1b92b7d6cc04e

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -15,7 +15,6 @@ BuildRequires:  glibc-devel

 BuildRequires:  go

 BuildRequires:  linux-api-headers

 BuildRequires:  nodejs

-BuildRequires:  nodejs

 BuildRequires:  openjre8

 BuildRequires:  which

 Requires:       nodejs

@@ -29,9 +28,12 @@ Kubernetes Dashboard UI.

 %build

 export PATH=${PATH}:/usr/bin

-npm install

-npm install babel-loader@7.1.1

-./build/postinstall.sh

+mkdir vendor/src

+cd vendor

+cp -rf {github.com/,golang.org/,gopkg.in/,k8s.io/} src/

+cd ../

+#Remove the lines which strips the debuginfo. 

+sed -i '/https:\/\/golang.org\/cmd\/link\//,+2d' ./build/backend.js

 ./node_modules/.bin/gulp build

 %install

@@ -53,6 +55,8 @@ cp -p -r ./src/deploy/Dockerfile %{buildroot}/opt/k8dashboard/

 /opt/k8dashboard/public/*

 %changelog

+*    Tue Mar 13 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.8.3-1

+-    kubernetes-dashboard 1.8.3.

 *    Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.6.3-1

 -    kubernetes-dashboard 1.6.3.

 *    Fri Jul 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.6.1-1

@@ -1,11 +1,11 @@

 Summary:        Kubernetes DNS

 Name:           kubernetes-dns

-Version:        1.14.6

-Release:        2%{?dist}

+Version:        1.14.8

+Release:        1%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/kubernetes/dns/archive/%{version}.tar.gz

 Source0:        kubernetes-dns-%{version}.tar.gz

-%define sha1    kubernetes-dns-%{version}.tar.gz=456f28dcb52d5338ce076d62051e33b827172b2a

+%define sha1    kubernetes-dns-%{version}.tar.gz=cad22fbc8499901262dfea3da504eabb7f616129

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -64,6 +64,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/sidecar-e2e

 %changelog

+*   Tue Mar 13 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.14.8-1

+-   kubernetes-dns 1.14.8.

 *   Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-2

 -   Remove go testing framework binary.

 *   Mon Oct 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-1

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

-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

+Binary files kubernetes-original/api/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/api/._.DS_Store differ

+Binary files kubernetes-original/api/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/api/.DS_Store differ

+diff --no-dereference -uNr 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 +38,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 --no-dereference -uNr 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 +52,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 +76,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 --no-dereference -uNr 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 +90,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 +114,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 --no-dereference -uNr 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 +128,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 +152,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 --no-dereference -uNr 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 +166,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 +190,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 --no-dereference -uNr 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 +204,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 +228,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 --no-dereference -uNr 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 +242,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 +266,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 --no-dereference -uNr 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 +280,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 +304,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 --no-dereference -uNr 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 +318,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 +342,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 +353,60 @@ 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 @@

+Binary files kubernetes-original/cmd/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/._.DS_Store differ

+Binary files kubernetes-original/cmd/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/.DS_Store differ

+diff --no-dereference -uNr 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 --no-dereference -uNr 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

+ }

+Binary files kubernetes-original/cmd/kube-controller-manager/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/._.DS_Store differ

+Binary files kubernetes-original/cmd/kube-controller-manager/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/.DS_Store differ

+diff --no-dereference -uNr 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 +414,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 --no-dereference -uNr 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 +425,23 @@ 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()...)

+ 	}

+Binary files kubernetes-original/cmd/kubelet/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/._.DS_Store differ

+Binary files kubernetes-original/cmd/kubelet/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/.DS_Store differ

+Binary files kubernetes-original/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/._.DS_Store differ

+Binary files kubernetes-original/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/.DS_Store differ

+Binary files kubernetes-original/pkg/apis/core/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/._.DS_Store differ

+Binary files kubernetes-original/pkg/apis/core/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/.DS_Store differ

+diff --no-dereference -uNr 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 +451,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 +477,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 --no-dereference -uNr 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 +495,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 +510,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 +522,29 @@ 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"

+ 	}

+Binary files kubernetes-original/pkg/apis/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/._.DS_Store differ

+Binary files kubernetes-original/pkg/apis/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/.DS_Store differ

+diff --no-dereference -uNr 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 @@

+Binary files kubernetes-original/pkg/cloudprovider/._.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/._.DS_Store differ

+Binary files kubernetes-original/pkg/cloudprovider/.DS_Store and kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/.DS_Store differ

+diff --no-dereference -uNr 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 +560,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 --no-dereference -uNr 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 +728,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 +761,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 +791,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 --no-dereference -uNr 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

 +

@@ -976,9 +941,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 --no-dereference -uNr 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 +989,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 --no-dereference -uNr 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 +1078,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 +1188,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 +1216,11 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

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

 +	labels[apis.LabelZoneRegion] = cc.cfg.Global.Region

 +

-+	return labels,nil

++	return labels, nil

 +}

-\ No newline at end of file

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

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

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

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

 @@ -0,0 +1,216 @@

 +// The use of Cascade cloud provider requires the kubelet, kube-apiserver, and kube-controller-manager to be started

 +// with config flag: '--cloud-provider=cascade --cloud-config=[path_to_config_file]'.

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

 +	return true

 +}

 \ No newline at end of file

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

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

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

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

 @@ -0,0 +1,90 @@

 +package cascade

 +

@@ -1541,10 +1533,10 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

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

 +	return "", nil

 +}

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

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

-@@ -0,0 +1,283 @@

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

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

+@@ -0,0 +1,284 @@

 +package cascade

 +

 +import (

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

 +		Type:        StringPtr("PUBLIC"),

 +		PortMaps:    portMaps,

 +		HealthCheck: healthCheck,

++		SubDomain:   StringPtr(k8sService.Name),

 +	}

 +	logger.Infof("Load balancer create spec: %+v", *createSpec)

 +

@@ -1829,22 +1822,22 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	glog.Infoln(l.getLogMsg(msgTemplate, args))

 +}

 \ No newline at end of file

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

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

-@@ -0,0 +1,382 @@

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

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

+@@ -0,0 +1,394 @@

 +package cascade

 +

 +import (

++	"bytes"

 +	"crypto/tls"

 +	"crypto/x509"

 +	"encoding/json"

 +	"fmt"

++	"github.com/golang/glog"

 +	"net/http"

 +	"strings"

 +	"time"

-+	"bytes"

-+	"github.com/golang/glog"

 +)

 +

 +// Represents stateless context needed to call Cascade APIs.

@@ -1891,10 +1884,6 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	// nil by default.

 +	RootCAs *x509.CertPool

 +

-+	// For tasks APIs, defines the delay between each polling attempt.

-+	// Default is 100 milliseconds.

-+	TaskPollDelay time.Duration

-+

 +	// For tasks APIs, defines the number of retries to make in the event

 +	// of an error. Default is 3.

 +	TaskRetryCount int

@@ -1903,6 +1892,8 @@ diff -uNr --no-dereference kubernetes-1.8.1/pkg/cloudprovider/providers/cascade/

 +	TokenOptions *TokenOptions

 +}

 +

++const minimumTaskPollDelay = 500 * time.Millisecond

++

 +// Creates a new Cascade client which can be used to make API calls to Cascade.

 +func NewClient(cfg *CascadeConfig, authClient *AuthClient) (c *Client, err error) {

 +	tokenOptions, err := authClient.GetTokensByMachineAccount()

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

 +

 +	options := &ClientOptions{

 +		TaskPollTimeout:   30 * time.Minute,

-+		TaskPollDelay:     100 * time.Millisecond,

 +		TaskRetryCount:    3,

 +		TokenOptions:      tokenOptions,

 +		IgnoreCertificate: false,

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

 +		UpdateAccessTokenCallback: tokenCallback,

 +	}

 +

-+	clientConfig := &ClientConfig {

++	clientConfig := &ClientConfig{

 +		tenantName: cfg.Global.TenantName,

 +		clusterID:  cfg.Global.ClusterID,

 +		region:     cfg.Global.Region,

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

 +		restClient: restClient,

 +		// Ensure a copy of options is made, rather than using a pointer

 +		// which may change out from underneath if misused by the caller.

-+		options:    *options,

++		options: *options,

 +	}

 +

 +	return

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