deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #867 from abitrolly/master

Browse Source 
Set PVC volume size with kompose.volume.size
This commit is contained in:
Charlie Drage 2017-11-15 09:40:59 -05:00 committed by GitHub
commit d7c515b0cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kobject/kobject.go
View File

@ -142,4 +142,5 @@ type Volumes struct {
Container string // Mountpath Container string // Mountpath
Mode string // access mode for volume Mode string // access mode for volume
PVCName string // name of PVC PVCName string // name of PVC
PVCSize string // PVC size
} }

3
pkg/loader/compose/v3.go
View File

@ -217,7 +217,7 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
LoadedFrom: "compose", LoadedFrom: "compose",
} }
// Step 2. Parse through the object and conver it to kobject.KomposeObject! // Step 2. Parse through the object and convert it to kobject.KomposeObject!
// Here we "clean up" the service configuration so we return something that includes // Here we "clean up" the service configuration so we return something that includes
// all relevant information as well as avoid the unsupported keys as well. // all relevant information as well as avoid the unsupported keys as well.
for _, composeServiceConfig := range composeObject.Services { for _, composeServiceConfig := range composeObject.Services {
@ -240,6 +240,7 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
serviceConfig.ContainerName = composeServiceConfig.ContainerName serviceConfig.ContainerName = composeServiceConfig.ContainerName
serviceConfig.Command = composeServiceConfig.Entrypoint serviceConfig.Command = composeServiceConfig.Entrypoint
serviceConfig.Args = composeServiceConfig.Command serviceConfig.Args = composeServiceConfig.Command
serviceConfig.Labels = composeServiceConfig.Labels
// //
// Deploy keys // Deploy keys

16
pkg/transformer/kubernetes/kubernetes.go
View File

@ -267,8 +267,8 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
} }
// CreatePVC initializes PersistentVolumeClaim // CreatePVC initializes PersistentVolumeClaim
func (k *Kubernetes) CreatePVC(name string, mode string) (*api.PersistentVolumeClaim, error) { func (k *Kubernetes) CreatePVC(name string, mode string, size string) (*api.PersistentVolumeClaim, error) {
size, err := resource.ParseQuantity(PVCRequestSize) volsize, err := resource.ParseQuantity(size)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "resource.ParseQuantity failed, Error parsing size") return nil, errors.Wrap(err, "resource.ParseQuantity failed, Error parsing size")
} }
@ -285,7 +285,7 @@ func (k *Kubernetes) CreatePVC(name string, mode string) (*api.PersistentVolumeC
Spec: api.PersistentVolumeClaimSpec{ Spec: api.PersistentVolumeClaimSpec{
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Requests: api.ResourceList{ Requests: api.ResourceList{
api.ResourceStorage: size, api.ResourceStorage: volsize,
}, },
}, },
}, },
@ -448,7 +448,15 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
volsource = k.ConfigPVCVolumeSource(volumeName, readonly) volsource = k.ConfigPVCVolumeSource(volumeName, readonly)
if volume.VFrom == "" { if volume.VFrom == "" {
createdPVC, err := k.CreatePVC(volumeName, volume.Mode) defaultSize := PVCRequestSize
for key, value := range service.Labels {
if key == "kompose.volume.size" {
defaultSize = value
}
}
createdPVC, err := k.CreatePVC(volumeName, volume.Mode, defaultSize)
if err != nil { if err != nil {
return nil, nil, nil, errors.Wrap(err, "k.CreatePVC failed") return nil, nil, nil, errors.Wrap(err, "k.CreatePVC failed")