diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 12adc933495..85ef16f88be 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -327,7 +327,7 @@ type VolumeSource struct { // PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine PhotonPersistentDisk *PhotonPersistentDiskVolumeSource `json:"photonPersistentDisk,omitempty" protobuf:"bytes,23,opt,name=photonPersistentDisk"` // Items for all in one resources secrets, configmaps, and downward API - Projected *ProjectedVolumeSource `json:"projected,omitempty"` + Projected *ProjectedVolumeSource `json:"projected,omitempty" protobuf:"bytes,26,opt,name=projected"` // PortworxVolume represents a portworx volume attached and mounted on kubelets host machine // +optional PortworxVolume *PortworxVolumeSource `json:"portworxVolume,omitempty" protobuf:"bytes,24,opt,name=portworxVolume"` @@ -492,7 +492,7 @@ type PersistentVolumeSpec struct { // Name of StorageClass to which this persistent volume belongs. Empty value // means that this volume does not belong to any StorageClass. // +optional - StorageClassName string `json:"storageClassName,omitempty"` + StorageClassName string `json:"storageClassName,omitempty" protobuf:"bytes,6,opt,name=storageClassName"` } // PersistentVolumeReclaimPolicy describes a policy for end-of-life maintenance of persistent volumes. @@ -591,7 +591,7 @@ type PersistentVolumeClaimSpec struct { // Name of the StorageClass required by the claim. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#class-1 // +optional - StorageClassName *string `json:"storageClassName,omitempty"` + StorageClassName *string `json:"storageClassName,omitempty" protobuf:"bytes,5,opt,name=storageClassName"` } // PersistentVolumeClaimStatus is the current status of a persistent volume claim. @@ -1238,14 +1238,14 @@ type ConfigMapProjection struct { // Represents a projected volume source type ProjectedVolumeSource struct { // list of volume projections - Sources []VolumeProjection `json:"sources"` + Sources []VolumeProjection `json:"sources" protobuf:"bytes,1,rep,name=sources"` // Mode bits to use on created files by default. Must be a value between // 0 and 0777. // Directories within the path are not affected by this setting. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. // +optional - DefaultMode *int32 `json:"defaultMode,omitempty"` + DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"varint,2,opt,name=defaultMode"` } // Projection that may be projected along with other supported volume types @@ -1253,11 +1253,11 @@ type VolumeProjection struct { // all types below are the supported types for projection into the same volume // information about the secret data to project - Secret *SecretProjection `json:"secret,omitempty"` + Secret *SecretProjection `json:"secret,omitempty" protobuf:"bytes,1,opt,name=secret"` // information about the downwardAPI data to project - DownwardAPI *DownwardAPIProjection `json:"downwardAPI,omitempty"` + DownwardAPI *DownwardAPIProjection `json:"downwardAPI,omitempty" protobuf:"bytes,2,opt,name=downwardAPI"` // information about the configMap data to project - ConfigMap *ConfigMapProjection `json:"configMap,omitempty"` + ConfigMap *ConfigMapProjection `json:"configMap,omitempty" protobuf:"bytes,3,opt,name=configMap"` } const ( @@ -3113,7 +3113,7 @@ type NodeSpec struct { Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"` // If specified, the node's taints. // +optional - Taints []Taint `json:"taints,omitempty" protobuf:"bytes,5,opt,name=taints"` + Taints []Taint `json:"taints,omitempty" protobuf:"bytes,5,opt,name=taints"` } // DaemonEndpoint contains information about a single Daemon endpoint. @@ -3533,7 +3533,7 @@ type DeleteOptions struct { // Defaults to Default. // Either this field or OrphanDependents may be set, but not both. // +optional - PropagationPolicy *DeletionPropagation + PropagationPolicy *DeletionPropagation `protobuf:"bytes,4,opt,name=propagationPolicy,casttype=DeletionPropagation"` } // ListOptions is the query options to a standard REST list call. diff --git a/pkg/apis/storage/v1/types.go b/pkg/apis/storage/v1/types.go index 25b283b81fc..0591b397cd7 100644 --- a/pkg/apis/storage/v1/types.go +++ b/pkg/apis/storage/v1/types.go @@ -33,15 +33,15 @@ type StorageClass struct { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Provisioner indicates the type of the provisioner. - Provisioner string `json:"provisioner"` + Provisioner string `json:"provisioner" protobuf:"bytes,2,opt,name=provisioner"` // Parameters holds the parameters for the provisioner that should // create volumes of this storage class. // +optional - Parameters map[string]string `json:"parameters,omitempty"` + Parameters map[string]string `json:"parameters,omitempty" protobuf:"bytes,3,rep,name=parameters"` } // StorageClassList is a collection of storage classes. @@ -50,8 +50,8 @@ type StorageClassList struct { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - metav1.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of StorageClasses - Items []StorageClass `json:"items"` + Items []StorageClass `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go index 12adc933495..85ef16f88be 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go @@ -327,7 +327,7 @@ type VolumeSource struct { // PhotonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine PhotonPersistentDisk *PhotonPersistentDiskVolumeSource `json:"photonPersistentDisk,omitempty" protobuf:"bytes,23,opt,name=photonPersistentDisk"` // Items for all in one resources secrets, configmaps, and downward API - Projected *ProjectedVolumeSource `json:"projected,omitempty"` + Projected *ProjectedVolumeSource `json:"projected,omitempty" protobuf:"bytes,26,opt,name=projected"` // PortworxVolume represents a portworx volume attached and mounted on kubelets host machine // +optional PortworxVolume *PortworxVolumeSource `json:"portworxVolume,omitempty" protobuf:"bytes,24,opt,name=portworxVolume"` @@ -492,7 +492,7 @@ type PersistentVolumeSpec struct { // Name of StorageClass to which this persistent volume belongs. Empty value // means that this volume does not belong to any StorageClass. // +optional - StorageClassName string `json:"storageClassName,omitempty"` + StorageClassName string `json:"storageClassName,omitempty" protobuf:"bytes,6,opt,name=storageClassName"` } // PersistentVolumeReclaimPolicy describes a policy for end-of-life maintenance of persistent volumes. @@ -591,7 +591,7 @@ type PersistentVolumeClaimSpec struct { // Name of the StorageClass required by the claim. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#class-1 // +optional - StorageClassName *string `json:"storageClassName,omitempty"` + StorageClassName *string `json:"storageClassName,omitempty" protobuf:"bytes,5,opt,name=storageClassName"` } // PersistentVolumeClaimStatus is the current status of a persistent volume claim. @@ -1238,14 +1238,14 @@ type ConfigMapProjection struct { // Represents a projected volume source type ProjectedVolumeSource struct { // list of volume projections - Sources []VolumeProjection `json:"sources"` + Sources []VolumeProjection `json:"sources" protobuf:"bytes,1,rep,name=sources"` // Mode bits to use on created files by default. Must be a value between // 0 and 0777. // Directories within the path are not affected by this setting. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. // +optional - DefaultMode *int32 `json:"defaultMode,omitempty"` + DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"varint,2,opt,name=defaultMode"` } // Projection that may be projected along with other supported volume types @@ -1253,11 +1253,11 @@ type VolumeProjection struct { // all types below are the supported types for projection into the same volume // information about the secret data to project - Secret *SecretProjection `json:"secret,omitempty"` + Secret *SecretProjection `json:"secret,omitempty" protobuf:"bytes,1,opt,name=secret"` // information about the downwardAPI data to project - DownwardAPI *DownwardAPIProjection `json:"downwardAPI,omitempty"` + DownwardAPI *DownwardAPIProjection `json:"downwardAPI,omitempty" protobuf:"bytes,2,opt,name=downwardAPI"` // information about the configMap data to project - ConfigMap *ConfigMapProjection `json:"configMap,omitempty"` + ConfigMap *ConfigMapProjection `json:"configMap,omitempty" protobuf:"bytes,3,opt,name=configMap"` } const ( @@ -3113,7 +3113,7 @@ type NodeSpec struct { Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"` // If specified, the node's taints. // +optional - Taints []Taint `json:"taints,omitempty" protobuf:"bytes,5,opt,name=taints"` + Taints []Taint `json:"taints,omitempty" protobuf:"bytes,5,opt,name=taints"` } // DaemonEndpoint contains information about a single Daemon endpoint. @@ -3533,7 +3533,7 @@ type DeleteOptions struct { // Defaults to Default. // Either this field or OrphanDependents may be set, but not both. // +optional - PropagationPolicy *DeletionPropagation + PropagationPolicy *DeletionPropagation `protobuf:"bytes,4,opt,name=propagationPolicy,casttype=DeletionPropagation"` } // ListOptions is the query options to a standard REST list call. diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/types.go index 25b283b81fc..0591b397cd7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/types.go @@ -33,15 +33,15 @@ type StorageClass struct { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Provisioner indicates the type of the provisioner. - Provisioner string `json:"provisioner"` + Provisioner string `json:"provisioner" protobuf:"bytes,2,opt,name=provisioner"` // Parameters holds the parameters for the provisioner that should // create volumes of this storage class. // +optional - Parameters map[string]string `json:"parameters,omitempty"` + Parameters map[string]string `json:"parameters,omitempty" protobuf:"bytes,3,rep,name=parameters"` } // StorageClassList is a collection of storage classes. @@ -50,8 +50,8 @@ type StorageClassList struct { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - metav1.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of StorageClasses - Items []StorageClass `json:"items"` + Items []StorageClass `json:"items" protobuf:"bytes,2,rep,name=items"` }