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

-From a9402d16a92e04e25ede3816872855e9a89fb812 Mon Sep 17 00:00:00 2001

-From: Bo Gan <ganb@vmware.com>

-Date: Sun, 10 Jun 2018 02:13:51 -0700

-Subject: [PATCH] Cascade Kubernetes patches for v1.10.2 (1f4aedb)

-

- api/swagger-spec/apps_v1alpha1.json                |  21 +

- api/swagger-spec/apps_v1beta1.json                 |  21 +

- api/swagger-spec/apps_v1beta2.json                 |  21 +

- api/swagger-spec/batch_v1.json                     |  21 +

- api/swagger-spec/batch_v1beta1.json                |  21 +

- api/swagger-spec/batch_v2alpha1.json               |  21 +

- api/swagger-spec/extensions_v1beta1.json           |  21 +

- api/swagger-spec/settings.k8s.io_v1alpha1.json     |  21 +

- api/swagger-spec/v1.json                           |  25 +

- cmd/kube-controller-manager/app/BUILD              |   1 +

- cmd/kube-controller-manager/app/plugins.go         |   4 +

- cmd/kubelet/app/BUILD                              |   1 +

- cmd/kubelet/app/plugins.go                         |   2 +

- pkg/apis/core/types.go                             |  14 +

- pkg/apis/core/validation/validation.go             |  29 +-

- pkg/apis/extensions/types.go                       |   1 +

- pkg/cloudprovider/providers/BUILD                  |   2 +

- pkg/cloudprovider/providers/cascade/BUILD          |  56 ++

- pkg/cloudprovider/providers/cascade/OWNERS         |   3 +

- pkg/cloudprovider/providers/cascade/apitypes.go    | 229 ++++++

- pkg/cloudprovider/providers/cascade/auth.go        | 145 ++++

- pkg/cloudprovider/providers/cascade/cascade.go     | 214 +++++

- .../providers/cascade/cascade_disks.go             | 227 ++++++

- .../providers/cascade/cascade_instances.go         |  92 +++

- .../providers/cascade/cascade_instances_test.go    |  44 +

- .../providers/cascade/cascade_loadbalancer.go      | 285 +++++++

- pkg/cloudprovider/providers/cascade/client.go      | 399 ++++++++++

- pkg/cloudprovider/providers/cascade/oidcclient.go  | 297 +++++++

- pkg/cloudprovider/providers/cascade/restclient.go  | 262 ++++++

- pkg/cloudprovider/providers/cascade/tests_owed     |   5 +

- pkg/cloudprovider/providers/cascade/utils.go       |  25 +

- pkg/cloudprovider/providers/providers.go           |   1 +

- pkg/kubeapiserver/options/plugins.go               |   3 +

- pkg/printers/internalversion/describe.go           |  11 +

- pkg/security/podsecuritypolicy/util/util.go        |   3 +

- pkg/volume/cascade_disk/BUILD                      |  43 +

- pkg/volume/cascade_disk/OWNERS                     |   2 +

- pkg/volume/cascade_disk/attacher.go                | 264 ++++++

- pkg/volume/cascade_disk/cascade_disk.go            | 390 +++++++++

- pkg/volume/cascade_disk/cascade_util.go            | 152 ++++

- .../admission/persistentvolume/label/admission.go  |  54 ++

- plugin/pkg/admission/vke/BUILD                     |  60 ++

- plugin/pkg/admission/vke/admission.go              | 554 +++++++++++++

- plugin/pkg/admission/vke/admission_test.go         | 882 +++++++++++++++++++++

- staging/src/k8s.io/api/core/v1/generated.pb.go     | 310 +++++++-

- staging/src/k8s.io/api/core/v1/types.go            |  24 +-

- 46 files changed, 5254 insertions(+), 29 deletions(-)

- create mode 100644 pkg/cloudprovider/providers/cascade/BUILD

- create mode 100644 pkg/cloudprovider/providers/cascade/OWNERS

- create mode 100644 pkg/cloudprovider/providers/cascade/apitypes.go

- create mode 100644 pkg/cloudprovider/providers/cascade/auth.go

