github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixup merge mistakes

Browse Source
This commit is contained in:
Justin Santa Barbara 2015-04-07 13:33:54 -07:00
parent 95b68ae0b0
commit 2e91fdd2fd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/types.go
View File

@ -390,6 +390,11 @@ type ISCSIVolumeSource struct {
IQN string `json:"iqn,omitempty"` IQN string `json:"iqn,omitempty"`
// Required: iSCSI target lun number // Required: iSCSI target lun number
Lun int `json:"lun,omitempty"` Lun int `json:"lun,omitempty"`
// Required: Filesystem type to mount.
// Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs"
// TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
// the ReadOnly setting in VolumeMounts. // the ReadOnly setting in VolumeMounts.
ReadOnly bool `json:"readOnly,omitempty"` ReadOnly bool `json:"readOnly,omitempty"`

5
pkg/api/v1beta1/conversion.go
View File

@ -1197,11 +1197,10 @@ func init() {
if err := s.Convert(&in.GCEPersistentDisk, &out.GCEPersistentDisk, 0); err != nil { if err := s.Convert(&in.GCEPersistentDisk, &out.GCEPersistentDisk, 0); err != nil {
return err return err
} }
<<<<<<< HEAD
if err := s.Convert(&in.ISCSI, &out.ISCSI, 0); err != nil { if err := s.Convert(&in.ISCSI, &out.ISCSI, 0); err != nil {
======= return err
}
if err := s.Convert(&in.AWSPersistentDisk, &out.AWSPersistentDisk, 0); err != nil { if err := s.Convert(&in.AWSPersistentDisk, &out.AWSPersistentDisk, 0); err != nil {
>>>>>>> Add initial support for Volumes to AWS
return err return err
} }
if err := s.Convert(&in.HostDir, &out.HostPath, 0); err != nil { if err := s.Convert(&in.HostDir, &out.HostPath, 0); err != nil {