From 18722910ebb6662839ca8580f9c038ff08867415 Mon Sep 17 00:00:00 2001 From: Vladimir Vivien Date: Wed, 31 Jan 2018 13:31:44 -0500 Subject: [PATCH 1/2] CSI - Marking CSIPersistentVolumeSource Beta --- pkg/apis/core/types.go | 4 ++-- staging/src/k8s.io/api/core/v1/types.go | 4 ++-- staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index f6982d0d829..754be966650 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -391,7 +391,7 @@ type PersistentVolumeSource struct { // More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md // +optional StorageOS *StorageOSPersistentVolumeSource - // CSI (Container Storage Interface) represents storage that handled by an external CSI driver + // CSI (Container Storage Interface) represents storage that handled by an external CSI driver (Beta feature). // +optional CSI *CSIPersistentVolumeSource } @@ -1603,7 +1603,7 @@ type LocalVolumeSource struct { Path string } -// Represents storage that is managed by an external CSI volume driver +// Represents storage that is managed by an external CSI volume driver (Beta feature) type CSIPersistentVolumeSource struct { // Driver is the name of the driver to use for this volume. // Required. diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index d1b464fd406..9c86b363ca2 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -446,7 +446,7 @@ type PersistentVolumeSource struct { // More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md // +optional StorageOS *StorageOSPersistentVolumeSource `json:"storageos,omitempty" protobuf:"bytes,21,opt,name=storageos"` - // CSI represents storage that handled by an external CSI driver + // CSI represents storage that handled by an external CSI driver (Beta feature). // +optional CSI *CSIPersistentVolumeSource `json:"csi,omitempty" protobuf:"bytes,22,opt,name=csi"` } @@ -1717,7 +1717,7 @@ type LocalVolumeSource struct { Path string `json:"path" protobuf:"bytes,1,opt,name=path"` } -// Represents storage that is managed by an external CSI volume driver +// Represents storage that is managed by an external CSI volume driver (Beta feature) type CSIPersistentVolumeSource struct { // Driver is the name of the driver to use for this volume. // Required. diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 2c274b13d91..d0c66e7bdea 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -117,7 +117,7 @@ func (Binding) SwaggerDoc() map[string]string { } var map_CSIPersistentVolumeSource = map[string]string{ - "": "Represents storage that is managed by an external CSI volume driver", + "": "Represents storage that is managed by an external CSI volume driver (Beta feature)", "driver": "Driver is the name of the driver to use for this volume. Required.", "volumeHandle": "VolumeHandle is the unique volume name returned by the CSI volume plugin’s CreateVolume to refer to the volume on all subsequent calls. Required.", "readOnly": "Optional: The value to pass to ControllerPublishVolumeRequest. Defaults to false (read/write).", @@ -1276,7 +1276,7 @@ var map_PersistentVolumeSource = map[string]string{ "scaleIO": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.", "local": "Local represents directly-attached storage with node affinity", "storageos": "StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md", - "csi": "CSI represents storage that handled by an external CSI driver", + "csi": "CSI represents storage that handled by an external CSI driver (Beta feature).", } func (PersistentVolumeSource) SwaggerDoc() map[string]string { From b5deaf6136e1e398499819455a0a3ebc2b151199 Mon Sep 17 00:00:00 2001 From: Vladimir Vivien Date: Wed, 31 Jan 2018 17:00:40 -0500 Subject: [PATCH 2/2] CSI - Auto-generated code updates --- api/openapi-spec/swagger.json | 4 ++-- api/swagger-spec/v1.json | 4 ++-- docs/api-reference/v1/definitions.html | 4 ++-- staging/src/k8s.io/api/core/v1/generated.proto | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 6e286b0737e..095eaa75586 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -76031,7 +76031,7 @@ ] }, "io.k8s.api.core.v1.CSIPersistentVolumeSource": { - "description": "Represents storage that is managed by an external CSI volume driver", + "description": "Represents storage that is managed by an external CSI volume driver (Beta feature)", "required": [ "driver", "volumeHandle" @@ -78556,7 +78556,7 @@ "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" }, "csi": { - "description": "CSI represents storage that handled by an external CSI driver", + "description": "CSI represents storage that handled by an external CSI driver (Beta feature).", "$ref": "#/definitions/io.k8s.api.core.v1.CSIPersistentVolumeSource" }, "fc": { diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 441cf975023..fac13639217 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -20651,7 +20651,7 @@ }, "csi": { "$ref": "v1.CSIPersistentVolumeSource", - "description": "CSI represents storage that handled by an external CSI driver" + "description": "CSI represents storage that handled by an external CSI driver (Beta feature)." }, "accessModes": { "type": "array", @@ -21307,7 +21307,7 @@ }, "v1.CSIPersistentVolumeSource": { "id": "v1.CSIPersistentVolumeSource", - "description": "Represents storage that is managed by an external CSI volume driver", + "description": "Represents storage that is managed by an external CSI volume driver (Beta feature)", "required": [ "driver", "volumeHandle" diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index ff90e1d21ff..5b91a27d094 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -4164,7 +4164,7 @@ Examples:

csi

-

CSI represents storage that handled by an external CSI driver

+

CSI represents storage that handled by an external CSI driver (Beta feature).

false

v1.CSIPersistentVolumeSource

@@ -7823,7 +7823,7 @@ Examples:

v1.CSIPersistentVolumeSource

-

Represents storage that is managed by an external CSI volume driver

+

Represents storage that is managed by an external CSI volume driver (Beta feature)

diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index e5d8f74db65..564f9691533 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -170,7 +170,7 @@ message Binding { optional ObjectReference target = 2; } -// Represents storage that is managed by an external CSI volume driver +// Represents storage that is managed by an external CSI volume driver (Beta feature) message CSIPersistentVolumeSource { // Driver is the name of the driver to use for this volume. // Required. @@ -2528,7 +2528,7 @@ message PersistentVolumeSource { // +optional optional StorageOSPersistentVolumeSource storageos = 21; - // CSI represents storage that handled by an external CSI driver + // CSI represents storage that handled by an external CSI driver (Beta feature). // +optional optional CSIPersistentVolumeSource csi = 22; }