- create mode 100644 pkg/cloudprovider/providers/cascade/cascade.go

- create mode 100644 pkg/cloudprovider/providers/cascade/cascade_disks.go

- create mode 100644 pkg/cloudprovider/providers/cascade/cascade_instances.go

- create mode 100644 pkg/cloudprovider/providers/cascade/cascade_instances_test.go

- create mode 100644 pkg/cloudprovider/providers/cascade/cascade_loadbalancer.go

- create mode 100644 pkg/cloudprovider/providers/cascade/client.go

- create mode 100644 pkg/cloudprovider/providers/cascade/oidcclient.go

- create mode 100644 pkg/cloudprovider/providers/cascade/restclient.go

- create mode 100644 pkg/cloudprovider/providers/cascade/tests_owed

- create mode 100644 pkg/cloudprovider/providers/cascade/utils.go

- create mode 100644 pkg/volume/cascade_disk/BUILD

- create mode 100644 pkg/volume/cascade_disk/OWNERS

- create mode 100644 pkg/volume/cascade_disk/attacher.go

- create mode 100644 pkg/volume/cascade_disk/cascade_disk.go

- create mode 100644 pkg/volume/cascade_disk/cascade_util.go

- create mode 100644 plugin/pkg/admission/vke/BUILD

- create mode 100644 plugin/pkg/admission/vke/admission.go

- create mode 100644 plugin/pkg/admission/vke/admission_test.go

-

-diff --git a/api/swagger-spec/apps_v1alpha1.json b/api/swagger-spec/apps_v1alpha1.json

-index 6f54662..0ce6f3f 100644

-+++ b/api/swagger-spec/apps_v1alpha1.json

+diff -duNr --no-dereference kubernetes-old/api/swagger-spec/apps_v1alpha1.json kubernetes/api/swagger-spec/apps_v1alpha1.json

+--- kubernetes-old/api/swagger-spec/apps_v1alpha1.json	2018-04-26 05:17:57.000000000 -0700

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

       "photonPersistentDisk": {

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

@@ -89,10 +12,14 @@ index 6f54662..0ce6f3f 100644

       }

      }

     },

-@@ -2109,6 +2113,23 @@

-      }

-     }

-    },

+@@ -2105,6 +2109,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -106,17 +33,12 @@ index 6f54662..0ce6f3f 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.Container": {

-     "id": "v1.Container",

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

-diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json

-index a4b090a..6fc1e0a 100644

-+++ b/api/swagger-spec/apps_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 -duNr --no-dereference kubernetes-old/api/swagger-spec/apps_v1beta1.json kubernetes/api/swagger-spec/apps_v1beta1.json

+--- kubernetes-old/api/swagger-spec/apps_v1beta1.json	2018-04-26 05:17:57.000000000 -0700

 @@ -4483,6 +4483,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -128,10 +50,14 @@ index a4b090a..6fc1e0a 100644

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -5210,6 +5214,23 @@

-      }

-     }

-    },

+@@ -5206,6 +5210,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -145,17 +71,12 @@ index a4b090a..6fc1e0a 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/apps_v1beta2.json b/api/swagger-spec/apps_v1beta2.json

-index b1fcb48..3193163 100644

-+++ b/api/swagger-spec/apps_v1beta2.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 -duNr --no-dereference kubernetes-old/api/swagger-spec/apps_v1beta2.json kubernetes/api/swagger-spec/apps_v1beta2.json

+--- kubernetes-old/api/swagger-spec/apps_v1beta2.json	2018-04-26 05:17:57.000000000 -0700

 @@ -6849,6 +6849,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -167,10 +88,14 @@ index b1fcb48..3193163 100644

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -7576,6 +7580,23 @@

-      }

-     }

-    },

+@@ -7572,6 +7576,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -184,18 +109,13 @@ index b1fcb48..3193163 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json

-index b6d6cea..a6f3aae 100644

-+++ b/api/swagger-spec/batch_v1.json

-@@ -1823,6 +1823,10 @@

+       "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 -duNr --no-dereference kubernetes-old/api/swagger-spec/batch_v1beta1.json kubernetes/api/swagger-spec/batch_v1beta1.json

