diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 2f0475528b..b499dccbc1 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -34276,582 +34276,6 @@
}
}
},
- "/apis/storage.k8s.io/v1/": {
- "get": {
- "description": "get available resources",
- "consumes": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "getStorageV1APIResources",
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.APIResourceList"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- }
- },
- "/apis/storage.k8s.io/v1/storageclasses": {
- "get": {
- "description": "list or watch objects of kind StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "listStorageV1StorageClass",
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "name": "fieldSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "name": "labelSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "name": "resourceVersion",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "integer",
- "description": "Timeout for the list/watch call.",
- "name": "timeoutSeconds",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "name": "watch",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClassList"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "post": {
- "description": "create a StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "createStorageV1StorageClass",
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "delete": {
- "description": "delete collection of StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "deleteStorageV1CollectionStorageClass",
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "name": "fieldSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "name": "labelSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "name": "resourceVersion",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "integer",
- "description": "Timeout for the list/watch call.",
- "name": "timeoutSeconds",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "name": "watch",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "If 'true', then the output is pretty printed.",
- "name": "pretty",
- "in": "query"
- }
- ]
- },
- "/apis/storage.k8s.io/v1/storageclasses/{name}": {
- "get": {
- "description": "read the specified StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "readStorageV1StorageClass",
- "parameters": [
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.",
- "name": "exact",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Should this value be exported. Export strips fields that a user can not specify.",
- "name": "export",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "put": {
- "description": "replace the specified StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "replaceStorageV1StorageClass",
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "delete": {
- "description": "delete a StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "deleteStorageV1StorageClass",
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.DeleteOptions"
- }
- },
- {
- "uniqueItems": true,
- "type": "integer",
- "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
- "name": "gracePeriodSeconds",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list.",
- "name": "orphanDependents",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "patch": {
- "description": "partially update the specified StorageClass",
- "consumes": [
- "application/json-patch+json",
- "application/merge-patch+json",
- "application/strategic-merge-patch+json"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "patchStorageV1StorageClass",
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "name of the StorageClass",
- "name": "name",
- "in": "path",
- "required": true
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "If 'true', then the output is pretty printed.",
- "name": "pretty",
- "in": "query"
- }
- ]
- },
- "/apis/storage.k8s.io/v1/watch/storageclasses": {
- "get": {
- "description": "watch individual changes to a list of StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "watchStorageV1StorageClassList",
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.WatchEvent"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "name": "fieldSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "name": "labelSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "If 'true', then the output is pretty printed.",
- "name": "pretty",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "name": "resourceVersion",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "integer",
- "description": "Timeout for the list/watch call.",
- "name": "timeoutSeconds",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "name": "watch",
- "in": "query"
- }
- ]
- },
- "/apis/storage.k8s.io/v1/watch/storageclasses/{name}": {
- "get": {
- "description": "watch changes to an object of kind StorageClass",
- "consumes": [
- "*/*"
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "schemes": [
- "https"
- ],
- "tags": [
- "storage_v1"
- ],
- "operationId": "watchStorageV1StorageClass",
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.WatchEvent"
- }
- },
- "401": {
- "description": "Unauthorized"
- }
- }
- },
- "parameters": [
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "name": "fieldSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "name": "labelSelector",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "name of the StorageClass",
- "name": "name",
- "in": "path",
- "required": true
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "If 'true', then the output is pretty printed.",
- "name": "pretty",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "string",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "name": "resourceVersion",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "integer",
- "description": "Timeout for the list/watch call.",
- "name": "timeoutSeconds",
- "in": "query"
- },
- {
- "uniqueItems": true,
- "type": "boolean",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "name": "watch",
- "in": "query"
- }
- ]
- },
"/apis/storage.k8s.io/v1beta1/": {
"get": {
"description": "get available resources",
@@ -44044,78 +43468,6 @@
}
}
},
- "io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass": {
- "description": "StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.\n\nStorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.",
- "required": [
- "provisioner"
- ],
- "properties": {
- "apiVersion": {
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources",
- "type": "string"
- },
- "kind": {
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
- "type": "string"
- },
- "metadata": {
- "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
- },
- "parameters": {
- "description": "Parameters holds the parameters for the provisioner that should create volumes of this storage class.",
- "type": "object",
- "additionalProperties": {
- "type": "string"
- }
- },
- "provisioner": {
- "description": "Provisioner indicates the type of the provisioner.",
- "type": "string"
- }
- },
- "x-kubernetes-group-version-kind": [
- {
- "Group": "storage.k8s.io",
- "Version": "v1",
- "Kind": "StorageClass"
- }
- ]
- },
- "io.k8s.kubernetes.pkg.apis.storage.v1.StorageClassList": {
- "description": "StorageClassList is a collection of storage classes.",
- "required": [
- "items"
- ],
- "properties": {
- "apiVersion": {
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources",
- "type": "string"
- },
- "items": {
- "description": "Items is the list of StorageClasses",
- "type": "array",
- "items": {
- "$ref": "#/definitions/io.k8s.kubernetes.pkg.apis.storage.v1.StorageClass"
- }
- },
- "kind": {
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
- "type": "string"
- },
- "metadata": {
- "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"
- }
- },
- "x-kubernetes-group-version-kind": [
- {
- "Group": "storage.k8s.io",
- "Version": "v1",
- "Kind": "StorageClassList"
- }
- ]
- },
"io.k8s.kubernetes.pkg.apis.storage.v1beta1.StorageClass": {
"description": "StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.\n\nStorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.",
"required": [
diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json
index 32292e764b..7c543669bb 100644
--- a/api/swagger-spec/resourceListing.json
+++ b/api/swagger-spec/resourceListing.json
@@ -113,10 +113,6 @@
"path": "/apis/rbac.authorization.k8s.io",
"description": "get information of a group"
},
- {
- "path": "/apis/storage.k8s.io/v1",
- "description": "API at /apis/storage.k8s.io/v1"
- },
{
"path": "/apis/storage.k8s.io/v1beta1",
"description": "API at /apis/storage.k8s.io/v1beta1"
diff --git a/api/swagger-spec/storage.k8s.io_v1.json b/api/swagger-spec/storage.k8s.io_v1.json
deleted file mode 100644
index f134eef205..0000000000
--- a/api/swagger-spec/storage.k8s.io_v1.json
+++ /dev/null
@@ -1,1004 +0,0 @@
-{
- "swaggerVersion": "1.2",
- "apiVersion": "storage.k8s.io/v1",
- "basePath": "https://10.10.10.10:6443",
- "resourcePath": "/apis/storage.k8s.io/v1",
- "info": {
- "title": "",
- "description": ""
- },
- "apis": [
- {
- "path": "/apis/storage.k8s.io/v1/storageclasses",
- "description": "API at /apis/storage.k8s.io/v1",
- "operations": [
- {
- "type": "v1.StorageClassList",
- "method": "GET",
- "summary": "list or watch objects of kind StorageClass",
- "nickname": "listStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "labelSelector",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "fieldSelector",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "watch",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "resourceVersion",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "integer",
- "paramType": "query",
- "name": "timeoutSeconds",
- "description": "Timeout for the list/watch call.",
- "required": false,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.StorageClassList"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "consumes": [
- "*/*"
- ]
- },
- {
- "type": "v1.StorageClass",
- "method": "POST",
- "summary": "create a StorageClass",
- "nickname": "createStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "v1.StorageClass",
- "paramType": "body",
- "name": "body",
- "description": "",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.StorageClass"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "*/*"
- ]
- },
- {
- "type": "v1.Status",
- "method": "DELETE",
- "summary": "delete collection of StorageClass",
- "nickname": "deletecollectionStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "labelSelector",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "fieldSelector",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "watch",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "resourceVersion",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "integer",
- "paramType": "query",
- "name": "timeoutSeconds",
- "description": "Timeout for the list/watch call.",
- "required": false,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.Status"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "*/*"
- ]
- }
- ]
- },
- {
- "path": "/apis/storage.k8s.io/v1/watch/storageclasses",
- "description": "API at /apis/storage.k8s.io/v1",
- "operations": [
- {
- "type": "v1.WatchEvent",
- "method": "GET",
- "summary": "watch individual changes to a list of StorageClass",
- "nickname": "watchStorageClassList",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "labelSelector",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "fieldSelector",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "watch",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "resourceVersion",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "integer",
- "paramType": "query",
- "name": "timeoutSeconds",
- "description": "Timeout for the list/watch call.",
- "required": false,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.WatchEvent"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "consumes": [
- "*/*"
- ]
- }
- ]
- },
- {
- "path": "/apis/storage.k8s.io/v1/storageclasses/{name}",
- "description": "API at /apis/storage.k8s.io/v1",
- "operations": [
- {
- "type": "v1.StorageClass",
- "method": "GET",
- "summary": "read the specified StorageClass",
- "nickname": "readStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "export",
- "description": "Should this value be exported. Export strips fields that a user can not specify.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "exact",
- "description": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "path",
- "name": "name",
- "description": "name of the StorageClass",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.StorageClass"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "*/*"
- ]
- },
- {
- "type": "v1.StorageClass",
- "method": "PUT",
- "summary": "replace the specified StorageClass",
- "nickname": "replaceStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "v1.StorageClass",
- "paramType": "body",
- "name": "body",
- "description": "",
- "required": true,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "path",
- "name": "name",
- "description": "name of the StorageClass",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.StorageClass"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "*/*"
- ]
- },
- {
- "type": "v1.StorageClass",
- "method": "PATCH",
- "summary": "partially update the specified StorageClass",
- "nickname": "patchStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "v1.Patch",
- "paramType": "body",
- "name": "body",
- "description": "",
- "required": true,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "path",
- "name": "name",
- "description": "name of the StorageClass",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.StorageClass"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "application/json-patch+json",
- "application/merge-patch+json",
- "application/strategic-merge-patch+json"
- ]
- },
- {
- "type": "v1.Status",
- "method": "DELETE",
- "summary": "delete a StorageClass",
- "nickname": "deleteStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "v1.DeleteOptions",
- "paramType": "body",
- "name": "body",
- "description": "",
- "required": true,
- "allowMultiple": false
- },
- {
- "type": "integer",
- "paramType": "query",
- "name": "gracePeriodSeconds",
- "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "orphanDependents",
- "description": "Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "path",
- "name": "name",
- "description": "name of the StorageClass",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.Status"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "*/*"
- ]
- }
- ]
- },
- {
- "path": "/apis/storage.k8s.io/v1/watch/storageclasses/{name}",
- "description": "API at /apis/storage.k8s.io/v1",
- "operations": [
- {
- "type": "v1.WatchEvent",
- "method": "GET",
- "summary": "watch changes to an object of kind StorageClass",
- "nickname": "watchStorageClass",
- "parameters": [
- {
- "type": "string",
- "paramType": "query",
- "name": "pretty",
- "description": "If 'true', then the output is pretty printed.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "labelSelector",
- "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "fieldSelector",
- "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "boolean",
- "paramType": "query",
- "name": "watch",
- "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "query",
- "name": "resourceVersion",
- "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it's 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "integer",
- "paramType": "query",
- "name": "timeoutSeconds",
- "description": "Timeout for the list/watch call.",
- "required": false,
- "allowMultiple": false
- },
- {
- "type": "string",
- "paramType": "path",
- "name": "name",
- "description": "name of the StorageClass",
- "required": true,
- "allowMultiple": false
- }
- ],
- "responseMessages": [
- {
- "code": 200,
- "message": "OK",
- "responseModel": "v1.WatchEvent"
- }
- ],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf",
- "application/json;stream=watch",
- "application/vnd.kubernetes.protobuf;stream=watch"
- ],
- "consumes": [
- "*/*"
- ]
- }
- ]
- },
- {
- "path": "/apis/storage.k8s.io/v1",
- "description": "API at /apis/storage.k8s.io/v1",
- "operations": [
- {
- "type": "v1.APIResourceList",
- "method": "GET",
- "summary": "get available resources",
- "nickname": "getAPIResources",
- "parameters": [],
- "produces": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ],
- "consumes": [
- "application/json",
- "application/yaml",
- "application/vnd.kubernetes.protobuf"
- ]
- }
- ]
- }
- ],
- "models": {
- "v1.StorageClassList": {
- "id": "v1.StorageClassList",
- "description": "StorageClassList is a collection of storage classes.",
- "required": [
- "items"
- ],
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "metadata": {
- "$ref": "v1.ListMeta",
- "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
- },
- "items": {
- "type": "array",
- "items": {
- "$ref": "v1.StorageClass"
- },
- "description": "Items is the list of StorageClasses"
- }
- }
- },
- "v1.ListMeta": {
- "id": "v1.ListMeta",
- "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.",
- "properties": {
- "selfLink": {
- "type": "string",
- "description": "SelfLink is a URL representing this object. Populated by the system. Read-only."
- },
- "resourceVersion": {
- "type": "string",
- "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency"
- }
- }
- },
- "v1.StorageClass": {
- "id": "v1.StorageClass",
- "description": "StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.\n\nStorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.",
- "required": [
- "provisioner"
- ],
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "metadata": {
- "$ref": "v1.ObjectMeta",
- "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
- },
- "provisioner": {
- "type": "string",
- "description": "Provisioner indicates the type of the provisioner."
- },
- "parameters": {
- "type": "object",
- "description": "Parameters holds the parameters for the provisioner that should create volumes of this storage class."
- }
- }
- },
- "v1.ObjectMeta": {
- "id": "v1.ObjectMeta",
- "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.",
- "properties": {
- "name": {
- "type": "string",
- "description": "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names"
- },
- "generateName": {
- "type": "string",
- "description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#idempotency"
- },
- "namespace": {
- "type": "string",
- "description": "Namespace defines the space within each name must be unique. An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces"
- },
- "selfLink": {
- "type": "string",
- "description": "SelfLink is a URL representing this object. Populated by the system. Read-only."
- },
- "uid": {
- "type": "string",
- "description": "UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.\n\nPopulated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids"
- },
- "resourceVersion": {
- "type": "string",
- "description": "An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.\n\nPopulated by the system. Read-only. Value must be treated as opaque by clients and . More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency"
- },
- "generation": {
- "type": "integer",
- "format": "int64",
- "description": "A sequence number representing a specific generation of the desired state. Populated by the system. Read-only."
- },
- "creationTimestamp": {
- "type": "string",
- "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
- },
- "deletionTimestamp": {
- "type": "string",
- "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
- },
- "deletionGracePeriodSeconds": {
- "type": "integer",
- "format": "int64",
- "description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only."
- },
- "labels": {
- "type": "object",
- "description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels"
- },
- "annotations": {
- "type": "object",
- "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations"
- },
- "ownerReferences": {
- "type": "array",
- "items": {
- "$ref": "v1.OwnerReference"
- },
- "description": "List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller."
- },
- "finalizers": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "description": "Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed."
- },
- "clusterName": {
- "type": "string",
- "description": "The name of the cluster which the object belongs to. This is used to distinguish resources with same name and namespace in different clusters. This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request."
- }
- }
- },
- "v1.OwnerReference": {
- "id": "v1.OwnerReference",
- "description": "OwnerReference contains enough information to let you identify an owning object. Currently, an owning object must be in the same namespace, so there is no namespace field.",
- "required": [
- "apiVersion",
- "kind",
- "name",
- "uid"
- ],
- "properties": {
- "apiVersion": {
- "type": "string",
- "description": "API version of the referent."
- },
- "kind": {
- "type": "string",
- "description": "Kind of the referent. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "name": {
- "type": "string",
- "description": "Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names"
- },
- "uid": {
- "type": "string",
- "description": "UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids"
- },
- "controller": {
- "type": "boolean",
- "description": "If true, this reference points to the managing controller."
- }
- }
- },
- "v1.Status": {
- "id": "v1.Status",
- "description": "Status is a return value for calls that don't return other objects.",
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "metadata": {
- "$ref": "v1.ListMeta",
- "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "status": {
- "type": "string",
- "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status"
- },
- "message": {
- "type": "string",
- "description": "A human-readable description of the status of this operation."
- },
- "reason": {
- "type": "string",
- "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it."
- },
- "details": {
- "$ref": "v1.StatusDetails",
- "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type."
- },
- "code": {
- "type": "integer",
- "format": "int32",
- "description": "Suggested HTTP return code for this status, 0 if not set."
- }
- }
- },
- "v1.StatusDetails": {
- "id": "v1.StatusDetails",
- "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.",
- "properties": {
- "name": {
- "type": "string",
- "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described)."
- },
- "group": {
- "type": "string",
- "description": "The group attribute of the resource associated with the status StatusReason."
- },
- "kind": {
- "type": "string",
- "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "causes": {
- "type": "array",
- "items": {
- "$ref": "v1.StatusCause"
- },
- "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes."
- },
- "retryAfterSeconds": {
- "type": "integer",
- "format": "int32",
- "description": "If specified, the time in seconds before the operation should be retried."
- }
- }
- },
- "v1.StatusCause": {
- "id": "v1.StatusCause",
- "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.",
- "properties": {
- "reason": {
- "type": "string",
- "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available."
- },
- "message": {
- "type": "string",
- "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader."
- },
- "field": {
- "type": "string",
- "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\""
- }
- }
- },
- "v1.WatchEvent": {
- "id": "v1.WatchEvent",
- "required": [
- "type",
- "object"
- ],
- "properties": {
- "type": {
- "type": "string"
- },
- "object": {
- "type": "string"
- }
- }
- },
- "v1.Patch": {
- "id": "v1.Patch",
- "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.",
- "properties": {}
- },
- "v1.DeleteOptions": {
- "id": "v1.DeleteOptions",
- "description": "DeleteOptions may be provided when deleting an API object.",
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "gracePeriodSeconds": {
- "type": "integer",
- "format": "int64",
- "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately."
- },
- "preconditions": {
- "$ref": "v1.Preconditions",
- "description": "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned."
- },
- "orphanDependents": {
- "type": "boolean",
- "description": "Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list."
- }
- }
- },
- "v1.Preconditions": {
- "id": "v1.Preconditions",
- "description": "Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.",
- "properties": {
- "uid": {
- "$ref": "types.UID",
- "description": "Specifies the target UID."
- }
- }
- },
- "types.UID": {
- "id": "types.UID",
- "properties": {}
- },
- "v1.APIResourceList": {
- "id": "v1.APIResourceList",
- "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.",
- "required": [
- "groupVersion",
- "resources"
- ],
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "groupVersion": {
- "type": "string",
- "description": "groupVersion is the group and version this APIResourceList is for."
- },
- "resources": {
- "type": "array",
- "items": {
- "$ref": "v1.APIResource"
- },
- "description": "resources contains the name of the resources and if they are namespaced."
- }
- }
- },
- "v1.APIResource": {
- "id": "v1.APIResource",
- "description": "APIResource specifies the name of a resource and whether it is namespaced.",
- "required": [
- "name",
- "namespaced",
- "kind",
- "verbs"
- ],
- "properties": {
- "name": {
- "type": "string",
- "description": "name is the name of the resource."
- },
- "namespaced": {
- "type": "boolean",
- "description": "namespaced indicates if a resource is namespaced or not."
- },
- "kind": {
- "type": "string",
- "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')"
- },
- "verbs": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "description": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)"
- },
- "shortNames": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "description": "shortNames is a list of suggested short names of the resource."
- }
- }
- }
- }
- }
diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
index 9b185eb7b0..b32ea0e460 100644
--- a/cmd/kube-controller-manager/app/controllermanager.go
+++ b/cmd/kube-controller-manager/app/controllermanager.go
@@ -493,7 +493,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
ClusterName: s.ClusterName,
VolumeInformer: newSharedInformers.Core().V1().PersistentVolumes(),
ClaimInformer: newSharedInformers.Core().V1().PersistentVolumeClaims(),
- ClassInformer: newSharedInformers.Storage().V1().StorageClasses(),
+ ClassInformer: newSharedInformers.Storage().V1beta1().StorageClasses(),
EnableDynamicProvisioning: s.VolumeConfiguration.EnableDynamicProvisioning,
}
volumeController := persistentvolumecontroller.NewController(params)
diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
index 29b99471fc..39cc2c7c65 100644
--- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
+++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
@@ -86,7 +86,6 @@ func New() *Generator {
`k8s.io/kubernetes/pkg/apis/certificates/v1beta1`,
`k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1`,
`k8s.io/kubernetes/pkg/apis/storage/v1beta1`,
- `k8s.io/kubernetes/pkg/apis/storage/v1`,
}, ","),
DropEmbeddedFields: "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta",
}
diff --git a/docs/api-reference/storage.k8s.io/v1/definitions.html b/docs/api-reference/storage.k8s.io/v1/definitions.html
deleted file mode 100755
index dd9d62ada0..0000000000
--- a/docs/api-reference/storage.k8s.io/v1/definitions.html
+++ /dev/null
@@ -1,1227 +0,0 @@
-
-
-
-
-
-
-Top Level API Objects
-
-
-
-
-
-
-
Top Level API Objects
-
-
-
-
Definitions
-
-
-
v1.APIResourceList
-
-
APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-kind |
-Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
- |
-
-
-apiVersion |
-APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources |
-false |
-string |
- |
-
-
-groupVersion |
-groupVersion is the group and version this APIResourceList is for. |
-true |
-string |
- |
-
-
-resources |
-resources contains the name of the resources and if they are namespaced. |
-true |
-v1.APIResource array |
- |
-
-
-
-
-
-
-
v1.Patch
-
-
Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.
-
-
-
-
v1.DeleteOptions
-
-
DeleteOptions may be provided when deleting an API object.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-kind |
-Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
- |
-
-
-apiVersion |
-APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources |
-false |
-string |
- |
-
-
-gracePeriodSeconds |
-The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately. |
-false |
-integer (int64) |
- |
-
-
-preconditions |
-Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned. |
-false |
-v1.Preconditions |
- |
-
-
-orphanDependents |
-Should the dependent objects be orphaned. If true/false, the "orphan" finalizer will be added to/removed from the object’s finalizers list. |
-false |
-boolean |
-false |
-
-
-
-
-
-
-
-
-
ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-selfLink |
-SelfLink is a URL representing this object. Populated by the system. Read-only. |
-false |
-string |
- |
-
-
-resourceVersion |
-String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency |
-false |
-string |
- |
-
-
-
-
-
-
-
v1.StatusDetails
-
-
StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-name |
-The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described). |
-false |
-string |
- |
-
-
-group |
-The group attribute of the resource associated with the status StatusReason. |
-false |
-string |
- |
-
-
-kind |
-The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
- |
-
-
-causes |
-The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes. |
-false |
-v1.StatusCause array |
- |
-
-
-retryAfterSeconds |
-If specified, the time in seconds before the operation should be retried. |
-false |
-integer (int32) |
- |
-
-
-
-
-
-
-
v1.Preconditions
-
-
Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-uid |
-Specifies the target UID. |
-false |
-types.UID |
- |
-
-
-
-
-
-
-
v1.Status
-
-
Status is a return value for calls that don’t return other objects.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-kind |
-Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
- |
-
-
-apiVersion |
-APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources |
-false |
-string |
- |
-
-
-metadata |
-Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds |
-false |
-v1.ListMeta |
- |
-
-
-status |
-Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status |
-false |
-string |
- |
-
-
-message |
-A human-readable description of the status of this operation. |
-false |
-string |
- |
-
-
-reason |
-A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it. |
-false |
-string |
- |
-
-
-details |
-Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type. |
-false |
-v1.StatusDetails |
- |
-
-
-code |
-Suggested HTTP return code for this status, 0 if not set. |
-false |
-integer (int32) |
- |
-
-
-
-
-
-
-
v1.WatchEvent
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-type |
- |
-true |
-string |
- |
-
-
-object |
- |
-true |
-string |
- |
-
-
-
-
-
-
-
v1.StorageClassList
-
-
StorageClassList is a collection of storage classes.
-
-
-
-
-
-
v1.StorageClass
-
-
StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.
-
-
-
StorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.
-
-
-
-
-
-
-
-
ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-name |
-Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names |
-false |
-string |
- |
-
-
-generateName |
-GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.
-
-If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
-
-Applied only if Name is not specified. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#idempotency |
-false |
-string |
- |
-
-
-namespace |
-Namespace defines the space within each name must be unique. An empty namespace is equivalent to the "default" namespace, but "default" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.
-
-Must be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces |
-false |
-string |
- |
-
-
-selfLink |
-SelfLink is a URL representing this object. Populated by the system. Read-only. |
-false |
-string |
- |
-
-
-uid |
-UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.
-
-Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids |
-false |
-string |
- |
-
-
-resourceVersion |
-An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
-
-Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency |
-false |
-string |
- |
-
-
-generation |
-A sequence number representing a specific generation of the desired state. Populated by the system. Read-only. |
-false |
-integer (int64) |
- |
-
-
-creationTimestamp |
-CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-
-Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata |
-false |
-string |
- |
-
-
-deletionTimestamp |
-DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.
-
-Populated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata |
-false |
-string |
- |
-
-
-deletionGracePeriodSeconds |
-Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only. |
-false |
-integer (int64) |
- |
-
-
-labels |
-Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels |
-false |
-object |
- |
-
-
-annotations |
-Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations |
-false |
-object |
- |
-
-
-ownerReferences |
-List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller. |
-false |
-v1.OwnerReference array |
- |
-
-
-finalizers |
-Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed. |
-false |
-string array |
- |
-
-
-clusterName |
-The name of the cluster which the object belongs to. This is used to distinguish resources with same name and namespace in different clusters. This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request. |
-false |
-string |
- |
-
-
-
-
-
-
-
v1.OwnerReference
-
-
OwnerReference contains enough information to let you identify an owning object. Currently, an owning object must be in the same namespace, so there is no namespace field.
-
-
-
-
-
-
v1.APIResource
-
-
APIResource specifies the name of a resource and whether it is namespaced.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-name |
-name is the name of the resource. |
-true |
-string |
- |
-
-
-namespaced |
-namespaced indicates if a resource is namespaced or not. |
-true |
-boolean |
-false |
-
-
-kind |
-kind is the kind for the resource (e.g. Foo is the kind for a resource foo) |
-true |
-string |
- |
-
-
-verbs |
-verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy) |
-true |
-string array |
- |
-
-
-shortNames |
-shortNames is a list of suggested short names of the resource. |
-false |
-string array |
- |
-
-
-
-
-
-
-
types.UID
-
-
-
-
v1.StatusCause
-
-
StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.
-
-
-
-
-
-
-
-
-
-
-
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-reason |
-A machine-readable description of the cause of the error. If this value is empty there is no information available. |
-false |
-string |
- |
-
-
-message |
-A human-readable description of the cause of the error. This field may be presented as-is to a reader. |
-false |
-string |
- |
-
-
-field |
-The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items" |
-false |
-string |
- |
-
-
-
-
-
-
-
any
-
-
Represents an untyped JSON map - see the description of the field for more info about the structure of this object.
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/api-reference/storage.k8s.io/v1/operations.html b/docs/api-reference/storage.k8s.io/v1/operations.html
deleted file mode 100755
index 6bc9e16038..0000000000
--- a/docs/api-reference/storage.k8s.io/v1/operations.html
+++ /dev/null
@@ -1,1669 +0,0 @@
-
-
-
-
-
-
-Operations
-
-
-
-
-
-
-
Operations
-
-
-
get available resources
-
-
-
GET /apis/storage.k8s.io/v1
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-default |
-success |
-v1.APIResourceList |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
list or watch objects of kind StorageClass
-
-
-
GET /apis/storage.k8s.io/v1/storageclasses
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
- |
-
-
-QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it’s 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv. |
-false |
-string |
- |
-
-
-QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
- |
-
-
-
-
-
-
-
-
-
Produces
-
-
--
-
application/json
-
--
-
application/yaml
-
--
-
application/vnd.kubernetes.protobuf
-
--
-
application/json;stream=watch
-
--
-
application/vnd.kubernetes.protobuf;stream=watch
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
delete collection of StorageClass
-
-
-
DELETE /apis/storage.k8s.io/v1/storageclasses
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
- |
-
-
-QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it’s 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv. |
-false |
-string |
- |
-
-
-QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.Status |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
create a StorageClass
-
-
-
POST /apis/storage.k8s.io/v1/storageclasses
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-BodyParameter |
-body |
- |
-true |
-v1.StorageClass |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.StorageClass |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
read the specified StorageClass
-
-
-
GET /apis/storage.k8s.io/v1/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-QueryParameter |
-export |
-Should this value be exported. Export strips fields that a user can not specify. |
-false |
-boolean |
- |
-
-
-QueryParameter |
-exact |
-Should the export be exact. Exact export maintains cluster-specific fields like Namespace. |
-false |
-boolean |
- |
-
-
-PathParameter |
-name |
-name of the StorageClass |
-true |
-string |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.StorageClass |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
replace the specified StorageClass
-
-
-
PUT /apis/storage.k8s.io/v1/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-BodyParameter |
-body |
- |
-true |
-v1.StorageClass |
- |
-
-
-PathParameter |
-name |
-name of the StorageClass |
-true |
-string |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.StorageClass |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
delete a StorageClass
-
-
-
DELETE /apis/storage.k8s.io/v1/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-BodyParameter |
-body |
- |
-true |
-v1.DeleteOptions |
- |
-
-
-QueryParameter |
-gracePeriodSeconds |
-The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately. |
-false |
-integer (int32) |
- |
-
-
-QueryParameter |
-orphanDependents |
-Should the dependent objects be orphaned. If true/false, the "orphan" finalizer will be added to/removed from the object’s finalizers list. |
-false |
-boolean |
- |
-
-
-PathParameter |
-name |
-name of the StorageClass |
-true |
-string |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.Status |
-
-
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
partially update the specified StorageClass
-
-
-
PATCH /apis/storage.k8s.io/v1/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-BodyParameter |
-body |
- |
-true |
-v1.Patch |
- |
-
-
-PathParameter |
-name |
-name of the StorageClass |
-true |
-string |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.StorageClass |
-
-
-
-
-
-
-
Consumes
-
-
--
-
application/json-patch+json
-
--
-
application/merge-patch+json
-
--
-
application/strategic-merge-patch+json
-
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
watch individual changes to a list of StorageClass
-
-
-
GET /apis/storage.k8s.io/v1/watch/storageclasses
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
- |
-
-
-QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it’s 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv. |
-false |
-string |
- |
-
-
-QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.WatchEvent |
-
-
-
-
-
-
-
-
Produces
-
-
--
-
application/json
-
--
-
application/yaml
-
--
-
application/vnd.kubernetes.protobuf
-
--
-
application/json;stream=watch
-
--
-
application/vnd.kubernetes.protobuf;stream=watch
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
watch changes to an object of kind StorageClass
-
-
-
GET /apis/storage.k8s.io/v1/watch/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-Type |
-Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
- |
-
-
-QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
- |
-
-
-QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
- |
-
-
-QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. When specified for list: - if unset, then the result is returned from remote storage based on quorum-read flag; - if it’s 0, then we simply return what we currently have in cache, no guarantee; - if set to non zero, then the result is at least as fresh as given rv. |
-false |
-string |
- |
-
-
-QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
- |
-
-
-PathParameter |
-name |
-name of the StorageClass |
-true |
-string |
- |
-
-
-
-
-
-
-
Responses
-
-
-
-
-
-
-
-
-HTTP Code |
-Description |
-Schema |
-
-
-
-
-200 |
-success |
-v1.WatchEvent |
-
-
-
-
-
-
-
-
Produces
-
-
--
-
application/json
-
--
-
application/yaml
-
--
-
application/vnd.kubernetes.protobuf
-
--
-
application/json;stream=watch
-
--
-
application/vnd.kubernetes.protobuf;stream=watch
-
-
-
-
-
-
-
-
--
-
apisstorage.k8s.iov1
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/hack/.linted_packages b/hack/.linted_packages
index ba616cc295..3d83b3c9ed 100644
--- a/hack/.linted_packages
+++ b/hack/.linted_packages
@@ -103,7 +103,6 @@ pkg/client/informers/informers_generated/externalversions/rbac
pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1
pkg/client/informers/informers_generated/externalversions/rbac/v1beta1
pkg/client/informers/informers_generated/externalversions/storage
-pkg/client/informers/informers_generated/externalversions/storage/v1
pkg/client/informers/informers_generated/externalversions/storage/v1beta1
pkg/client/informers/informers_generated/internalversion
pkg/client/informers/informers_generated/internalversion/apps
@@ -153,7 +152,6 @@ pkg/client/listers/rbac/internalversion
pkg/client/listers/rbac/v1alpha1
pkg/client/listers/rbac/v1beta1
pkg/client/listers/storage/internalversion
-pkg/client/listers/storage/v1
pkg/client/listers/storage/v1beta1
pkg/client/metrics
pkg/client/metrics/prometheus
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
index e6afe565ef..68af35d2c3 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
@@ -68,8 +68,7 @@ imagepolicy.k8s.io/v1alpha1 \
policy/v1beta1 \
rbac.authorization.k8s.io/v1beta1 \
rbac.authorization.k8s.io/v1alpha1 \
-storage.k8s.io/v1beta1 \
-storage.k8s.io/v1\
+storage.k8s.io/v1beta1\
}"
# not all group versions are exposed by the server. This list contains those
diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh
index 47de698835..76a1d63f0d 100644
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -3230,7 +3230,7 @@ runTests() {
kubectl create -f - "${kube_flags[@]}" << __EOF__
{
"kind": "StorageClass",
- "apiVersion": "storage.k8s.io/v1",
+ "apiVersion": "storage.k8s.io/v1beta1",
"metadata": {
"name": "storage-class-name"
},
diff --git a/pkg/BUILD b/pkg/BUILD
index 420af31494..1307dffd85 100644
--- a/pkg/BUILD
+++ b/pkg/BUILD
@@ -70,7 +70,6 @@ filegroup(
"//pkg/client/listers/rbac/v1alpha1:all-srcs",
"//pkg/client/listers/rbac/v1beta1:all-srcs",
"//pkg/client/listers/storage/internalversion:all-srcs",
- "//pkg/client/listers/storage/v1:all-srcs",
"//pkg/client/listers/storage/v1beta1:all-srcs",
"//pkg/client/metrics:all-srcs",
"//pkg/client/retry:all-srcs",
diff --git a/pkg/apis/storage/BUILD b/pkg/apis/storage/BUILD
index 71ee22cd85..fc2be2fc8a 100644
--- a/pkg/apis/storage/BUILD
+++ b/pkg/apis/storage/BUILD
@@ -37,7 +37,6 @@ filegroup(
":package-srcs",
"//pkg/apis/storage/install:all-srcs",
"//pkg/apis/storage/util:all-srcs",
- "//pkg/apis/storage/v1:all-srcs",
"//pkg/apis/storage/v1beta1:all-srcs",
"//pkg/apis/storage/validation:all-srcs",
],
diff --git a/pkg/apis/storage/install/BUILD b/pkg/apis/storage/install/BUILD
index c9b9ddf938..45a3189cd9 100644
--- a/pkg/apis/storage/install/BUILD
+++ b/pkg/apis/storage/install/BUILD
@@ -14,7 +14,6 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/apis/storage:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apimachinery/announced",
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
diff --git a/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go
index 7b09a34d23..955c7e79db 100644
--- a/pkg/apis/storage/install/install.go
+++ b/pkg/apis/storage/install/install.go
@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/storage"
- "k8s.io/kubernetes/pkg/apis/storage/v1"
"k8s.io/kubernetes/pkg/apis/storage/v1beta1"
)
@@ -38,13 +37,12 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
if err := announced.NewGroupMetaFactory(
&announced.GroupMetaFactoryArgs{
GroupName: storage.GroupName,
- VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version},
+ VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/kubernetes/pkg/apis/storage",
RootScopedKinds: sets.NewString("StorageClass"),
AddInternalObjectsToScheme: storage.AddToScheme,
},
announced.VersionToSchemeFunc{
- v1.SchemeGroupVersion.Version: v1.AddToScheme,
v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme,
},
).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
diff --git a/pkg/apis/storage/v1/BUILD b/pkg/apis/storage/v1/BUILD
deleted file mode 100644
index a1bc66d174..0000000000
--- a/pkg/apis/storage/v1/BUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = [
- "doc.go",
- "generated.pb.go",
- "register.go",
- "types.go",
- "types_swagger_doc_generated.go",
- "zz_generated.conversion.go",
- "zz_generated.deepcopy.go",
- "zz_generated.defaults.go",
- ],
- tags = ["automanaged"],
- deps = [
- "//pkg/api/v1:go_default_library",
- "//pkg/apis/storage:go_default_library",
- "//vendor:github.com/gogo/protobuf/proto",
- "//vendor:github.com/gogo/protobuf/sortkeys",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- "//vendor:k8s.io/apimachinery/pkg/conversion",
- "//vendor:k8s.io/apimachinery/pkg/runtime",
- "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [
- ":package-srcs",
- "//pkg/apis/storage/v1/util:all-srcs",
- ],
- tags = ["automanaged"],
-)
diff --git a/pkg/apis/storage/v1/doc.go b/pkg/apis/storage/v1/doc.go
deleted file mode 100644
index 32f99daea9..0000000000
--- a/pkg/apis/storage/v1/doc.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/storage
-// +groupName=storage.k8s.io
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-package v1
diff --git a/pkg/apis/storage/v1/generated.pb.go b/pkg/apis/storage/v1/generated.pb.go
deleted file mode 100644
index 3228238b7d..0000000000
--- a/pkg/apis/storage/v1/generated.pb.go
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by protoc-gen-gogo.
-// source: k8s.io/kubernetes/pkg/apis/storage/v1/generated.proto
-// DO NOT EDIT!
-
-/*
- Package v1 is a generated protocol buffer package.
-
- It is generated from these files:
- k8s.io/kubernetes/pkg/apis/storage/v1/generated.proto
-
- It has these top-level messages:
- StorageClass
- StorageClassList
-*/
-package v1
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import strings "strings"
-import reflect "reflect"
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
-
-import io "io"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
-
-func (m *StorageClass) Reset() { *m = StorageClass{} }
-func (*StorageClass) ProtoMessage() {}
-func (*StorageClass) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
-
-func (m *StorageClassList) Reset() { *m = StorageClassList{} }
-func (*StorageClassList) ProtoMessage() {}
-func (*StorageClassList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{1} }
-
-func init() {
- proto.RegisterType((*StorageClass)(nil), "k8s.io.kubernetes.pkg.apis.storage.v1.StorageClass")
- proto.RegisterType((*StorageClassList)(nil), "k8s.io.kubernetes.pkg.apis.storage.v1.StorageClassList")
-}
-func (m *StorageClass) Marshal() (data []byte, err error) {
- size := m.Size()
- data = make([]byte, size)
- n, err := m.MarshalTo(data)
- if err != nil {
- return nil, err
- }
- return data[:n], nil
-}
-
-func (m *StorageClass) MarshalTo(data []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- data[i] = 0xa
- i++
- i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
- n1, err := m.ObjectMeta.MarshalTo(data[i:])
- if err != nil {
- return 0, err
- }
- i += n1
- data[i] = 0x12
- i++
- i = encodeVarintGenerated(data, i, uint64(len(m.Provisioner)))
- i += copy(data[i:], m.Provisioner)
- if len(m.Parameters) > 0 {
- for k := range m.Parameters {
- data[i] = 0x1a
- i++
- v := m.Parameters[k]
- mapSize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + len(v) + sovGenerated(uint64(len(v)))
- i = encodeVarintGenerated(data, i, uint64(mapSize))
- data[i] = 0xa
- i++
- i = encodeVarintGenerated(data, i, uint64(len(k)))
- i += copy(data[i:], k)
- data[i] = 0x12
- i++
- i = encodeVarintGenerated(data, i, uint64(len(v)))
- i += copy(data[i:], v)
- }
- }
- return i, nil
-}
-
-func (m *StorageClassList) Marshal() (data []byte, err error) {
- size := m.Size()
- data = make([]byte, size)
- n, err := m.MarshalTo(data)
- if err != nil {
- return nil, err
- }
- return data[:n], nil
-}
-
-func (m *StorageClassList) MarshalTo(data []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- data[i] = 0xa
- i++
- i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
- n2, err := m.ListMeta.MarshalTo(data[i:])
- if err != nil {
- return 0, err
- }
- i += n2
- if len(m.Items) > 0 {
- for _, msg := range m.Items {
- data[i] = 0x12
- i++
- i = encodeVarintGenerated(data, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(data[i:])
- if err != nil {
- return 0, err
- }
- i += n
- }
- }
- return i, nil
-}
-
-func encodeFixed64Generated(data []byte, offset int, v uint64) int {
- data[offset] = uint8(v)
- data[offset+1] = uint8(v >> 8)
- data[offset+2] = uint8(v >> 16)
- data[offset+3] = uint8(v >> 24)
- data[offset+4] = uint8(v >> 32)
- data[offset+5] = uint8(v >> 40)
- data[offset+6] = uint8(v >> 48)
- data[offset+7] = uint8(v >> 56)
- return offset + 8
-}
-func encodeFixed32Generated(data []byte, offset int, v uint32) int {
- data[offset] = uint8(v)
- data[offset+1] = uint8(v >> 8)
- data[offset+2] = uint8(v >> 16)
- data[offset+3] = uint8(v >> 24)
- return offset + 4
-}
-func encodeVarintGenerated(data []byte, offset int, v uint64) int {
- for v >= 1<<7 {
- data[offset] = uint8(v&0x7f | 0x80)
- v >>= 7
- offset++
- }
- data[offset] = uint8(v)
- return offset + 1
-}
-func (m *StorageClass) Size() (n int) {
- var l int
- _ = l
- l = m.ObjectMeta.Size()
- n += 1 + l + sovGenerated(uint64(l))
- l = len(m.Provisioner)
- n += 1 + l + sovGenerated(uint64(l))
- if len(m.Parameters) > 0 {
- for k, v := range m.Parameters {
- _ = k
- _ = v
- mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + len(v) + sovGenerated(uint64(len(v)))
- n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize))
- }
- }
- return n
-}
-
-func (m *StorageClassList) Size() (n int) {
- var l int
- _ = l
- l = m.ListMeta.Size()
- n += 1 + l + sovGenerated(uint64(l))
- if len(m.Items) > 0 {
- for _, e := range m.Items {
- l = e.Size()
- n += 1 + l + sovGenerated(uint64(l))
- }
- }
- return n
-}
-
-func sovGenerated(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
-}
-func sozGenerated(x uint64) (n int) {
- return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (this *StorageClass) String() string {
- if this == nil {
- return "nil"
- }
- keysForParameters := make([]string, 0, len(this.Parameters))
- for k := range this.Parameters {
- keysForParameters = append(keysForParameters, k)
- }
- github_com_gogo_protobuf_sortkeys.Strings(keysForParameters)
- mapStringForParameters := "map[string]string{"
- for _, k := range keysForParameters {
- mapStringForParameters += fmt.Sprintf("%v: %v,", k, this.Parameters[k])
- }
- mapStringForParameters += "}"
- s := strings.Join([]string{`&StorageClass{`,
- `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
- `Provisioner:` + fmt.Sprintf("%v", this.Provisioner) + `,`,
- `Parameters:` + mapStringForParameters + `,`,
- `}`,
- }, "")
- return s
-}
-func (this *StorageClassList) String() string {
- if this == nil {
- return "nil"
- }
- s := strings.Join([]string{`&StorageClassList{`,
- `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
- `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`,
- `}`,
- }, "")
- return s
-}
-func valueToStringGenerated(v interface{}) string {
- rv := reflect.ValueOf(v)
- if rv.IsNil() {
- return "nil"
- }
- pv := reflect.Indirect(rv).Interface()
- return fmt.Sprintf("*%v", pv)
-}
-func (m *StorageClass) Unmarshal(data []byte) error {
- l := len(data)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- wire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: StorageClass: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: StorageClass: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field ObjectMeta", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- msglen |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthGenerated
- }
- postIndex := iNdEx + msglen
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if err := m.ObjectMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Provisioner", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- stringLen |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthGenerated
- }
- postIndex := iNdEx + intStringLen
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Provisioner = string(data[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Parameters", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- msglen |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthGenerated
- }
- postIndex := iNdEx + msglen
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- var keykey uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- keykey |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- var stringLenmapkey uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- stringLenmapkey |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLenmapkey := int(stringLenmapkey)
- if intStringLenmapkey < 0 {
- return ErrInvalidLengthGenerated
- }
- postStringIndexmapkey := iNdEx + intStringLenmapkey
- if postStringIndexmapkey > l {
- return io.ErrUnexpectedEOF
- }
- mapkey := string(data[iNdEx:postStringIndexmapkey])
- iNdEx = postStringIndexmapkey
- var valuekey uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- valuekey |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- var stringLenmapvalue uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- stringLenmapvalue |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLenmapvalue := int(stringLenmapvalue)
- if intStringLenmapvalue < 0 {
- return ErrInvalidLengthGenerated
- }
- postStringIndexmapvalue := iNdEx + intStringLenmapvalue
- if postStringIndexmapvalue > l {
- return io.ErrUnexpectedEOF
- }
- mapvalue := string(data[iNdEx:postStringIndexmapvalue])
- iNdEx = postStringIndexmapvalue
- if m.Parameters == nil {
- m.Parameters = make(map[string]string)
- }
- m.Parameters[mapkey] = mapvalue
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipGenerated(data[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthGenerated
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *StorageClassList) Unmarshal(data []byte) error {
- l := len(data)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- wire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: StorageClassList: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: StorageClassList: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field ListMeta", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- msglen |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthGenerated
- }
- postIndex := iNdEx + msglen
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if err := m.ListMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Items", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- msglen |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthGenerated
- }
- postIndex := iNdEx + msglen
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Items = append(m.Items, StorageClass{})
- if err := m.Items[len(m.Items)-1].Unmarshal(data[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipGenerated(data[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthGenerated
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func skipGenerated(data []byte) (n int, err error) {
- l := len(data)
- iNdEx := 0
- for iNdEx < l {
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- wire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- wireType := int(wire & 0x7)
- switch wireType {
- case 0:
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- iNdEx++
- if data[iNdEx-1] < 0x80 {
- break
- }
- }
- return iNdEx, nil
- case 1:
- iNdEx += 8
- return iNdEx, nil
- case 2:
- var length int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- length |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- iNdEx += length
- if length < 0 {
- return 0, ErrInvalidLengthGenerated
- }
- return iNdEx, nil
- case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowGenerated
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := data[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipGenerated(data[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- }
- return iNdEx, nil
- case 4:
- return iNdEx, nil
- case 5:
- iNdEx += 4
- return iNdEx, nil
- default:
- return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
- }
- }
- panic("unreachable")
-}
-
-var (
- ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowGenerated = fmt.Errorf("proto: integer overflow")
-)
-
-var fileDescriptorGenerated = []byte{
- // 474 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x6f, 0xd3, 0x30,
- 0x18, 0xc6, 0xe3, 0x54, 0x95, 0x36, 0x17, 0x44, 0x15, 0x38, 0x54, 0x3d, 0x64, 0xd5, 0x04, 0x52,
- 0x2f, 0xd8, 0x74, 0x63, 0x68, 0x42, 0xe2, 0xd2, 0x89, 0x03, 0x12, 0x88, 0x29, 0x5c, 0x10, 0xe2,
- 0x80, 0xdb, 0xbd, 0xa4, 0x26, 0x4d, 0x1c, 0xd9, 0x6f, 0x02, 0xbd, 0xf1, 0x11, 0xf8, 0x58, 0x15,
- 0xa7, 0x1d, 0x39, 0x0d, 0x1a, 0xbe, 0x08, 0xca, 0x1f, 0x96, 0x88, 0x6c, 0xa2, 0xda, 0x2d, 0xaf,
- 0xed, 0xdf, 0xe3, 0xe7, 0x79, 0x1c, 0x7a, 0x14, 0x1c, 0x1b, 0x26, 0x15, 0x0f, 0x92, 0x19, 0xe8,
- 0x08, 0x10, 0x0c, 0x8f, 0x03, 0x9f, 0x8b, 0x58, 0x1a, 0x6e, 0x50, 0x69, 0xe1, 0x03, 0x4f, 0x27,
- 0xdc, 0x87, 0x08, 0xb4, 0x40, 0x38, 0x63, 0xb1, 0x56, 0xa8, 0x9c, 0x07, 0x25, 0xc6, 0x6a, 0x8c,
- 0xc5, 0x81, 0xcf, 0x72, 0x8c, 0x55, 0x18, 0x4b, 0x27, 0xc3, 0x87, 0xbe, 0xc4, 0x45, 0x32, 0x63,
- 0x73, 0x15, 0x72, 0x5f, 0xf9, 0x8a, 0x17, 0xf4, 0x2c, 0xf9, 0x58, 0x4c, 0xc5, 0x50, 0x7c, 0x95,
- 0xaa, 0xc3, 0xc7, 0x95, 0x19, 0x11, 0xcb, 0x50, 0xcc, 0x17, 0x32, 0x02, 0xbd, 0xaa, 0xed, 0x84,
- 0x80, 0xe2, 0x0a, 0x2f, 0x43, 0x7e, 0x1d, 0xa5, 0x93, 0x08, 0x65, 0x08, 0x2d, 0xe0, 0xc9, 0xff,
- 0x00, 0x33, 0x5f, 0x40, 0x28, 0x5a, 0xdc, 0xe1, 0x75, 0x5c, 0x82, 0x72, 0xc9, 0x65, 0x84, 0x06,
- 0x75, 0x0b, 0x6a, 0x64, 0x32, 0xa0, 0x53, 0xd0, 0x75, 0x20, 0xf8, 0x22, 0xc2, 0x78, 0x79, 0x55,
- 0xbf, 0xfb, 0x3f, 0x6d, 0x7a, 0xeb, 0x4d, 0xd9, 0xe3, 0xc9, 0x52, 0x18, 0xe3, 0x7c, 0xa0, 0x3b,
- 0x79, 0xfe, 0x33, 0x81, 0x62, 0x40, 0x46, 0x64, 0xdc, 0x3b, 0x78, 0xc4, 0xaa, 0x37, 0x68, 0xda,
- 0xa9, 0x5f, 0x21, 0x3f, 0xcd, 0xd2, 0x09, 0x7b, 0x3d, 0xfb, 0x04, 0x73, 0x7c, 0x05, 0x28, 0xa6,
- 0xce, 0xfa, 0x62, 0xcf, 0xca, 0x2e, 0xf6, 0x68, 0xbd, 0xe6, 0x5d, 0xaa, 0x3a, 0x47, 0xb4, 0x17,
- 0x6b, 0x95, 0x4a, 0x23, 0x55, 0x04, 0x7a, 0x60, 0x8f, 0xc8, 0x78, 0x77, 0x7a, 0xb7, 0x42, 0x7a,
- 0xa7, 0xf5, 0x96, 0xd7, 0x3c, 0xe7, 0x7c, 0xa6, 0x34, 0x16, 0x5a, 0x84, 0x80, 0xa0, 0xcd, 0xa0,
- 0x33, 0xea, 0x8c, 0x7b, 0x07, 0x27, 0x6c, 0xab, 0xdf, 0x83, 0x35, 0x13, 0xb2, 0xd3, 0x4b, 0x95,
- 0xe7, 0x11, 0xea, 0x55, 0xed, 0xb6, 0xde, 0xf0, 0x1a, 0x57, 0x0d, 0x9f, 0xd1, 0x3b, 0xff, 0x20,
- 0x4e, 0x9f, 0x76, 0x02, 0x58, 0x15, 0xfd, 0xec, 0x7a, 0xf9, 0xa7, 0x73, 0x8f, 0x76, 0x53, 0xb1,
- 0x4c, 0xa0, 0x8c, 0xe3, 0x95, 0xc3, 0x53, 0xfb, 0x98, 0xec, 0x7f, 0x27, 0xb4, 0xdf, 0xbc, 0xff,
- 0xa5, 0x34, 0xe8, 0xbc, 0x6f, 0xb5, 0xcc, 0xb6, 0x6b, 0x39, 0xa7, 0x8b, 0x8e, 0xfb, 0x95, 0xeb,
- 0x9d, 0xbf, 0x2b, 0x8d, 0x86, 0xdf, 0xd2, 0xae, 0x44, 0x08, 0xcd, 0xc0, 0x2e, 0x5a, 0x3a, 0xbc,
- 0x41, 0x4b, 0xd3, 0xdb, 0x95, 0x7e, 0xf7, 0x45, 0xae, 0xe4, 0x95, 0x82, 0xd3, 0xfb, 0xeb, 0x8d,
- 0x6b, 0x9d, 0x6f, 0x5c, 0xeb, 0xc7, 0xc6, 0xb5, 0xbe, 0x66, 0x2e, 0x59, 0x67, 0x2e, 0x39, 0xcf,
- 0x5c, 0xf2, 0x2b, 0x73, 0xc9, 0xb7, 0xdf, 0xae, 0xf5, 0xce, 0x4e, 0x27, 0x7f, 0x02, 0x00, 0x00,
- 0xff, 0xff, 0xe8, 0xe1, 0xb9, 0x93, 0xec, 0x03, 0x00, 0x00,
-}
diff --git a/pkg/apis/storage/v1/generated.proto b/pkg/apis/storage/v1/generated.proto
deleted file mode 100644
index 92e18cf9e9..0000000000
--- a/pkg/apis/storage/v1/generated.proto
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-
-// This file was autogenerated by go-to-protobuf. Do not edit it manually!
-
-syntax = 'proto2';
-
-package k8s.io.kubernetes.pkg.apis.storage.v1;
-
-import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto";
-
-// Package-wide variables from generator "generated".
-option go_package = "v1";
-
-// StorageClass describes the parameters for a class of storage for
-// which PersistentVolumes can be dynamically provisioned.
-//
-// StorageClasses are non-namespaced; the name of the storage class
-// according to etcd is in ObjectMeta.Name.
-message StorageClass {
- // Standard object's metadata.
- // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
- // +optional
- optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
-
- // Provisioner indicates the type of the provisioner.
- optional string provisioner = 2;
-
- // Parameters holds the parameters for the provisioner that should
- // create volumes of this storage class.
- // +optional
- map parameters = 3;
-}
-
-// StorageClassList is a collection of storage classes.
-message StorageClassList {
- // Standard list metadata
- // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
- // +optional
- optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
-
- // Items is the list of StorageClasses
- repeated StorageClass items = 2;
-}
-
diff --git a/pkg/apis/storage/v1/register.go b/pkg/apis/storage/v1/register.go
deleted file mode 100644
index d04e8e808f..0000000000
--- a/pkg/apis/storage/v1/register.go
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-import (
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
- "k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/kubernetes/pkg/api/v1"
-)
-
-// GroupName is the group name use in this package
-const GroupName = "storage.k8s.io"
-
-// SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
-
-// Resource takes an unqualified resource and returns a Group qualified GroupResource
-func Resource(resource string) schema.GroupResource {
- return SchemeGroupVersion.WithResource(resource).GroupResource()
-}
-
-var (
- SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
- AddToScheme = SchemeBuilder.AddToScheme
-)
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
- scheme.AddKnownTypes(SchemeGroupVersion,
- &v1.ListOptions{},
- &v1.DeleteOptions{},
- &metav1.ExportOptions{},
- &metav1.GetOptions{},
-
- &StorageClass{},
- &StorageClassList{},
- )
-
- metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
- return nil
-}
diff --git a/pkg/apis/storage/v1/types.go b/pkg/apis/storage/v1/types.go
deleted file mode 100644
index 25b283b81f..0000000000
--- a/pkg/apis/storage/v1/types.go
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-import (
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// +genclient=true
-// +nonNamespaced=true
-
-// StorageClass describes the parameters for a class of storage for
-// which PersistentVolumes can be dynamically provisioned.
-//
-// StorageClasses are non-namespaced; the name of the storage class
-// according to etcd is in ObjectMeta.Name.
-type StorageClass struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
- // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
- // +optional
- metav1.ObjectMeta `json:"metadata,omitempty"`
-
- // Provisioner indicates the type of the provisioner.
- Provisioner string `json:"provisioner"`
-
- // Parameters holds the parameters for the provisioner that should
- // create volumes of this storage class.
- // +optional
- Parameters map[string]string `json:"parameters,omitempty"`
-}
-
-// StorageClassList is a collection of storage classes.
-type StorageClassList struct {
- metav1.TypeMeta `json:",inline"`
- // Standard list metadata
- // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
- // +optional
- metav1.ListMeta `json:"metadata,omitempty"`
-
- // Items is the list of StorageClasses
- Items []StorageClass `json:"items"`
-}
diff --git a/pkg/apis/storage/v1/types_swagger_doc_generated.go b/pkg/apis/storage/v1/types_swagger_doc_generated.go
deleted file mode 100644
index 6f27177085..0000000000
--- a/pkg/apis/storage/v1/types_swagger_doc_generated.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-// This file contains a collection of methods that can be used from go-restful to
-// generate Swagger API documentation for its models. Please read this PR for more
-// information on the implementation: https://github.com/emicklei/go-restful/pull/215
-//
-// TODOs are ignored from the parser (e.g. TODO(andronat):... || TODO:...) if and only if
-// they are on one line! For multiple line or blocks that you want to ignore use ---.
-// Any context after a --- is ignored.
-//
-// Those methods can be generated by using hack/update-generated-swagger-docs.sh
-
-// AUTO-GENERATED FUNCTIONS START HERE
-var map_StorageClass = map[string]string{
- "": "StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.\n\nStorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.",
- "metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "provisioner": "Provisioner indicates the type of the provisioner.",
- "parameters": "Parameters holds the parameters for the provisioner that should create volumes of this storage class.",
-}
-
-func (StorageClass) SwaggerDoc() map[string]string {
- return map_StorageClass
-}
-
-var map_StorageClassList = map[string]string{
- "": "StorageClassList is a collection of storage classes.",
- "metadata": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "items": "Items is the list of StorageClasses",
-}
-
-func (StorageClassList) SwaggerDoc() map[string]string {
- return map_StorageClassList
-}
-
-// AUTO-GENERATED FUNCTIONS END HERE
diff --git a/pkg/apis/storage/v1/util/BUILD b/pkg/apis/storage/v1/util/BUILD
deleted file mode 100644
index 3d63939013..0000000000
--- a/pkg/apis/storage/v1/util/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = ["helpers.go"],
- tags = ["automanaged"],
- deps = [
- "//pkg/api/v1:go_default_library",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [":package-srcs"],
- tags = ["automanaged"],
-)
diff --git a/pkg/apis/storage/v1/util/helpers.go b/pkg/apis/storage/v1/util/helpers.go
deleted file mode 100644
index 39c4f6f3ed..0000000000
--- a/pkg/apis/storage/v1/util/helpers.go
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/kubernetes/pkg/api/v1"
-)
-
-// IsDefaultStorageClassAnnotation represents a StorageClass annotation that
-// marks a class as the default StorageClass
-//TODO: Update IsDefaultStorageClassannotation and remove Beta when no longer used
-const IsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
-const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
-
-// AlphaStorageClassAnnotation represents the previous alpha storage class
-// annotation. it's no longer used and held here for posterity.
-const AlphaStorageClassAnnotation = "volume.alpha.kubernetes.io/storage-class"
-
-// BetaStorageClassAnnotation represents the beta/previous StorageClass annotation.
-// It's currently still used and will be held for backwards compatibility
-const BetaStorageClassAnnotation = "volume.beta.kubernetes.io/storage-class"
-
-// StorageClassAnnotation represents the storage class associated with a resource.
-// It currently matches the Beta value and can change when official is set.
-// - in PersistentVolumeClaim it represents required class to match.
-// Only PersistentVolumes with the same class (i.e. annotation with the same
-// value) can be bound to the claim. In case no such volume exists, the
-// controller will provision a new one using StorageClass instance with
-// the same name as the annotation value.
-// - in PersistentVolume it represents storage class to which the persistent
-// volume belongs.
-//TODO: Update this to final annotation value as it matches BetaStorageClassAnnotation for now
-const StorageClassAnnotation = "volume.beta.kubernetes.io/storage-class"
-
-// GetVolumeStorageClass returns value of StorageClassAnnotation or empty string in case
-// the annotation does not exist.
-// TODO: change to PersistentVolume.Spec.Class value when this attribute is
-// introduced.
-func GetVolumeStorageClass(volume *v1.PersistentVolume) string {
- if class, found := volume.Annotations[StorageClassAnnotation]; found {
- return class
- }
-
- // 'nil' is interpreted as "", i.e. the volume does not belong to any class.
- return ""
-}
-
-// GetClaimStorageClass returns name of class that is requested by given claim.
-// Request for `nil` class is interpreted as request for class "",
-// i.e. for a classless PV.
-// TODO: change to PersistentVolumeClaim.Spec.Class value when this
-// attribute is introduced.
-func GetClaimStorageClass(claim *v1.PersistentVolumeClaim) string {
- if class, found := claim.Annotations[StorageClassAnnotation]; found {
- return class
- }
-
- return ""
-}
-
-// GetStorageClassAnnotation returns the StorageClass value
-// if the annotation is set, empty string if not
-// TODO: remove Alpha and Beta when no longer used or needed
-func GetStorageClassAnnotation(obj metav1.ObjectMeta) string {
- if class, ok := obj.Annotations[StorageClassAnnotation]; ok {
- return class
- }
- if class, ok := obj.Annotations[BetaStorageClassAnnotation]; ok {
- return class
- }
- if class, ok := obj.Annotations[AlphaStorageClassAnnotation]; ok {
- return class
- }
-
- return ""
-}
-
-// HasStorageClassAnnotation returns a boolean
-// if the annotation is set
-// TODO: remove Alpha and Beta when no longer used or needed
-func HasStorageClassAnnotation(obj metav1.ObjectMeta) bool {
- if _, found := obj.Annotations[StorageClassAnnotation]; found {
- return found
- }
- if _, found := obj.Annotations[BetaStorageClassAnnotation]; found {
- return found
- }
- if _, found := obj.Annotations[AlphaStorageClassAnnotation]; found {
- return found
- }
-
- return false
-
-}
-
-// IsDefaultAnnotationText returns a pretty Yes/No String if
-// the annotation is set
-// TODO: remove Beta when no longer needed
-func IsDefaultAnnotationText(obj metav1.ObjectMeta) string {
- if obj.Annotations[IsDefaultStorageClassAnnotation] == "true" {
- return "Yes"
- }
- if obj.Annotations[BetaIsDefaultStorageClassAnnotation] == "true" {
- return "Yes"
- }
-
- return "No"
-}
-
-// IsDefaultAnnotation returns a boolean if
-// the annotation is set
-// TODO: remove Beta when no longer needed
-func IsDefaultAnnotation(obj metav1.ObjectMeta) bool {
- if obj.Annotations[IsDefaultStorageClassAnnotation] == "true" {
- return true
- }
- if obj.Annotations[BetaIsDefaultStorageClassAnnotation] == "true" {
- return true
- }
-
- return false
-}
diff --git a/pkg/apis/storage/v1/zz_generated.conversion.go b/pkg/apis/storage/v1/zz_generated.conversion.go
deleted file mode 100644
index 724b4e74f3..0000000000
--- a/pkg/apis/storage/v1/zz_generated.conversion.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by conversion-gen. Do not edit it manually!
-
-package v1
-
-import (
- conversion "k8s.io/apimachinery/pkg/conversion"
- runtime "k8s.io/apimachinery/pkg/runtime"
- storage "k8s.io/kubernetes/pkg/apis/storage"
- unsafe "unsafe"
-)
-
-func init() {
- SchemeBuilder.Register(RegisterConversions)
-}
-
-// RegisterConversions adds conversion functions to the given scheme.
-// Public to allow building arbitrary schemes.
-func RegisterConversions(scheme *runtime.Scheme) error {
- return scheme.AddGeneratedConversionFuncs(
- Convert_v1_StorageClass_To_storage_StorageClass,
- Convert_storage_StorageClass_To_v1_StorageClass,
- Convert_v1_StorageClassList_To_storage_StorageClassList,
- Convert_storage_StorageClassList_To_v1_StorageClassList,
- )
-}
-
-func autoConvert_v1_StorageClass_To_storage_StorageClass(in *StorageClass, out *storage.StorageClass, s conversion.Scope) error {
- out.ObjectMeta = in.ObjectMeta
- out.Provisioner = in.Provisioner
- out.Parameters = *(*map[string]string)(unsafe.Pointer(&in.Parameters))
- return nil
-}
-
-func Convert_v1_StorageClass_To_storage_StorageClass(in *StorageClass, out *storage.StorageClass, s conversion.Scope) error {
- return autoConvert_v1_StorageClass_To_storage_StorageClass(in, out, s)
-}
-
-func autoConvert_storage_StorageClass_To_v1_StorageClass(in *storage.StorageClass, out *StorageClass, s conversion.Scope) error {
- out.ObjectMeta = in.ObjectMeta
- out.Provisioner = in.Provisioner
- out.Parameters = *(*map[string]string)(unsafe.Pointer(&in.Parameters))
- return nil
-}
-
-func Convert_storage_StorageClass_To_v1_StorageClass(in *storage.StorageClass, out *StorageClass, s conversion.Scope) error {
- return autoConvert_storage_StorageClass_To_v1_StorageClass(in, out, s)
-}
-
-func autoConvert_v1_StorageClassList_To_storage_StorageClassList(in *StorageClassList, out *storage.StorageClassList, s conversion.Scope) error {
- out.ListMeta = in.ListMeta
- out.Items = *(*[]storage.StorageClass)(unsafe.Pointer(&in.Items))
- return nil
-}
-
-func Convert_v1_StorageClassList_To_storage_StorageClassList(in *StorageClassList, out *storage.StorageClassList, s conversion.Scope) error {
- return autoConvert_v1_StorageClassList_To_storage_StorageClassList(in, out, s)
-}
-
-func autoConvert_storage_StorageClassList_To_v1_StorageClassList(in *storage.StorageClassList, out *StorageClassList, s conversion.Scope) error {
- out.ListMeta = in.ListMeta
- out.Items = *(*[]StorageClass)(unsafe.Pointer(&in.Items))
- return nil
-}
-
-func Convert_storage_StorageClassList_To_v1_StorageClassList(in *storage.StorageClassList, out *StorageClassList, s conversion.Scope) error {
- return autoConvert_storage_StorageClassList_To_v1_StorageClassList(in, out, s)
-}
diff --git a/pkg/apis/storage/v1/zz_generated.deepcopy.go b/pkg/apis/storage/v1/zz_generated.deepcopy.go
deleted file mode 100644
index 8b3786ab19..0000000000
--- a/pkg/apis/storage/v1/zz_generated.deepcopy.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package v1
-
-import (
- meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- conversion "k8s.io/apimachinery/pkg/conversion"
- runtime "k8s.io/apimachinery/pkg/runtime"
- reflect "reflect"
-)
-
-func init() {
- SchemeBuilder.Register(RegisterDeepCopies)
-}
-
-// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
-// to allow building arbitrary schemes.
-func RegisterDeepCopies(scheme *runtime.Scheme) error {
- return scheme.AddGeneratedDeepCopyFuncs(
- conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_StorageClass, InType: reflect.TypeOf(&StorageClass{})},
- conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_StorageClassList, InType: reflect.TypeOf(&StorageClassList{})},
- )
-}
-
-func DeepCopy_v1_StorageClass(in interface{}, out interface{}, c *conversion.Cloner) error {
- {
- in := in.(*StorageClass)
- out := out.(*StorageClass)
- *out = *in
- if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
- return err
- } else {
- out.ObjectMeta = *newVal.(*meta_v1.ObjectMeta)
- }
- if in.Parameters != nil {
- in, out := &in.Parameters, &out.Parameters
- *out = make(map[string]string)
- for key, val := range *in {
- (*out)[key] = val
- }
- }
- return nil
- }
-}
-
-func DeepCopy_v1_StorageClassList(in interface{}, out interface{}, c *conversion.Cloner) error {
- {
- in := in.(*StorageClassList)
- out := out.(*StorageClassList)
- *out = *in
- if in.Items != nil {
- in, out := &in.Items, &out.Items
- *out = make([]StorageClass, len(*in))
- for i := range *in {
- if err := DeepCopy_v1_StorageClass(&(*in)[i], &(*out)[i], c); err != nil {
- return err
- }
- }
- }
- return nil
- }
-}
diff --git a/pkg/apis/storage/v1/zz_generated.defaults.go b/pkg/apis/storage/v1/zz_generated.defaults.go
deleted file mode 100644
index 6df448eb9f..0000000000
--- a/pkg/apis/storage/v1/zz_generated.defaults.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by defaulter-gen. Do not edit it manually!
-
-package v1
-
-import (
- runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// RegisterDefaults adds defaulters functions to the given scheme.
-// Public to allow building arbitrary schemes.
-// All generated defaulters are covering - they call all nested defaulters.
-func RegisterDefaults(scheme *runtime.Scheme) error {
- return nil
-}
diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD
index 0104b216ef..9c7145e514 100644
--- a/pkg/client/clientset_generated/clientset/BUILD
+++ b/pkg/client/clientset_generated/clientset/BUILD
@@ -43,7 +43,6 @@ go_library(
"//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/client-go/discovery",
@@ -80,7 +79,6 @@ filegroup(
"//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:all-srcs",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1:all-srcs",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:all-srcs",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1:all-srcs",
"//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:all-srcs",
],
tags = ["automanaged"],
diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go
index f516cd9564..f6644a0cd6 100644
--- a/pkg/client/clientset_generated/clientset/clientset.go
+++ b/pkg/client/clientset_generated/clientset/clientset.go
@@ -36,7 +36,6 @@ import (
policyv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1"
rbacv1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1"
rbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1"
- storagev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1"
storagev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1"
)
@@ -78,9 +77,8 @@ type Interface interface {
Rbac() rbacv1beta1.RbacV1beta1Interface
RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface
StorageV1beta1() storagev1beta1.StorageV1beta1Interface
- StorageV1() storagev1.StorageV1Interface
// Deprecated: please explicitly pick a version if possible.
- Storage() storagev1.StorageV1Interface
+ Storage() storagev1beta1.StorageV1beta1Interface
}
// Clientset contains the clients for groups. Each group has exactly one
@@ -103,7 +101,6 @@ type Clientset struct {
*rbacv1beta1.RbacV1beta1Client
*rbacv1alpha1.RbacV1alpha1Client
*storagev1beta1.StorageV1beta1Client
- *storagev1.StorageV1Client
}
// CoreV1 retrieves the CoreV1Client
@@ -324,21 +321,13 @@ func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface {
return c.StorageV1beta1Client
}
-// StorageV1 retrieves the StorageV1Client
-func (c *Clientset) StorageV1() storagev1.StorageV1Interface {
- if c == nil {
- return nil
- }
- return c.StorageV1Client
-}
-
// Deprecated: Storage retrieves the default version of StorageClient.
// Please explicitly pick a version.
-func (c *Clientset) Storage() storagev1.StorageV1Interface {
+func (c *Clientset) Storage() storagev1beta1.StorageV1beta1Interface {
if c == nil {
return nil
}
- return c.StorageV1Client
+ return c.StorageV1beta1Client
}
// Discovery retrieves the DiscoveryClient
@@ -421,10 +410,6 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
if err != nil {
return nil, err
}
- cs.StorageV1Client, err = storagev1.NewForConfig(&configShallowCopy)
- if err != nil {
- return nil, err
- }
cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil {
@@ -454,7 +439,6 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
cs.RbacV1beta1Client = rbacv1beta1.NewForConfigOrDie(c)
cs.RbacV1alpha1Client = rbacv1alpha1.NewForConfigOrDie(c)
cs.StorageV1beta1Client = storagev1beta1.NewForConfigOrDie(c)
- cs.StorageV1Client = storagev1.NewForConfigOrDie(c)
cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
return &cs
@@ -479,7 +463,6 @@ func New(c rest.Interface) *Clientset {
cs.RbacV1beta1Client = rbacv1beta1.New(c)
cs.RbacV1alpha1Client = rbacv1alpha1.New(c)
cs.StorageV1beta1Client = storagev1beta1.New(c)
- cs.StorageV1Client = storagev1.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs
diff --git a/pkg/client/clientset_generated/clientset/fake/BUILD b/pkg/client/clientset_generated/clientset/fake/BUILD
index f2d9e6dd56..f4941cd7af 100644
--- a/pkg/client/clientset_generated/clientset/fake/BUILD
+++ b/pkg/client/clientset_generated/clientset/fake/BUILD
@@ -47,8 +47,6 @@ go_library(
"//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake:go_default_library",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1:go_default_library",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1/fake:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/runtime",
diff --git a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
index 4049b18d1a..6642b0186d 100644
--- a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
+++ b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
@@ -54,8 +54,6 @@ import (
fakerbacv1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake"
rbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1"
fakerbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake"
- storagev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1"
- fakestoragev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1/fake"
storagev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1"
fakestoragev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake"
)
@@ -223,12 +221,7 @@ func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface {
return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake}
}
-// StorageV1 retrieves the StorageV1Client
-func (c *Clientset) StorageV1() storagev1.StorageV1Interface {
- return &fakestoragev1.FakeStorageV1{Fake: &c.Fake}
-}
-
-// Storage retrieves the StorageV1Client
-func (c *Clientset) Storage() storagev1.StorageV1Interface {
- return &fakestoragev1.FakeStorageV1{Fake: &c.Fake}
+// Storage retrieves the StorageV1beta1Client
+func (c *Clientset) Storage() storagev1beta1.StorageV1beta1Interface {
+ return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake}
}
diff --git a/pkg/client/clientset_generated/clientset/scheme/BUILD b/pkg/client/clientset_generated/clientset/scheme/BUILD
index 1f93eeae8e..9d5a7e4c63 100644
--- a/pkg/client/clientset_generated/clientset/scheme/BUILD
+++ b/pkg/client/clientset_generated/clientset/scheme/BUILD
@@ -30,7 +30,6 @@ go_library(
"//pkg/apis/policy/v1beta1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go
index a1019ba7dd..5eb779d5c2 100644
--- a/pkg/client/clientset_generated/clientset/scheme/register.go
+++ b/pkg/client/clientset_generated/clientset/scheme/register.go
@@ -36,7 +36,6 @@ import (
policyv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
- storagev1 "k8s.io/kubernetes/pkg/apis/storage/v1"
storagev1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
)
@@ -80,6 +79,5 @@ func AddToScheme(scheme *runtime.Scheme) {
rbacv1beta1.AddToScheme(scheme)
rbacv1alpha1.AddToScheme(scheme)
storagev1beta1.AddToScheme(scheme)
- storagev1.AddToScheme(scheme)
}
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1/BUILD
deleted file mode 100644
index 290a7731c4..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/BUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = [
- "doc.go",
- "generated_expansion.go",
- "storage_client.go",
- "storageclass.go",
- ],
- tags = ["automanaged"],
- deps = [
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/client/clientset_generated/clientset/scheme:go_default_library",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
- "//vendor:k8s.io/apimachinery/pkg/types",
- "//vendor:k8s.io/apimachinery/pkg/watch",
- "//vendor:k8s.io/client-go/rest",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [
- ":package-srcs",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1/fake:all-srcs",
- ],
- tags = ["automanaged"],
-)
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/doc.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/doc.go
deleted file mode 100644
index 54673bfa73..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This package is generated by client-gen with custom arguments.
-
-// This package has the automatically generated typed clients.
-package v1
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/BUILD
deleted file mode 100644
index 1a5b93d1fd..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/BUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = [
- "doc.go",
- "fake_storage_client.go",
- "fake_storageclass.go",
- ],
- tags = ["automanaged"],
- deps = [
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/client/clientset_generated/clientset/typed/storage/v1:go_default_library",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- "//vendor:k8s.io/apimachinery/pkg/labels",
- "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
- "//vendor:k8s.io/apimachinery/pkg/types",
- "//vendor:k8s.io/apimachinery/pkg/watch",
- "//vendor:k8s.io/client-go/rest",
- "//vendor:k8s.io/client-go/testing",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [":package-srcs"],
- tags = ["automanaged"],
-)
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/doc.go
deleted file mode 100644
index c6548330a0..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This package is generated by client-gen with custom arguments.
-
-// Package fake has the automatically generated clients.
-package fake
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storage_client.go
deleted file mode 100644
index b159c7f476..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storage_client.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fake
-
-import (
- rest "k8s.io/client-go/rest"
- testing "k8s.io/client-go/testing"
- v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1"
-)
-
-type FakeStorageV1 struct {
- *testing.Fake
-}
-
-func (c *FakeStorageV1) StorageClasses() v1.StorageClassInterface {
- return &FakeStorageClasses{c}
-}
-
-// RESTClient returns a RESTClient that is used to communicate
-// with API server by this client implementation.
-func (c *FakeStorageV1) RESTClient() rest.Interface {
- var ret *rest.RESTClient
- return ret
-}
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go
deleted file mode 100644
index 89eee2e000..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fake
-
-import (
- meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- labels "k8s.io/apimachinery/pkg/labels"
- schema "k8s.io/apimachinery/pkg/runtime/schema"
- types "k8s.io/apimachinery/pkg/types"
- watch "k8s.io/apimachinery/pkg/watch"
- testing "k8s.io/client-go/testing"
- v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
-)
-
-// FakeStorageClasses implements StorageClassInterface
-type FakeStorageClasses struct {
- Fake *FakeStorageV1
-}
-
-var storageclassesResource = schema.GroupVersionResource{Group: "storage.k8s.io", Version: "v1", Resource: "storageclasses"}
-
-func (c *FakeStorageClasses) Create(storageClass *v1.StorageClass) (result *v1.StorageClass, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewRootCreateAction(storageclassesResource, storageClass), &v1.StorageClass{})
- if obj == nil {
- return nil, err
- }
- return obj.(*v1.StorageClass), err
-}
-
-func (c *FakeStorageClasses) Update(storageClass *v1.StorageClass) (result *v1.StorageClass, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewRootUpdateAction(storageclassesResource, storageClass), &v1.StorageClass{})
- if obj == nil {
- return nil, err
- }
- return obj.(*v1.StorageClass), err
-}
-
-func (c *FakeStorageClasses) Delete(name string, options *meta_v1.DeleteOptions) error {
- _, err := c.Fake.
- Invokes(testing.NewRootDeleteAction(storageclassesResource, name), &v1.StorageClass{})
- return err
-}
-
-func (c *FakeStorageClasses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
- action := testing.NewRootDeleteCollectionAction(storageclassesResource, listOptions)
-
- _, err := c.Fake.Invokes(action, &v1.StorageClassList{})
- return err
-}
-
-func (c *FakeStorageClasses) Get(name string, options meta_v1.GetOptions) (result *v1.StorageClass, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewRootGetAction(storageclassesResource, name), &v1.StorageClass{})
- if obj == nil {
- return nil, err
- }
- return obj.(*v1.StorageClass), err
-}
-
-func (c *FakeStorageClasses) List(opts meta_v1.ListOptions) (result *v1.StorageClassList, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewRootListAction(storageclassesResource, opts), &v1.StorageClassList{})
- if obj == nil {
- return nil, err
- }
-
- label, _, _ := testing.ExtractFromListOptions(opts)
- if label == nil {
- label = labels.Everything()
- }
- list := &v1.StorageClassList{}
- for _, item := range obj.(*v1.StorageClassList).Items {
- if label.Matches(labels.Set(item.Labels)) {
- list.Items = append(list.Items, item)
- }
- }
- return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested storageClasses.
-func (c *FakeStorageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
- return c.Fake.
- InvokesWatch(testing.NewRootWatchAction(storageclassesResource, opts))
-}
-
-// Patch applies the patch and returns the patched storageClass.
-func (c *FakeStorageClasses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.StorageClass, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewRootPatchSubresourceAction(storageclassesResource, name, data, subresources...), &v1.StorageClass{})
- if obj == nil {
- return nil, err
- }
- return obj.(*v1.StorageClass), err
-}
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/generated_expansion.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/generated_expansion.go
deleted file mode 100644
index 39df9fb879..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/generated_expansion.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-type StorageClassExpansion interface{}
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go
deleted file mode 100644
index 5d37d8417c..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-import (
- serializer "k8s.io/apimachinery/pkg/runtime/serializer"
- rest "k8s.io/client-go/rest"
- v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
- "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme"
-)
-
-type StorageV1Interface interface {
- RESTClient() rest.Interface
- StorageClassesGetter
-}
-
-// StorageV1Client is used to interact with features provided by the storage.k8s.io group.
-type StorageV1Client struct {
- restClient rest.Interface
-}
-
-func (c *StorageV1Client) StorageClasses() StorageClassInterface {
- return newStorageClasses(c)
-}
-
-// NewForConfig creates a new StorageV1Client for the given config.
-func NewForConfig(c *rest.Config) (*StorageV1Client, error) {
- config := *c
- if err := setConfigDefaults(&config); err != nil {
- return nil, err
- }
- client, err := rest.RESTClientFor(&config)
- if err != nil {
- return nil, err
- }
- return &StorageV1Client{client}, nil
-}
-
-// NewForConfigOrDie creates a new StorageV1Client for the given config and
-// panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *StorageV1Client {
- client, err := NewForConfig(c)
- if err != nil {
- panic(err)
- }
- return client
-}
-
-// New creates a new StorageV1Client for the given RESTClient.
-func New(c rest.Interface) *StorageV1Client {
- return &StorageV1Client{c}
-}
-
-func setConfigDefaults(config *rest.Config) error {
- gv := v1.SchemeGroupVersion
- config.GroupVersion = &gv
- config.APIPath = "/apis"
- config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
-
- if config.UserAgent == "" {
- config.UserAgent = rest.DefaultKubernetesUserAgent()
- }
-
- return nil
-}
-
-// RESTClient returns a RESTClient that is used to communicate
-// with API server by this client implementation.
-func (c *StorageV1Client) RESTClient() rest.Interface {
- if c == nil {
- return nil
- }
- return c.restClient
-}
diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go
deleted file mode 100644
index 3a1efa0163..0000000000
--- a/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1
-
-import (
- meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- types "k8s.io/apimachinery/pkg/types"
- watch "k8s.io/apimachinery/pkg/watch"
- rest "k8s.io/client-go/rest"
- v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
- scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme"
-)
-
-// StorageClassesGetter has a method to return a StorageClassInterface.
-// A group's client should implement this interface.
-type StorageClassesGetter interface {
- StorageClasses() StorageClassInterface
-}
-
-// StorageClassInterface has methods to work with StorageClass resources.
-type StorageClassInterface interface {
- Create(*v1.StorageClass) (*v1.StorageClass, error)
- Update(*v1.StorageClass) (*v1.StorageClass, error)
- Delete(name string, options *meta_v1.DeleteOptions) error
- DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
- Get(name string, options meta_v1.GetOptions) (*v1.StorageClass, error)
- List(opts meta_v1.ListOptions) (*v1.StorageClassList, error)
- Watch(opts meta_v1.ListOptions) (watch.Interface, error)
- Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.StorageClass, err error)
- StorageClassExpansion
-}
-
-// storageClasses implements StorageClassInterface
-type storageClasses struct {
- client rest.Interface
-}
-
-// newStorageClasses returns a StorageClasses
-func newStorageClasses(c *StorageV1Client) *storageClasses {
- return &storageClasses{
- client: c.RESTClient(),
- }
-}
-
-// Create takes the representation of a storageClass and creates it. Returns the server's representation of the storageClass, and an error, if there is any.
-func (c *storageClasses) Create(storageClass *v1.StorageClass) (result *v1.StorageClass, err error) {
- result = &v1.StorageClass{}
- err = c.client.Post().
- Resource("storageclasses").
- Body(storageClass).
- Do().
- Into(result)
- return
-}
-
-// Update takes the representation of a storageClass and updates it. Returns the server's representation of the storageClass, and an error, if there is any.
-func (c *storageClasses) Update(storageClass *v1.StorageClass) (result *v1.StorageClass, err error) {
- result = &v1.StorageClass{}
- err = c.client.Put().
- Resource("storageclasses").
- Name(storageClass.Name).
- Body(storageClass).
- Do().
- Into(result)
- return
-}
-
-// Delete takes name of the storageClass and deletes it. Returns an error if one occurs.
-func (c *storageClasses) Delete(name string, options *meta_v1.DeleteOptions) error {
- return c.client.Delete().
- Resource("storageclasses").
- Name(name).
- Body(options).
- Do().
- Error()
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *storageClasses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
- return c.client.Delete().
- Resource("storageclasses").
- VersionedParams(&listOptions, scheme.ParameterCodec).
- Body(options).
- Do().
- Error()
-}
-
-// Get takes name of the storageClass, and returns the corresponding storageClass object, and an error if there is any.
-func (c *storageClasses) Get(name string, options meta_v1.GetOptions) (result *v1.StorageClass, err error) {
- result = &v1.StorageClass{}
- err = c.client.Get().
- Resource("storageclasses").
- Name(name).
- VersionedParams(&options, scheme.ParameterCodec).
- Do().
- Into(result)
- return
-}
-
-// List takes label and field selectors, and returns the list of StorageClasses that match those selectors.
-func (c *storageClasses) List(opts meta_v1.ListOptions) (result *v1.StorageClassList, err error) {
- result = &v1.StorageClassList{}
- err = c.client.Get().
- Resource("storageclasses").
- VersionedParams(&opts, scheme.ParameterCodec).
- Do().
- Into(result)
- return
-}
-
-// Watch returns a watch.Interface that watches the requested storageClasses.
-func (c *storageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
- opts.Watch = true
- return c.client.Get().
- Resource("storageclasses").
- VersionedParams(&opts, scheme.ParameterCodec).
- Watch()
-}
-
-// Patch applies the patch and returns the patched storageClass.
-func (c *storageClasses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.StorageClass, err error) {
- result = &v1.StorageClass{}
- err = c.client.Patch(pt).
- Resource("storageclasses").
- SubResource(subresources...).
- Name(name).
- Body(data).
- Do().
- Into(result)
- return
-}
diff --git a/pkg/client/informers/informers_generated/externalversions/BUILD b/pkg/client/informers/informers_generated/externalversions/BUILD
index 3b85fce0c8..34c5ad2250 100644
--- a/pkg/client/informers/informers_generated/externalversions/BUILD
+++ b/pkg/client/informers/informers_generated/externalversions/BUILD
@@ -26,7 +26,6 @@ go_library(
"//pkg/apis/policy/v1beta1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/informers/informers_generated/externalversions/apps:go_default_library",
diff --git a/pkg/client/informers/informers_generated/externalversions/generic.go b/pkg/client/informers/informers_generated/externalversions/generic.go
index fa30928b79..d7048369fa 100644
--- a/pkg/client/informers/informers_generated/externalversions/generic.go
+++ b/pkg/client/informers/informers_generated/externalversions/generic.go
@@ -33,7 +33,6 @@ import (
policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
- storage_v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
)
@@ -161,10 +160,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
case rbac_v1beta1.SchemeGroupVersion.WithResource("rolebindings"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Rbac().V1beta1().RoleBindings().Informer()}, nil
- // Group=Storage, Version=V1
- case storage_v1.SchemeGroupVersion.WithResource("storageclasses"):
- return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1().StorageClasses().Informer()}, nil
-
// Group=Storage, Version=V1beta1
case storage_v1beta1.SchemeGroupVersion.WithResource("storageclasses"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1beta1().StorageClasses().Informer()}, nil
diff --git a/pkg/client/informers/informers_generated/externalversions/storage/BUILD b/pkg/client/informers/informers_generated/externalversions/storage/BUILD
index 981d33744f..abeaabf5e6 100644
--- a/pkg/client/informers/informers_generated/externalversions/storage/BUILD
+++ b/pkg/client/informers/informers_generated/externalversions/storage/BUILD
@@ -13,7 +13,6 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
- "//pkg/client/informers/informers_generated/externalversions/storage/v1:go_default_library",
"//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:go_default_library",
],
)
@@ -29,7 +28,6 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
- "//pkg/client/informers/informers_generated/externalversions/storage/v1:all-srcs",
"//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:all-srcs",
],
tags = ["automanaged"],
diff --git a/pkg/client/informers/informers_generated/externalversions/storage/interface.go b/pkg/client/informers/informers_generated/externalversions/storage/interface.go
index 96e8eae8c6..1d538d1e10 100644
--- a/pkg/client/informers/informers_generated/externalversions/storage/interface.go
+++ b/pkg/client/informers/informers_generated/externalversions/storage/interface.go
@@ -20,14 +20,11 @@ package storage
import (
internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
- v1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1"
v1beta1 "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1beta1"
)
// Interface provides access to each of this group's versions.
type Interface interface {
- // V1 provides access to shared informers for resources in V1.
- V1() v1.Interface
// V1beta1 provides access to shared informers for resources in V1beta1.
V1beta1() v1beta1.Interface
}
@@ -41,11 +38,6 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
return &group{f}
}
-// V1 returns a new v1.Interface.
-func (g *group) V1() v1.Interface {
- return v1.New(g.SharedInformerFactory)
-}
-
// V1beta1 returns a new v1beta1.Interface.
func (g *group) V1beta1() v1beta1.Interface {
return v1beta1.New(g.SharedInformerFactory)
diff --git a/pkg/client/informers/informers_generated/externalversions/storage/v1/BUILD b/pkg/client/informers/informers_generated/externalversions/storage/v1/BUILD
deleted file mode 100644
index 8a3e126fb0..0000000000
--- a/pkg/client/informers/informers_generated/externalversions/storage/v1/BUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = [
- "interface.go",
- "storageclass.go",
- ],
- tags = ["automanaged"],
- deps = [
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/client/clientset_generated/clientset:go_default_library",
- "//pkg/client/informers/informers_generated/externalversions/internalinterfaces:go_default_library",
- "//pkg/client/listers/storage/v1:go_default_library",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- "//vendor:k8s.io/apimachinery/pkg/runtime",
- "//vendor:k8s.io/apimachinery/pkg/watch",
- "//vendor:k8s.io/client-go/tools/cache",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [":package-srcs"],
- tags = ["automanaged"],
-)
diff --git a/pkg/client/informers/informers_generated/externalversions/storage/v1/interface.go b/pkg/client/informers/informers_generated/externalversions/storage/v1/interface.go
deleted file mode 100644
index 370a0ff4c8..0000000000
--- a/pkg/client/informers/informers_generated/externalversions/storage/v1/interface.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was automatically generated by informer-gen
-
-package v1
-
-import (
- internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
-)
-
-// Interface provides access to all the informers in this group version.
-type Interface interface {
- // StorageClasses returns a StorageClassInformer.
- StorageClasses() StorageClassInformer
-}
-
-type version struct {
- internalinterfaces.SharedInformerFactory
-}
-
-// New returns a new Interface.
-func New(f internalinterfaces.SharedInformerFactory) Interface {
- return &version{f}
-}
-
-// StorageClasses returns a StorageClassInformer.
-func (v *version) StorageClasses() StorageClassInformer {
- return &storageClassInformer{factory: v.SharedInformerFactory}
-}
diff --git a/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go b/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go
deleted file mode 100644
index cd3b293397..0000000000
--- a/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was automatically generated by informer-gen
-
-package v1
-
-import (
- meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- runtime "k8s.io/apimachinery/pkg/runtime"
- watch "k8s.io/apimachinery/pkg/watch"
- cache "k8s.io/client-go/tools/cache"
- storage_v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
- clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
- internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces"
- v1 "k8s.io/kubernetes/pkg/client/listers/storage/v1"
- time "time"
-)
-
-// StorageClassInformer provides access to a shared informer and lister for
-// StorageClasses.
-type StorageClassInformer interface {
- Informer() cache.SharedIndexInformer
- Lister() v1.StorageClassLister
-}
-
-type storageClassInformer struct {
- factory internalinterfaces.SharedInformerFactory
-}
-
-func newStorageClassInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
- sharedIndexInformer := cache.NewSharedIndexInformer(
- &cache.ListWatch{
- ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
- return client.StorageV1().StorageClasses().List(options)
- },
- WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
- return client.StorageV1().StorageClasses().Watch(options)
- },
- },
- &storage_v1.StorageClass{},
- resyncPeriod,
- cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
- )
-
- return sharedIndexInformer
-}
-
-func (f *storageClassInformer) Informer() cache.SharedIndexInformer {
- return f.factory.InformerFor(&storage_v1.StorageClass{}, newStorageClassInformer)
-}
-
-func (f *storageClassInformer) Lister() v1.StorageClassLister {
- return v1.NewStorageClassLister(f.Informer().GetIndexer())
-}
diff --git a/pkg/client/listers/storage/v1/BUILD b/pkg/client/listers/storage/v1/BUILD
deleted file mode 100644
index 7cc47a31ae..0000000000
--- a/pkg/client/listers/storage/v1/BUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
- "@io_bazel_rules_go//go:def.bzl",
- "go_library",
-)
-
-go_library(
- name = "go_default_library",
- srcs = [
- "expansion_generated.go",
- "storageclass.go",
- ],
- tags = ["automanaged"],
- deps = [
- "//pkg/apis/storage:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
- "//vendor:k8s.io/apimachinery/pkg/api/errors",
- "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
- "//vendor:k8s.io/apimachinery/pkg/labels",
- "//vendor:k8s.io/client-go/tools/cache",
- ],
-)
-
-filegroup(
- name = "package-srcs",
- srcs = glob(["**"]),
- tags = ["automanaged"],
- visibility = ["//visibility:private"],
-)
-
-filegroup(
- name = "all-srcs",
- srcs = [":package-srcs"],
- tags = ["automanaged"],
-)
diff --git a/pkg/client/listers/storage/v1/expansion_generated.go b/pkg/client/listers/storage/v1/expansion_generated.go
deleted file mode 100644
index 2353b59d3f..0000000000
--- a/pkg/client/listers/storage/v1/expansion_generated.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was automatically generated by lister-gen
-
-package v1
-
-// StorageClassListerExpansion allows custom methods to be added to
-// StorageClassLister.
-type StorageClassListerExpansion interface{}
diff --git a/pkg/client/listers/storage/v1/storageclass.go b/pkg/client/listers/storage/v1/storageclass.go
deleted file mode 100644
index 4895367c78..0000000000
--- a/pkg/client/listers/storage/v1/storageclass.go
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was automatically generated by lister-gen
-
-package v1
-
-import (
- "k8s.io/apimachinery/pkg/api/errors"
- meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/labels"
- "k8s.io/client-go/tools/cache"
- storage "k8s.io/kubernetes/pkg/apis/storage"
- v1 "k8s.io/kubernetes/pkg/apis/storage/v1"
-)
-
-// StorageClassLister helps list StorageClasses.
-type StorageClassLister interface {
- // List lists all StorageClasses in the indexer.
- List(selector labels.Selector) (ret []*v1.StorageClass, err error)
- // Get retrieves the StorageClass from the index for a given name.
- Get(name string) (*v1.StorageClass, error)
- StorageClassListerExpansion
-}
-
-// storageClassLister implements the StorageClassLister interface.
-type storageClassLister struct {
- indexer cache.Indexer
-}
-
-// NewStorageClassLister returns a new StorageClassLister.
-func NewStorageClassLister(indexer cache.Indexer) StorageClassLister {
- return &storageClassLister{indexer: indexer}
-}
-
-// List lists all StorageClasses in the indexer.
-func (s *storageClassLister) List(selector labels.Selector) (ret []*v1.StorageClass, err error) {
- err = cache.ListAll(s.indexer, selector, func(m interface{}) {
- ret = append(ret, m.(*v1.StorageClass))
- })
- return ret, err
-}
-
-// Get retrieves the StorageClass from the index for a given name.
-func (s *storageClassLister) Get(name string) (*v1.StorageClass, error) {
- key := &v1.StorageClass{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
- obj, exists, err := s.indexer.Get(key)
- if err != nil {
- return nil, err
- }
- if !exists {
- return nil, errors.NewNotFound(storage.Resource("storageclass"), name)
- }
- return obj.(*v1.StorageClass), nil
-}
diff --git a/pkg/controller/informers/BUILD b/pkg/controller/informers/BUILD
index f7c612b6f0..bab1b0109d 100644
--- a/pkg/controller/informers/BUILD
+++ b/pkg/controller/informers/BUILD
@@ -27,7 +27,7 @@ go_library(
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/rbac:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
+ "//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/client/legacylisters:go_default_library",
diff --git a/pkg/controller/informers/storage.go b/pkg/controller/informers/storage.go
index 1730fdbbad..db3898c05d 100644
--- a/pkg/controller/informers/storage.go
+++ b/pkg/controller/informers/storage.go
@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/tools/cache"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/client/legacylisters"
)
diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD
index df04fb9d66..b33660b39b 100644
--- a/pkg/controller/volume/persistentvolume/BUILD
+++ b/pkg/controller/volume/persistentvolume/BUILD
@@ -20,13 +20,13 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/apis/storage/v1/util:go_default_library",
+ "//pkg/apis/storage/v1beta1:go_default_library",
+ "//pkg/apis/storage/v1beta1/util:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library",
- "//pkg/client/informers/informers_generated/externalversions/storage/v1:go_default_library",
+ "//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:go_default_library",
"//pkg/client/listers/core/v1:go_default_library",
- "//pkg/client/listers/storage/v1:go_default_library",
+ "//pkg/client/listers/storage/v1beta1:go_default_library",
"//pkg/cloudprovider:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/util/goroutinemap:go_default_library",
@@ -66,12 +66,12 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/v1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/apis/storage/v1/util:go_default_library",
+ "//pkg/apis/storage/v1beta1:go_default_library",
+ "//pkg/apis/storage/v1beta1/util:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset/fake:go_default_library",
"//pkg/client/informers/informers_generated/externalversions:go_default_library",
- "//pkg/client/listers/storage/v1:go_default_library",
+ "//pkg/client/listers/storage/v1beta1:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/volume:go_default_library",
"//vendor:github.com/golang/glog",
diff --git a/pkg/controller/volume/persistentvolume/binder_test.go b/pkg/controller/volume/persistentvolume/binder_test.go
index 981bbb9dff..b232b3d903 100644
--- a/pkg/controller/volume/persistentvolume/binder_test.go
+++ b/pkg/controller/volume/persistentvolume/binder_test.go
@@ -20,8 +20,8 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
)
// Test single call to syncClaim and syncVolume methods.
diff --git a/pkg/controller/volume/persistentvolume/delete_test.go b/pkg/controller/volume/persistentvolume/delete_test.go
index ff5ad66069..b4c3effc42 100644
--- a/pkg/controller/volume/persistentvolume/delete_test.go
+++ b/pkg/controller/volume/persistentvolume/delete_test.go
@@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
)
// Test single call to syncVolume, expecting recycling to happen.
diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go
index d44234ed41..d23fba4d61 100644
--- a/pkg/controller/volume/persistentvolume/framework_test.go
+++ b/pkg/controller/volume/persistentvolume/framework_test.go
@@ -42,12 +42,12 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"
- storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1"
+ storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1"
"k8s.io/kubernetes/pkg/controller"
vol "k8s.io/kubernetes/pkg/volume"
)
@@ -607,7 +607,7 @@ func newTestController(kubeClient clientset.Interface, informerFactory informers
VolumePlugins: []vol.VolumePlugin{},
VolumeInformer: informerFactory.Core().V1().PersistentVolumes(),
ClaimInformer: informerFactory.Core().V1().PersistentVolumeClaims(),
- ClassInformer: informerFactory.Storage().V1().StorageClasses(),
+ ClassInformer: informerFactory.Storage().V1beta1().StorageClasses(),
EventRecorder: record.NewFakeRecorder(1000),
EnableDynamicProvisioning: enableDynamicProvisioning,
}
diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go
index 407c150c28..059e33d927 100644
--- a/pkg/controller/volume/persistentvolume/index.go
+++ b/pkg/controller/volume/persistentvolume/index.go
@@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
)
// persistentVolumeOrderedIndex is a cache.Store that keeps persistent volumes
diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go
index 04fc59703d..b0e87e795b 100644
--- a/pkg/controller/volume/persistentvolume/index_test.go
+++ b/pkg/controller/volume/persistentvolume/index_test.go
@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
)
func makePVC(size string, modfn func(*v1.PersistentVolumeClaim)) *v1.PersistentVolumeClaim {
diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go
index 64632c2cf1..83e802d630 100644
--- a/pkg/controller/volume/persistentvolume/provision_test.go
+++ b/pkg/controller/volume/persistentvolume/provision_test.go
@@ -22,8 +22,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
)
var class1Parameters = map[string]string{
diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go
index abbe3ec373..212a85bff5 100644
--- a/pkg/controller/volume/persistentvolume/pv_controller.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller.go
@@ -28,11 +28,11 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
- storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1"
+ storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/util/goroutinemap"
vol "k8s.io/kubernetes/pkg/volume"
diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go
index 333c618a49..ee83a7e304 100644
--- a/pkg/controller/volume/persistentvolume/pv_controller_base.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go
@@ -34,10 +34,10 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"
- storageinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1"
+ storageinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1beta1"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/controller"
diff --git a/pkg/controller/volume/persistentvolume/recycle_test.go b/pkg/controller/volume/persistentvolume/recycle_test.go
index 1295ca5800..86681c5258 100644
--- a/pkg/controller/volume/persistentvolume/recycle_test.go
+++ b/pkg/controller/volume/persistentvolume/recycle_test.go
@@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
)
// Test single call to syncVolume, expecting recycling to happen.
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
index 6cfd205888..6ecc8da6ff 100644
--- a/pkg/generated/openapi/zz_generated.openapi.go
+++ b/pkg/generated/openapi/zz_generated.openapi.go
@@ -8925,104 +8925,6 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
Dependencies: []string{
"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"},
},
- "k8s.io/kubernetes/pkg/apis/storage/v1.StorageClass": {
- Schema: spec.Schema{
- SchemaProps: spec.SchemaProps{
- Description: "StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.\n\nStorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.",
- Properties: map[string]spec.Schema{
- "kind": {
- SchemaProps: spec.SchemaProps{
- Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
- Type: []string{"string"},
- Format: "",
- },
- },
- "apiVersion": {
- SchemaProps: spec.SchemaProps{
- Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources",
- Type: []string{"string"},
- Format: "",
- },
- },
- "metadata": {
- SchemaProps: spec.SchemaProps{
- Description: "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
- },
- },
- "provisioner": {
- SchemaProps: spec.SchemaProps{
- Description: "Provisioner indicates the type of the provisioner.",
- Type: []string{"string"},
- Format: "",
- },
- },
- "parameters": {
- SchemaProps: spec.SchemaProps{
- Description: "Parameters holds the parameters for the provisioner that should create volumes of this storage class.",
- Type: []string{"object"},
- AdditionalProperties: &spec.SchemaOrBool{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- },
- Required: []string{"provisioner"},
- },
- },
- Dependencies: []string{
- "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
- },
- "k8s.io/kubernetes/pkg/apis/storage/v1.StorageClassList": {
- Schema: spec.Schema{
- SchemaProps: spec.SchemaProps{
- Description: "StorageClassList is a collection of storage classes.",
- Properties: map[string]spec.Schema{
- "kind": {
- SchemaProps: spec.SchemaProps{
- Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
- Type: []string{"string"},
- Format: "",
- },
- },
- "apiVersion": {
- SchemaProps: spec.SchemaProps{
- Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources",
- Type: []string{"string"},
- Format: "",
- },
- },
- "metadata": {
- SchemaProps: spec.SchemaProps{
- Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
- },
- },
- "items": {
- SchemaProps: spec.SchemaProps{
- Description: "Items is the list of StorageClasses",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Ref: ref("k8s.io/kubernetes/pkg/apis/storage/v1.StorageClass"),
- },
- },
- },
- },
- },
- },
- Required: []string{"items"},
- },
- },
- Dependencies: []string{
- "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/kubernetes/pkg/apis/storage/v1.StorageClass"},
- },
"k8s.io/kubernetes/pkg/apis/authorization/v1.SubjectAccessReview": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
diff --git a/pkg/kubectl/cmd/util/shortcut_restmapper_test.go b/pkg/kubectl/cmd/util/shortcut_restmapper_test.go
index dfb32bf198..e4bee982c0 100644
--- a/pkg/kubectl/cmd/util/shortcut_restmapper_test.go
+++ b/pkg/kubectl/cmd/util/shortcut_restmapper_test.go
@@ -118,7 +118,7 @@ func TestKindFor(t *testing.T) {
}{
{
in: schema.GroupVersionResource{Group: "storage.k8s.io", Version: "", Resource: "sc"},
- expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1", Kind: "StorageClass"},
+ expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1beta1", Kind: "StorageClass"},
srvRes: []*metav1.APIResourceList{
{
GroupVersion: "storage.k8s.io/v1beta1",
@@ -133,7 +133,7 @@ func TestKindFor(t *testing.T) {
},
{
in: schema.GroupVersionResource{Group: "", Version: "", Resource: "sc"},
- expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1", Kind: "StorageClass"},
+ expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1beta1", Kind: "StorageClass"},
srvRes: []*metav1.APIResourceList{
{
GroupVersion: "storage.k8s.io/v1beta1",
diff --git a/pkg/master/BUILD b/pkg/master/BUILD
index 21e193704b..ecc134ffca 100644
--- a/pkg/master/BUILD
+++ b/pkg/master/BUILD
@@ -48,7 +48,6 @@ go_library(
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
"//pkg/apis/storage/install:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
diff --git a/pkg/master/master.go b/pkg/master/master.go
index 862d1067d7..d7a82eb10e 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -45,7 +45,6 @@ import (
policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
rbacapi "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
- storageapiv1 "k8s.io/kubernetes/pkg/apis/storage/v1"
storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
@@ -364,7 +363,6 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
policyapiv1beta1.SchemeGroupVersion,
rbacv1beta1.SchemeGroupVersion,
rbacapi.SchemeGroupVersion,
- storageapiv1.SchemeGroupVersion,
storageapiv1beta1.SchemeGroupVersion,
certificatesapiv1beta1.SchemeGroupVersion,
authorizationapiv1.SchemeGroupVersion,
diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD
index 755011c35b..d5fc84b07f 100644
--- a/pkg/registry/storage/rest/BUILD
+++ b/pkg/registry/storage/rest/BUILD
@@ -14,7 +14,6 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/apis/storage:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/registry/storage/storageclass/storage:go_default_library",
"//vendor:k8s.io/apiserver/pkg/registry/generic",
diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go
index c12f803824..31239b0021 100644
--- a/pkg/registry/storage/rest/storage_storage.go
+++ b/pkg/registry/storage/rest/storage_storage.go
@@ -23,7 +23,6 @@ import (
serverstorage "k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api"
storageapi "k8s.io/kubernetes/pkg/apis/storage"
- storageapiv1 "k8s.io/kubernetes/pkg/apis/storage/v1"
storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage"
)
@@ -38,10 +37,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
apiGroupInfo.VersionedResourcesStorageMap[storageapiv1beta1.SchemeGroupVersion.Version] = p.v1beta1Storage(apiResourceConfigSource, restOptionsGetter)
apiGroupInfo.GroupMeta.GroupVersion = storageapiv1beta1.SchemeGroupVersion
}
- if apiResourceConfigSource.AnyResourcesForVersionEnabled(storageapiv1.SchemeGroupVersion) {
- apiGroupInfo.VersionedResourcesStorageMap[storageapiv1.SchemeGroupVersion.Version] = p.v1Storage(apiResourceConfigSource, restOptionsGetter)
- apiGroupInfo.GroupMeta.GroupVersion = storageapiv1.SchemeGroupVersion
- }
return apiGroupInfo, true
}
@@ -59,19 +54,6 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
return storage
}
-func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) map[string]rest.Storage {
- version := storageapiv1.SchemeGroupVersion
-
- storage := map[string]rest.Storage{}
-
- if apiResourceConfigSource.ResourceEnabled(version.WithResource("storageclasses")) {
- storageClassStorage := storageclassstore.NewREST(restOptionsGetter)
- storage["storageclasses"] = storageClassStorage
- }
-
- return storage
-}
-
func (p RESTStorageProvider) GroupName() string {
return storageapi.GroupName
}
diff --git a/pkg/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD
index 78d0625f8d..bfb91555fc 100644
--- a/pkg/volume/glusterfs/BUILD
+++ b/pkg/volume/glusterfs/BUILD
@@ -19,7 +19,7 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/api/v1:go_default_library",
- "//pkg/apis/storage/v1/util:go_default_library",
+ "//pkg/apis/storage/v1beta1/util:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/mount:go_default_library",
diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go
index 3f5aa92ed9..016a8f257d 100644
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -35,7 +35,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/mount"
diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD
index 360a69e6e8..9bc536b0a6 100644
--- a/pkg/volume/util/BUILD
+++ b/pkg/volume/util/BUILD
@@ -22,7 +22,7 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/api/v1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
+ "//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/util/mount:go_default_library",
"//vendor:github.com/golang/glog",
diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go
index 90e8cdad0c..0112d394a7 100644
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -24,7 +24,7 @@ import (
"github.com/golang/glog"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/util/mount"
)
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 6b1041b8f9..d6a4c3c468 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -119,9 +119,8 @@ go_library(
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
"//pkg/apis/storage/util:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
- "//pkg/apis/storage/v1/util:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
+ "//pkg/apis/storage/v1beta1/util:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go
index f6576477c6..cc0524c6f5 100644
--- a/test/e2e/volume_provisioning.go
+++ b/test/e2e/volume_provisioning.go
@@ -24,11 +24,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/authentication/serviceaccount"
-
"k8s.io/kubernetes/pkg/api/v1"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/test/e2e/framework"
@@ -111,9 +110,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass")
class := newStorageClass("", "internal")
- // TODO change to StorageV1 once it's enabled in GKE
- _, err := c.StorageV1beta1().StorageClasses().Create(class)
- defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
+ _, err := c.Storage().StorageClasses().Create(class)
+ defer c.Storage().StorageClasses().Delete(class.Name, nil)
Expect(err).NotTo(HaveOccurred())
By("creating a claim with a dynamic provisioning annotation")
@@ -171,9 +169,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
sc := newStorageClass("kubernetes.io/gce-pd", suffix)
// Set an unmanaged zone.
sc.Parameters = map[string]string{"zone": unmanagedZone}
- // TODO change to StorageV1 once it's enabled in GKE
- sc, err = c.StorageV1beta1().StorageClasses().Create(sc)
- defer Expect(c.StorageV1beta1().StorageClasses().Delete(sc.Name, nil)).To(Succeed())
+ sc, err = c.Storage().StorageClasses().Create(sc)
+ defer Expect(c.Storage().StorageClasses().Delete(sc.Name, nil)).To(Succeed())
Expect(err).NotTo(HaveOccurred())
By("Creating a claim and expecting it to timeout")
@@ -227,9 +224,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass")
class := newStorageClass(externalPluginName, "external")
- // TODO change to StorageV1 once it's enabled in GKE
- _, err = c.StorageV1beta1().StorageClasses().Create(class)
- defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
+ _, err = c.Storage().StorageClasses().Create(class)
+ defer c.Storage().StorageClasses().Delete(class.Name, nil)
Expect(err).NotTo(HaveOccurred())
By("creating a claim with a dynamic provisioning annotation")
diff --git a/test/e2e/vsphere_utils.go b/test/e2e/vsphere_utils.go
index db59ef50db..cbc1d4dca1 100644
--- a/test/e2e/vsphere_utils.go
+++ b/test/e2e/vsphere_utils.go
@@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
vsphere "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere"
"k8s.io/kubernetes/pkg/volume/util/volumehelper"
diff --git a/test/e2e/vsphere_volume_diskformat.go b/test/e2e/vsphere_volume_diskformat.go
index 36dfa84cdc..2b0189a828 100644
--- a/test/e2e/vsphere_volume_diskformat.go
+++ b/test/e2e/vsphere_volume_diskformat.go
@@ -108,10 +108,10 @@ func invokeTest(client clientset.Interface, namespace string, nodeName string, n
By("Creating Storage Class With DiskFormat")
storageClassSpec := getVSphereStorageClassSpec("thinsc", scParameters)
- storageclass, err := client.StorageV1().StorageClasses().Create(storageClassSpec)
+ storageclass, err := client.StorageV1beta1().StorageClasses().Create(storageClassSpec)
Expect(err).NotTo(HaveOccurred())
- defer client.StorageV1().StorageClasses().Delete(storageclass.Name, nil)
+ defer client.StorageV1beta1().StorageClasses().Delete(storageclass.Name, nil)
By("Creating PVC using the Storage Class")
pvclaimSpec := getVSphereClaimSpecWithStorageClassAnnotation(namespace, storageclass)
diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD
index 41ef4d5f69..0b29120df9 100644
--- a/test/integration/framework/BUILD
+++ b/test/integration/framework/BUILD
@@ -26,7 +26,7 @@ go_library(
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/policy/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
- "//pkg/apis/storage/v1:go_default_library",
+ "//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go
index 82d1b15595..6d3ba75617 100644
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -58,7 +58,7 @@ import (
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
policy "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"
rbac "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go
index 3186c1a058..681099204f 100644
--- a/test/integration/storageclasses/storage_classes_test.go
+++ b/test/integration/storageclasses/storage_classes_test.go
@@ -28,8 +28,8 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/test/integration/framework"
)
diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go
index 6140332443..218d3843a5 100644
--- a/test/integration/volume/persistent_volumes_test.go
+++ b/test/integration/volume/persistent_volumes_test.go
@@ -33,8 +33,8 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
- storage "k8s.io/kubernetes/pkg/apis/storage/v1"
- storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
+ storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+ storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
@@ -1139,7 +1139,7 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio
Cloud: cloud,
VolumeInformer: informers.Core().V1().PersistentVolumes(),
ClaimInformer: informers.Core().V1().PersistentVolumeClaims(),
- ClassInformer: informers.Storage().V1().StorageClasses(),
+ ClassInformer: informers.Storage().V1beta1().StorageClasses(),
EnableDynamicProvisioning: true,
})