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

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1alpha1.json	2018-04-30 21:11:51.000000000 +0000

+From e6e701d8663ca3dbcf298ed4a10bf5b6120ce4d3 Mon Sep 17 00:00:00 2001

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

+Date: Sat, 2 Jun 2018 16:24:59 -0700

+Subject: [PATCH] Cascade Kubernetes patches for v1.9.6 (8ef8da7)

+

+---

+ 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-apiserver/app/options/plugins.go          |   2 +

+ 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             |  25 +

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

+ pkg/cloudprovider/providers/BUILD                  |   2 +

+ pkg/cloudprovider/providers/cascade/BUILD          |  44 ++

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

+ pkg/cloudprovider/providers/cascade/apitypes.go    | 227 +++++++++

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

+ pkg/cloudprovider/providers/cascade/cascade.go     | 216 ++++++++

+ .../providers/cascade/cascade_disks.go             | 225 +++++++++

+ .../providers/cascade/cascade_instances.go         |  90 ++++

+ .../providers/cascade/cascade_loadbalancer.go      | 284 +++++++++++

+ pkg/cloudprovider/providers/cascade/client.go      | 394 +++++++++++++++

+ 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/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                | 269 ++++++++++

+ pkg/volume/cascade_disk/cascade_disk.go            | 391 +++++++++++++++

+ pkg/volume/cascade_disk/cascade_util.go            | 107 ++++

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

+ plugin/pkg/admission/vke/BUILD                     |  58 +++

+ plugin/pkg/admission/vke/admission.go              | 374 ++++++++++++++

+ plugin/pkg/admission/vke/admission_test.go         | 541 +++++++++++++++++++++

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

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

+ 45 files changed, 4623 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_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 aa3fbdc..9dba11e 100644

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

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

       "photonPersistentDisk": {

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

@@ -12,14 +87,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1alpha1.js

       }

      }

     },

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

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -33,12 +104,17 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1alpha1.js

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1beta1.json	2018-04-30 21:11:51.000000000 +0000

++      "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 e253317..6968ed0 100644

+--- a/api/swagger-spec/apps_v1beta1.json

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

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -50,14 +126,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta1.jso

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -5202,6 +5206,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."

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -71,12 +143,17 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta1.jso

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/apps_v1beta2.json	2018-04-30 21:11:51.000000000 +0000

++      "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 be42788..28d0247 100644

+--- a/api/swagger-spec/apps_v1beta2.json

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

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -88,14 +165,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta2.jso

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -7568,6 +7572,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."

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -109,13 +182,18 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/apps_v1beta2.jso

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v1beta1.json	2018-04-30 21:11:51.000000000 +0000

-@@ -1874,6 +1874,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."

++     }

++    }

++   },

+    "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 28787d8..9adba42 100644

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

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

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

       },

@@ -126,14 +204,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1beta1.js

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -2597,6 +2601,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."

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -147,13 +221,18 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1beta1.js

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v1.json	2018-04-30 21:11:51.000000000 +0000

-@@ -1819,6 +1819,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."

++     }

++    }

++   },

+    "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 bb9b870..8bab946 100644

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

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

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

       },

@@ -164,14 +243,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1.json ku

       "projected": {

        "$ref": "v1.ProjectedVolumeSource",

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

-@@ -2542,6 +2546,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."

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -185,12 +260,17 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v1.json ku

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/batch_v2alpha1.json	2018-04-30 21:11:51.000000000 +0000

++      "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 cde6619..1e428a5 100644

+--- a/api/swagger-spec/batch_v2alpha1.json

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

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -226,9 +306,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/batch_v2alpha1.j

     "v1.Container": {

      "id": "v1.Container",

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

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/extensions_v1beta1.json	2018-04-30 21:11:51.000000000 +0000

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

+index d8b20a3..ea271e1 100644

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

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

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -240,14 +321,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/extensions_v1bet

       }

      }

     },

-@@ -8210,6 +8214,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."

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -261,12 +338,17 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/extensions_v1bet

 +     },

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

-      }

-     }

-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-modified/src/k8s.io/kubernetes/api/swagger-spec/settings.k8s.io_v1alpha1.json	2018-04-30 21:11:51.000000000 +0000

++      "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 dc442a8..c1b2d1e 100644

+--- a/api/swagger-spec/settings.k8s.io_v1alpha1.json

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

       "storageos": {

        "$ref": "v1.StorageOSVolumeSource",

@@ -278,14 +360,10 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/settings.k8s.io_

       }

      }

     },

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

-+     }

-+    }

-+   },

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

+      }

+     }

+    },

 +   "v1.CascadeDiskVolumeSource": {

 +    "id": "v1.CascadeDiskVolumeSource",

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

@@ -299,12 +377,17 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/settings.k8s.io_

 +     },

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

-      }

-     }

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

-+++ kubernetes-modified/src/k8s.io/kubernetes/api/swagger-spec/v1.json	2018-04-30 21:11:51.000000000 +0000

++      "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 97be62b..e1cba2b 100644

+--- a/api/swagger-spec/v1.json

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

        "$ref": "v1.PhotonPersistentDiskVolumeSource",

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

@@ -351,10 +434,29 @@ diff -uNr --no-dereference kubernetes-original/api/swagger-spec/v1.json kubernet

       }

      }

     },

-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-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD	2018-04-30 21:11:51.000000000 +0000

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

+diff --git a/cmd/kube-apiserver/app/options/plugins.go b/cmd/kube-apiserver/app/options/plugins.go

+index a0d2502..4fe32e4 100644

+--- a/cmd/kube-apiserver/app/options/plugins.go

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

+ 	"k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny"

