From cd243287e598a4558740e9fa7eda29113dfeded6 Mon Sep 17 00:00:00 2001 From: zionwu Date: Thu, 29 Mar 2018 15:30:29 +0800 Subject: [PATCH 1/2] Add description field to storageClass and pv --- apis/cluster.cattle.io/v3/schema/schema.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apis/cluster.cattle.io/v3/schema/schema.go b/apis/cluster.cattle.io/v3/schema/schema.go index bb3c2252..e4c62c9c 100644 --- a/apis/cluster.cattle.io/v3/schema/schema.go +++ b/apis/cluster.cattle.io/v3/schema/schema.go @@ -41,15 +41,24 @@ func namespaceTypes(schemas *types.Schemas) *types.Schemas { func persistentVolumeTypes(schemas *types.Schemas) *types.Schemas { return schemas. + AddMapperForType(&Version, v1.PersistentVolume{}, + &m.AnnotationField{Field: "description"}, + ). MustImport(&Version, v1.PersistentVolumeSpec{}, struct { StorageClassName *string `json:"storageClassName,omitempty" norman:"type=reference[storageClass]"` }{}). - MustImport(&Version, v1.PersistentVolume{}) + MustImport(&Version, v1.PersistentVolume{}, struct { + Description string `json:"description"` + }{}) } func storageClassTypes(schemas *types.Schemas) *types.Schemas { return schemas. + AddMapperForType(&Version, storagev1.StorageClass{}, + &m.AnnotationField{Field: "description"}, + ). MustImport(&Version, storagev1.StorageClass{}, struct { + Description string `json:"description"` ReclaimPolicy string `json:"reclaimPolicy,omitempty" norman:"type=enum,options=Recycle|Delete|Retain"` }{}) } From 25d3e1de9a11bcec90d703fe104e37a2cd15c66b Mon Sep 17 00:00:00 2001 From: zionwu Date: Thu, 29 Mar 2018 15:32:02 +0800 Subject: [PATCH 2/2] Update generated code --- client/cluster/v3/zz_generated_persistent_volume.go | 2 ++ client/cluster/v3/zz_generated_storage_class.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/client/cluster/v3/zz_generated_persistent_volume.go b/client/cluster/v3/zz_generated_persistent_volume.go index 488b9483..c88a8c41 100644 --- a/client/cluster/v3/zz_generated_persistent_volume.go +++ b/client/cluster/v3/zz_generated_persistent_volume.go @@ -17,6 +17,7 @@ const ( PersistentVolumeFieldClaimRef = "claimRef" PersistentVolumeFieldCreated = "created" PersistentVolumeFieldCreatorID = "creatorId" + PersistentVolumeFieldDescription = "description" PersistentVolumeFieldFC = "fc" PersistentVolumeFieldFlexVolume = "flexVolume" PersistentVolumeFieldFlocker = "flocker" @@ -60,6 +61,7 @@ type PersistentVolume struct { ClaimRef *ObjectReference `json:"claimRef,omitempty" yaml:"claimRef,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` FC *FCVolumeSource `json:"fc,omitempty" yaml:"fc,omitempty"` FlexVolume *FlexVolumeSource `json:"flexVolume,omitempty" yaml:"flexVolume,omitempty"` Flocker *FlockerVolumeSource `json:"flocker,omitempty" yaml:"flocker,omitempty"` diff --git a/client/cluster/v3/zz_generated_storage_class.go b/client/cluster/v3/zz_generated_storage_class.go index 40113752..aa1940cb 100644 --- a/client/cluster/v3/zz_generated_storage_class.go +++ b/client/cluster/v3/zz_generated_storage_class.go @@ -10,6 +10,7 @@ const ( StorageClassFieldAnnotations = "annotations" StorageClassFieldCreated = "created" StorageClassFieldCreatorID = "creatorId" + StorageClassFieldDescription = "description" StorageClassFieldLabels = "labels" StorageClassFieldMountOptions = "mountOptions" StorageClassFieldName = "name" @@ -27,6 +28,7 @@ type StorageClass struct { Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` MountOptions []string `json:"mountOptions,omitempty" yaml:"mountOptions,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"`