+--- kubernetes-old/api/swagger-spec/batch_v1beta1.json	2018-04-26 05:17:57.000000000 -0700

+@@ -1878,6 +1878,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

       },

@@ -206,10 +126,14 @@ index b6d6cea..a6f3aae 100644

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -2550,6 +2554,23 @@

-      }

-     }

-    },

+@@ -2601,6 +2605,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -223,18 +147,13 @@ index b6d6cea..a6f3aae 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/batch_v1beta1.json b/api/swagger-spec/batch_v1beta1.json

-index 32cdfc0..9aa9744 100644

-+++ b/api/swagger-spec/batch_v1beta1.json

-@@ -1878,6 +1878,10 @@

+       "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 -duNr --no-dereference kubernetes-old/api/swagger-spec/batch_v1.json kubernetes/api/swagger-spec/batch_v1.json

+--- kubernetes-old/api/swagger-spec/batch_v1.json	2018-04-26 05:17:57.000000000 -0700

+@@ -1823,6 +1823,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

       },

@@ -245,10 +164,14 @@ index 32cdfc0..9aa9744 100644

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -2605,6 +2609,23 @@

-      }

-     }

-    },

+@@ -2546,6 +2550,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -262,17 +185,12 @@ index 32cdfc0..9aa9744 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json

-index 57acdbb..c8a6ff3 100644

-+++ b/api/swagger-spec/batch_v2alpha1.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 -duNr --no-dereference kubernetes-old/api/swagger-spec/batch_v2alpha1.json kubernetes/api/swagger-spec/batch_v2alpha1.json

+--- kubernetes-old/api/swagger-spec/batch_v2alpha1.json	2018-04-26 05:17:57.000000000 -0700

 @@ -1893,6 +1893,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -308,10 +226,9 @@ index 57acdbb..c8a6ff3 100644

     "v1.Container": {

      "id": "v1.Container",

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

-diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json

-index 6d2e049..66b6632 100644

-+++ b/api/swagger-spec/extensions_v1beta1.json

+diff -duNr --no-dereference kubernetes-old/api/swagger-spec/extensions_v1beta1.json kubernetes/api/swagger-spec/extensions_v1beta1.json

+--- kubernetes-old/api/swagger-spec/extensions_v1beta1.json	2018-04-26 05:17:57.000000000 -0700

 @@ -7506,6 +7506,10 @@

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -323,10 +240,14 @@ index 6d2e049..66b6632 100644

       }

      }

     },

-@@ -8218,6 +8222,23 @@

-      }

-     }

-    },

+@@ -8214,6 +8218,23 @@

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -340,17 +261,12 @@ index 6d2e049..66b6632 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/settings.k8s.io_v1alpha1.json b/api/swagger-spec/settings.k8s.io_v1alpha1.json

-index d4427ba..6ad2a97 100644

-+++ b/api/swagger-spec/settings.k8s.io_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 -duNr --no-dereference kubernetes-old/api/swagger-spec/settings.k8s.io_v1alpha1.json kubernetes/api/swagger-spec/settings.k8s.io_v1alpha1.json

+--- kubernetes-old/api/swagger-spec/settings.k8s.io_v1alpha1.json	2018-04-26 05:17:57.000000000 -0700

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

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -362,10 +278,14 @@ index d4427ba..6ad2a97 100644

       }

      }

     },

-@@ -2350,6 +2354,23 @@

-      }

-     }

-    },

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

+      },

+      "fsType": {

+       "type": "string",

++      "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."

++     }

++    }

++   },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -379,17 +299,12 @@ index d4427ba..6ad2a97 100644

 +     },

 +     "fsType": {

 +      "type": "string",

-+      "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."

-+     }

-+    }

-+   },

-    "v1.ProjectedVolumeSource": {

-     "id": "v1.ProjectedVolumeSource",

-     "description": "Represents a projected volume source",

-diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json

-index 3f1198e..dbd57f0 100644

-+++ b/api/swagger-spec/v1.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 -duNr --no-dereference kubernetes-old/api/swagger-spec/v1.json kubernetes/api/swagger-spec/v1.json

+--- kubernetes-old/api/swagger-spec/v1.json	2018-04-26 05:17:57.000000000 -0700

 @@ -19310,6 +19310,10 @@

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -436,11 +351,10 @@ index 3f1198e..dbd57f0 100644

       }

      }

     },

-diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD

-index a3f98b1..3410214 100644

-+++ b/cmd/kube-controller-manager/app/BUILD

-@@ -88,6 +88,7 @@ go_library(

+diff -duNr --no-dereference kubernetes-old/cmd/kube-controller-manager/app/BUILD kubernetes/cmd/kube-controller-manager/app/BUILD

+--- kubernetes-old/cmd/kube-controller-manager/app/BUILD	2018-04-26 05:17:57.000000000 -0700

+@@ -88,6 +88,7 @@

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

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

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

@@ -448,11 +362,10 @@ index a3f98b1..3410214 100644

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

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

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

-diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go

-index 42034d5..e729785 100644

-+++ b/cmd/kube-controller-manager/app/plugins.go

-@@ -34,6 +34,7 @@ import (

+diff -duNr --no-dereference kubernetes-old/cmd/kube-controller-manager/app/plugins.go kubernetes/cmd/kube-controller-manager/app/plugins.go

+--- kubernetes-old/cmd/kube-controller-manager/app/plugins.go	2018-04-26 05:17:57.000000000 -0700

+@@ -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"

@@ -460,7 +373,7 @@ index 42034d5..e729785 100644

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

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

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

-@@ -77,6 +78,7 @@ func ProbeAttachableVolumePlugins() []volume.VolumePlugin {

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

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

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

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

@@ -468,7 +381,7 @@ index 42034d5..e729785 100644

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

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

  	}

-@@ -107,6 +109,7 @@ func ProbeExpandableVolumePlugins(config componentconfig.VolumeConfiguration) []

+@@ -107,6 +109,7 @@

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

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

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

@@ -476,7 +389,7 @@ index 42034d5..e729785 100644

  	return allPlugins

  }

-@@ -163,6 +166,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen

+@@ -163,6 +166,7 @@

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

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

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

@@ -484,11 +397,10 @@ index 42034d5..e729785 100644

  	return allPlugins

  }

-diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD

-index cbfb90f..6264d0c 100644

-+++ b/cmd/kubelet/app/BUILD