+ 	"k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"

+ 	"k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"

++	"k8s.io/kubernetes/plugin/pkg/admission/vke"

+ )

+ 

+ // RegisterAllAdmissionPlugins registers all admission plugins

+@@ -83,4 +84,5 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) {

+ 	setdefault.Register(plugins)

+ 	resize.Register(plugins)

+ 	pvcprotection.Register(plugins)

++	vke.Register(plugins)

+ }

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

+index c518b36..f1a91f6 100644

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

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

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

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

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

@@ -362,10 +464,11 @@ diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/B

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

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

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

-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-modified/src/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go	2018-04-30 21:11:51.000000000 +0000

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

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

+index 170c366..5fa1cb1 100644

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

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

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

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

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

@@ -373,7 +476,7 @@ diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/p

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

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

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

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

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

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

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

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

@@ -381,7 +484,7 @@ diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/p

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

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

  	}

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

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

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

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

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

@@ -389,7 +492,7 @@ diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/p

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

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

  	}

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

+@@ -165,6 +168,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen

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

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

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

@@ -397,10 +500,11 @@ diff -uNr --no-dereference kubernetes-original/cmd/kube-controller-manager/app/p

  	return allPlugins

  }

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

-+++ kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/app/BUILD	2018-04-30 21:11:51.000000000 +0000

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

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

+index c7e482f..0d3645a 100644

+--- a/cmd/kubelet/app/BUILD

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

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

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

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

@@ -408,10 +512,11 @@ diff -uNr --no-dereference kubernetes-original/cmd/kubelet/app/BUILD kubernetes-

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

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

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

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

-+++ kubernetes-modified/src/k8s.io/kubernetes/cmd/kubelet/app/plugins.go	2018-04-30 21:11:51.000000000 +0000

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

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

+index ef41bb8..c9806f7 100644

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

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

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

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

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

@@ -419,7 +524,7 @@ diff -uNr --no-dereference kubernetes-original/cmd/kubelet/app/plugins.go kubern

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

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

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

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

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

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

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

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

@@ -427,259 +532,11 @@ diff -uNr --no-dereference kubernetes-original/cmd/kubelet/app/plugins.go kubern

  	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-modified/src/k8s.io/kubernetes/.idea/kubernetes.iml	2018-04-30 21:11:51.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-modified/src/k8s.io/kubernetes/.idea/modules.xml	2018-04-30 21:11:51.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-modified/src/k8s.io/kubernetes/.idea/workspace.xml	2018-04-30 21:11:51.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-modified/src/k8s.io/kubernetes/pkg/apis/core/types.go	2018-04-30 21:11:51.000000000 +0000

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

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

+index b6b570b..1d9db5e 100644

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

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

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

  	// +optional

  	StorageOS *StorageOSVolumeSource

@@ -688,7 +545,7 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/types.go kubernetes

  }

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

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

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

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

  	// +optional

  	CSI *CSIPersistentVolumeSource

@@ -697,7 +554,7 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/types.go kubernetes

  }

  type PersistentVolumeClaimVolumeSource struct {

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

+@@ -1471,6 +1475,16 @@ type StorageOSPersistentVolumeSource struct {

  	SecretRef *ObjectReference

  }

@@ -714,10 +571,11 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/types.go 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-original/pkg/apis/core/validation/validation.go kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/validation/validation.go

-+++ kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/core/validation/validation.go	2018-04-30 21:11:51.000000000 +0000

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

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

+index f6ab55f..2fa447d 100644

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

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

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

  		}

  	}

@@ -732,7 +590,7 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/validation/validati

  	if numVolumes == 0 {

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

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

+@@ -1440,6 +1448,14 @@ func validateCSIPersistentVolumeSource(csi *core.CSIPersistentVolumeSource, fldP

  	return allErrs

  }

@@ -747,7 +605,7 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/validation/validati

  // ValidatePersistentVolumeName checks that a name is appropriate for a

  // PersistentVolumeName object.

  var ValidatePersistentVolumeName = NameIsDNSSubdomain

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

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

  		}

  	}

@@ -763,10 +621,11 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/core/validation/validati

  	if numVolumes == 0 {

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

  	}

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

-+++ kubernetes-modified/src/k8s.io/kubernetes/pkg/apis/extensions/types.go	2018-04-30 21:11:51.000000000 +0000

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

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

+index e369728..a5406ab 100644

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

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

  	PortworxVolume        FSType = "portworxVolume"

  	ScaleIO               FSType = "scaleIO"

  	CSI                   FSType = "csi"

@@ -774,10 +633,11 @@ diff -uNr --no-dereference kubernetes-original/pkg/apis/extensions/types.go kube

  	All                   FSType = "*"

  )

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

-+++ kubernetes-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/BUILD	2018-04-30 21:11:51.000000000 +0000

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

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

+index aeccfa1..4313576 100644

+--- a/pkg/cloudprovider/providers/BUILD

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

      deps = [

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

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

@@ -785,7 +645,7 @@ diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/BUILD

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

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

          ":package-srcs",

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

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

@@ -793,9 +653,70 @@ diff -uNr --no-dereference kubernetes-original/pkg/cloudprovider/providers/BUILD

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

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

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

-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-modified/src/k8s.io/kubernetes/pkg/cloudprovider/providers/cascade/apitypes.go	2018-04-30 21:11:51.000000000 +0000

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

+new file mode 100644

+index 0000000..1ff2ad1

+--- /dev/null

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

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

++    ],

++)

++

++filegroup(

++    name = "package-srcs",

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

++    tags = ["automanaged"],

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

++)

++

++filegroup(

++    name = "all-srcs",

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

++    tags = ["automanaged"],