-@@ -117,6 +117,7 @@ go_library(

+diff -duNr --no-dereference kubernetes-old/cmd/kubelet/app/BUILD kubernetes/cmd/kubelet/app/BUILD

+--- kubernetes-old/cmd/kubelet/app/BUILD	2018-04-26 05:17:57.000000000 -0700

+@@ -117,6 +117,7 @@

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

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

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

@@ -496,11 +408,10 @@ index cbfb90f..6264d0c 100644

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

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

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

-diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go

-index ef41bb8..c9806f7 100644

-+++ b/cmd/kubelet/app/plugins.go

-@@ -32,6 +32,7 @@ import (

+diff -duNr --no-dereference kubernetes-old/cmd/kubelet/app/plugins.go kubernetes/cmd/kubelet/app/plugins.go

+--- kubernetes-old/cmd/kubelet/app/plugins.go	2018-04-26 05:17:57.000000000 -0700

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

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

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

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

@@ -508,7 +419,7 @@ index ef41bb8..c9806f7 100644

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

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

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

-@@ -100,6 +101,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin {

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

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

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

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

@@ -516,11 +427,10 @@ index ef41bb8..c9806f7 100644

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

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

  	}

-diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go

-index 8b183de..cfe4c85 100644

-+++ b/pkg/apis/core/types.go

-@@ -316,6 +316,8 @@ type VolumeSource struct {

+diff -duNr --no-dereference kubernetes-old/pkg/apis/core/types.go kubernetes/pkg/apis/core/types.go

+--- kubernetes-old/pkg/apis/core/types.go	2018-04-26 05:17:57.000000000 -0700

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

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

  	// +optional

  	StorageOS *StorageOSVolumeSource

@@ -529,7 +439,7 @@ index 8b183de..cfe4c85 100644

  }

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

-@@ -394,6 +396,8 @@ type PersistentVolumeSource struct {

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

  	// CSI (Container Storage Interface) represents storage that handled by an external CSI driver (Beta feature).

  	// +optional

  	CSI *CSIPersistentVolumeSource

@@ -538,7 +448,7 @@ index 8b183de..cfe4c85 100644

  }

  type PersistentVolumeClaimVolumeSource struct {

-@@ -1510,6 +1514,16 @@ type StorageOSPersistentVolumeSource struct {

+@@ -1510,6 +1514,16 @@

  	SecretRef *ObjectReference

  }

@@ -555,11 +465,10 @@ index 8b183de..cfe4c85 100644

  // Adapts a ConfigMap into a volume.

  //

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

-diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go

-index b66fd6f..7f0e6bd 100644

-+++ b/pkg/apis/core/validation/validation.go

-@@ -664,6 +664,14 @@ func validateVolumeSource(source *core.VolumeSource, fldPath *field.Path, volNam

+diff -duNr --no-dereference kubernetes-old/pkg/apis/core/validation/validation.go kubernetes/pkg/apis/core/validation/validation.go

+--- kubernetes-old/pkg/apis/core/validation/validation.go	2018-04-26 05:17:57.000000000 -0700

+@@ -664,6 +664,14 @@

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

  		}

  	}

@@ -574,7 +483,7 @@ index b66fd6f..7f0e6bd 100644

  	if numVolumes == 0 {

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

-@@ -1494,6 +1502,14 @@ func validateCSIPersistentVolumeSource(csi *core.CSIPersistentVolumeSource, fldP

+@@ -1494,6 +1502,14 @@

  	return allErrs

  }

@@ -589,7 +498,7 @@ index b66fd6f..7f0e6bd 100644

  // ValidatePersistentVolumeName checks that a name is appropriate for a

  // PersistentVolumeName object.

  var ValidatePersistentVolumeName = NameIsDNSSubdomain

-@@ -1737,6 +1753,15 @@ func ValidatePersistentVolume(pv *core.PersistentVolume) field.ErrorList {

+@@ -1737,6 +1753,15 @@

  		}

  	}

@@ -605,7 +514,7 @@ index b66fd6f..7f0e6bd 100644

  	if numVolumes == 0 {

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

  	}

-@@ -4370,7 +4395,7 @@ func ValidateSecret(secret *core.Secret) field.ErrorList {

+@@ -4370,7 +4395,7 @@

  			allErrs = append(allErrs, field.Required(field.NewPath("metadata", "annotations").Key(core.ServiceAccountNameKey), ""))

  		}

  	case core.SecretTypeOpaque, "":

@@ -614,7 +523,7 @@ index b66fd6f..7f0e6bd 100644

  	case core.SecretTypeDockercfg:

  		dockercfgBytes, exists := secret.Data[core.DockerConfigKey]

  		if !exists {

-@@ -4416,7 +4441,7 @@ func ValidateSecret(secret *core.Secret) field.ErrorList {

+@@ -4416,7 +4441,7 @@

  		if _, exists := secret.Data[core.TLSPrivateKeyKey]; !exists {

  			allErrs = append(allErrs, field.Required(dataPath.Key(core.TLSPrivateKeyKey), ""))

  		}

@@ -623,11 +532,10 @@ index b66fd6f..7f0e6bd 100644

  	default:

  		// no-op

  	}

-diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go

-index e369728..a5406ab 100644

-+++ b/pkg/apis/extensions/types.go

-@@ -925,6 +925,7 @@ var (

+diff -duNr --no-dereference kubernetes-old/pkg/apis/extensions/types.go kubernetes/pkg/apis/extensions/types.go

+--- kubernetes-old/pkg/apis/extensions/types.go	2018-04-26 05:17:57.000000000 -0700

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

  	PortworxVolume        FSType = "portworxVolume"

  	ScaleIO               FSType = "scaleIO"

  	CSI                   FSType = "csi"

@@ -635,11 +543,10 @@ index e369728..a5406ab 100644

  	All                   FSType = "*"

  )

-diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD

-index aeccfa1..4313576 100644

-+++ b/pkg/cloudprovider/providers/BUILD

-@@ -12,6 +12,7 @@ go_library(

+diff -duNr --no-dereference kubernetes-old/pkg/cloudprovider/providers/BUILD kubernetes/pkg/cloudprovider/providers/BUILD

+--- kubernetes-old/pkg/cloudprovider/providers/BUILD	2018-04-26 05:17:57.000000000 -0700

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

      deps = [

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

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

@@ -647,7 +554,7 @@ index aeccfa1..4313576 100644

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

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

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

-@@ -34,6 +35,7 @@ filegroup(

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

          ":package-srcs",

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

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

@@ -655,82 +562,9 @@ index aeccfa1..4313576 100644

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

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

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

-diff --git a/pkg/cloudprovider/providers/cascade/BUILD b/pkg/cloudprovider/providers/cascade/BUILD

-new file mode 100644

-index 0000000..4089166

-+++ b/pkg/cloudprovider/providers/cascade/BUILD

-@@ -0,0 +1,56 @@

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

-+

-+load(

-+    "@io_bazel_rules_go//go:def.bzl",

-+    "go_library",

-+)

-+

-+go_library(

-+    name = "go_default_library",

-+    srcs = [

-+        "apitypes.go",

-+        "auth.go",

-+        "cascade.go",

-+        "cascade_disks.go",

-+        "cascade_instances.go",

-+        "cascade_loadbalancer.go",

-+        "client.go",

-+        "oidcclient.go",

-+        "restclient.go",

-+        "utils.go"

-+        ],

-+    deps = [

-+        "//pkg/api/v1/helper:go_default_library",

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

-+        "//pkg/controller:go_default_library",

-+        "//vendor/github.com/golang/glog:go_default_library",

-+        "//vendor/gopkg.in/gcfg.v1:go_default_library",

-+        "//vendor/k8s.io/api/core/v1:go_default_library",

-+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",

-+    ],

-+)

-+

-+go_test(

-+    name = "go_default_test",

-+    srcs = [

-+        "cascade_instances_test.go",

-+    ],

-+    embed = [":go_default_library"],

-+    deps = [

-+        "//vendor/k8s.io/api/core/v1:go_default_library",

-+        "//vendor/github.com/stretchr/testify/assert:go_default_library",

-+    ],

-+)

-+

-+filegroup(

-+    name = "package-srcs",

-+    srcs = glob(["**"]),

-+    tags = ["automanaged"],

-+    visibility = ["//visibility:private"],

-+)

-+

-+filegroup(

-+    name = "all-srcs",

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

-+    tags = ["automanaged"],

-+)

-diff --git a/pkg/cloudprovider/providers/cascade/OWNERS b/pkg/cloudprovider/providers/cascade/OWNERS

-new file mode 100644

-index 0000000..70efc9d

-+++ b/pkg/cloudprovider/providers/cascade/OWNERS

-@@ -0,0 +1,3 @@

-+maintainers:

-+- ashokc

-+- ysheng

-diff --git a/pkg/cloudprovider/providers/cascade/apitypes.go b/pkg/cloudprovider/providers/cascade/apitypes.go

-new file mode 100644

-index 0000000..fba1b3b

-+++ b/pkg/cloudprovider/providers/cascade/apitypes.go

+diff -duNr --no-dereference kubernetes-old/pkg/cloudprovider/providers/cascade/apitypes.go kubernetes/pkg/cloudprovider/providers/cascade/apitypes.go

+--- kubernetes-old/pkg/cloudprovider/providers/cascade/apitypes.go	1969-12-31 16:00:00.000000000 -0800

 @@ -0,0 +1,229 @@

 +package cascade

 +

@@ -961,11 +795,9 @@ index 0000000..fba1b3b

 +type LoadBalancerVMUpdate struct {

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

 +}

-diff --git a/pkg/cloudprovider/providers/cascade/auth.go b/pkg/cloudprovider/providers/cascade/auth.go

-new file mode 100644

-index 0000000..fc92377

-+++ b/pkg/cloudprovider/providers/cascade/auth.go

+diff -duNr --no-dereference kubernetes-old/pkg/cloudprovider/providers/cascade/auth.go kubernetes/pkg/cloudprovider/providers/cascade/auth.go

+--- kubernetes-old/pkg/cloudprovider/providers/cascade/auth.go	1969-12-31 16:00:00.000000000 -0800

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

 +package cascade

 +

@@ -1113,231 +945,69 @@ index 0000000..fc92377

 +	return pwd, nil

 +}

 \ No newline at end of file

-diff --git a/pkg/cloudprovider/providers/cascade/cascade.go b/pkg/cloudprovider/providers/cascade/cascade.go

-new file mode 100644

-index 0000000..e7cf2fc

-+++ b/pkg/cloudprovider/providers/cascade/cascade.go

-@@ -0,0 +1,214 @@

-+// 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]'.

-+package cascade

+diff -duNr --no-dereference kubernetes-old/pkg/cloudprovider/providers/cascade/BUILD kubernetes/pkg/cloudprovider/providers/cascade/BUILD

+--- kubernetes-old/pkg/cloudprovider/providers/cascade/BUILD	1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,56 @@

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

 +

-+import (

-+	"context"

-+	"errors"

-+	"fmt"

-+	"github.com/golang/glog"

-+	"gopkg.in/gcfg.v1"

-+	"io"

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

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

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

-+	"os"

-+	"strings"

++load(

++    "@io_bazel_rules_go//go:def.bzl",

++    "go_library",

 +)

 +

-+const (

-+	ProviderName = "vke"

-+	DiskSpecKind = "persistent-disk"

-+	MasterPrefix = "master"

++go_library(

++    name = "go_default_library",

++    srcs = [

++        "apitypes.go",

++        "auth.go",

++        "cascade.go",

++        "cascade_disks.go",

++        "cascade_instances.go",

++        "cascade_loadbalancer.go",

++        "client.go",

++        "oidcclient.go",

++        "restclient.go",

++        "utils.go"

++        ],

++    deps = [

++        "//pkg/api/v1/helper:go_default_library",

++        "//pkg/cloudprovider:go_default_library",

++        "//pkg/controller:go_default_library",

++        "//vendor/github.com/golang/glog:go_default_library",

++        "//vendor/gopkg.in/gcfg.v1:go_default_library",

++        "//vendor/k8s.io/api/core/v1:go_default_library",

++        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",

++    ],

 +)

 +

-+// CascadeCloud is an implementation of the cloud provider interface for Cascade Controller.

-+type CascadeCloud struct {

-+	cfg *CascadeConfig

-+	// Authentication client to get token for Cascade API calls

-+	authClient *AuthClient

-+	// API Client to make Cascade API calls

-+	apiClient *Client

-+	// local $HOSTNAME

-+	localHostname string

-+	// hostname from K8S, could be overridden

-+	localK8sHostname string

-+}

-+

-+// CascadeCloud represents Cascade cloud provider's configuration.

-+type CascadeConfig struct {

-+	Global struct {

-+		// the Cascade Controller endpoint

-+		CloudTarget string `gcfg:"target"`

-+		// Cascade Controller tenantName name

-+		TenantName string `gcfg:"tenantName"`

-+		// Cascade Controller cluster ID

-+		ClusterID string `gcfg:"clusterID"`

-+		// Authentication server endpoint for Cascade Controller

-+		AuthEndpoint string `gcfg:"authEndpoint"`

-+		// Lightwave domain name for the node

-+		DomainName string `gcfg:"domainName"`

-+		// DNS name of the node.

-+		DNSName string `gcfg:"dnsName"`

-+		// Region in which the cluster is in

-+		Region string `gcfg:"region"`

-+		// Availability zone in which the cluster is in

-+		Zone string `gcfg:"zone"`

-+		// IP address of the node.

-+		IPAddress string `gcfg:"ipAddress"`

-+	}

-+}

-+

-+// Disks is interface for manipulation with Cascade Controller Persistent Disks.

-+type Disks interface {

-+	// AttachDisk attaches given disk to given node. Current node

-+	// is used when nodeName is empty string.

-+	AttachDisk(diskID string, nodeName k8stypes.NodeName) (string, error)

-+

-+	// DetachDisk detaches given disk to given node. Current node

-+	// is used when nodeName is empty string.

-+	DetachDisk(diskID string, nodeName k8stypes.NodeName) error

-+

-+	// DiskIsAttached checks if a disk is attached to the given node.

-+	DiskIsAttached(diskID string, nodeName k8stypes.NodeName) (bool, error)

-+

-+	// DisksAreAttached is a batch function to check if a list of disks are attached

-+	// to the node with the specified NodeName.

-+	DisksAreAttached(diskID []string, nodeName k8stypes.NodeName) (map[string]bool, error)

-+

-+	// CreateDisk creates a new PD with given properties.

-+	CreateDisk(volumeOptions *VolumeOptions) (diskID string, err error)

-+

-+	// DeleteDisk deletes PD.

-+	DeleteDisk(diskID string) error

-+

-+	// Get labels to apply to volume on creation.

-+	GetVolumeLabels(diskID string) (map[string]string, error)

-+}

-+

-+// VolumeOptions specifies capacity, tags, name and flavorID for a volume.

-+type VolumeOptions struct {

-+	CapacityGB int

-+	Tags       map[string]string

-+	Name       string

-+	Flavor     string

-+}

-+

-+func readConfig(config io.Reader) (*CascadeConfig, error) {

-+	if config == nil {

-+		err := fmt.Errorf("Cascade Cloud Provider: config file is missing. Please restart with " +

-+			"--cloud-provider=cascade --cloud-config=[path_to_config_file]")

-+		return nil, err

-+	}

-+

-+	var cfg CascadeConfig

-+	err := gcfg.ReadInto(&cfg, config)

-+	return &cfg, err

-+}

-+

-+func init() {

-+	cloudprovider.RegisterCloudProvider(ProviderName, func(config io.Reader) (cloudprovider.Interface, error) {

-+		cfg, err := readConfig(config)

-+		if err != nil {

-+			glog.Errorf("Cascade Cloud Provider: failed to read in cloud provider config file. Error[%v]", err)

-+			return nil, err

-+		}

-+		return newCascadeCloud(cfg)

-+	})

-+}

-+

-+func newCascadeCloud(cfg *CascadeConfig) (*CascadeCloud, error) {

-+	if len(cfg.Global.CloudTarget) == 0 {

-+		return nil, fmt.Errorf("Cascade Controller endpoint was not specified.")

-+	}

-+

-+	// Get local hostname

-+	hostname, err := os.Hostname()

-+	if err != nil {

-+		glog.Errorf("Cascade Cloud Provider: get hostname failed. Error[%v]", err)

-+		return nil, err

-+	}

-+

-+	cc := CascadeCloud{

-+		cfg:              cfg,

-+		localHostname:    hostname,

-+		localK8sHostname: "",

-+	}

-+

-+	// Instantiate the auth and API clients only on the master nodes. Kubelets running on the workers don't need them as

-+	// they are used primarily for making API calls to Cascade.

-+	if strings.HasPrefix(hostname, MasterPrefix) {

-+		if cc.authClient, err = NewAuthClient(cfg); err != nil {

-+			return nil, err

-+		}

-+

-+		if cc.apiClient, err = NewClient(cfg, cc.authClient); err != nil {

-+			return nil, err

-+		}

-+	}

-+

-+	return &cc, nil

-+}

-+

-+// Initialize passes a Kubernetes clientBuilder interface to the cloud provider

-+func (cc *CascadeCloud) Initialize(clientBuilder controller.ControllerClientBuilder) {}

-+

-+// Instances returns an implementation of Instances for Cascade Controller.

-+func (cc *CascadeCloud) Instances() (cloudprovider.Instances, bool) {

-+	return cc, true

-+}

-+

-+func (cc *CascadeCloud) Clusters() (cloudprovider.Clusters, bool) {

-+	return nil, true

-+}

-+

-+// ProviderName returns the cloud provider ID.

-+func (cc *CascadeCloud) ProviderName() string {

-+	return ProviderName