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

Remove bundle references in kobject

Browse Source 
Closes https://github.com/kubernetes/kompose/issues/750

Removes references to bundle/dab since we no longer support it.
This commit is contained in:
Charlie Drage 2017-08-08 10:53:38 -04:00
parent 937b15e968
commit 09700ca24b
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pkg/kobject/kobject.go
View File

@ -62,44 +62,44 @@ type ConvertOptions struct {
type ServiceConfig struct { type ServiceConfig struct {
// use tags to mark from what element this value comes // use tags to mark from what element this value comes
ContainerName string ContainerName string
Image string `compose:"image" bundle:"Image"` Image string `compose:"image"`
Environment []EnvVar `compose:"environment" bundle:"Env"` Environment []EnvVar `compose:"environment"`
Port []Ports `compose:"ports" bundle:"Ports"` Port []Ports `compose:"ports"`
Command []string `compose:"command" bundle:"Command"` Command []string `compose:"command"`
WorkingDir string `compose:"" bundle:"WorkingDir"` WorkingDir string `compose:""`
Args []string `compose:"args" bundle:"Args"` Args []string `compose:"args"`
// VolList is list of volumes extracted from docker-compose file // VolList is list of volumes extracted from docker-compose file
VolList []string `compose:"volumes" bundle:"Volumes"` VolList []string `compose:"volumes"`
Network []string `compose:"network" bundle:"Networks"` Network []string `compose:"network"`
Labels map[string]string `compose:"labels" bundle:"Labels"` Labels map[string]string `compose:"labels"`
Annotations map[string]string `compose:"" bundle:""` Annotations map[string]string `compose:""`
CPUSet string `compose:"cpuset" bundle:""` CPUSet string `compose:"cpuset"`
CPUShares int64 `compose:"cpu_shares" bundle:""` CPUShares int64 `compose:"cpu_shares"`
CPUQuota int64 `compose:"cpu_quota" bundle:""` CPUQuota int64 `compose:"cpu_quota"`
CPULimit int64 `compose:"" bundle:""` CPULimit int64 `compose:""`
CPUReservation int64 `compose:"" bundle:""` CPUReservation int64 `compose:""`
CapAdd []string `compose:"cap_add" bundle:""` CapAdd []string `compose:"cap_add"`
CapDrop []string `compose:"cap_drop" bundle:""` CapDrop []string `compose:"cap_drop"`
Expose []string `compose:"expose" bundle:""` Expose []string `compose:"expose"`
Pid string `compose:"pid" bundle:""` Pid string `compose:"pid"`
Privileged bool `compose:"privileged" bundle:""` Privileged bool `compose:"privileged"`
Restart string `compose:"restart" bundle:""` Restart string `compose:"restart"`
User string `compose:"user" bundle:"User"` User string `compose:"user"`
VolumesFrom []string `compose:"volumes_from" bundle:""` VolumesFrom []string `compose:"volumes_from"`
ServiceType string `compose:"kompose.service.type" bundle:""` ServiceType string `compose:"kompose.service.type"`
StopGracePeriod string `compose:"stop_grace_period" bundle:""` StopGracePeriod string `compose:"stop_grace_period"`
Build string `compose:"build" bundle:""` Build string `compose:"build"`
BuildArgs map[string]*string `compose:"build-args" bundle:""` BuildArgs map[string]*string `compose:"build-args"`
ExposeService string `compose:"kompose.service.expose" bundle:""` ExposeService string `compose:"kompose.service.expose"`
Stdin bool `compose:"stdin_open" bundle:""` Stdin bool `compose:"stdin_open"`
Tty bool `compose:"tty" bundle:""` Tty bool `compose:"tty"`
MemLimit yaml.MemStringorInt `compose:"mem_limit" bundle:""` MemLimit yaml.MemStringorInt `compose:"mem_limit"`
MemReservation yaml.MemStringorInt `compose:"" bundle:""` MemReservation yaml.MemStringorInt `compose:""`
TmpFs []string `compose:"tmpfs" bundle:""` TmpFs []string `compose:"tmpfs"`
Dockerfile string `compose:"dockerfile" bundle:""` Dockerfile string `compose:"dockerfile"`
Replicas int `compose:"replicas" bundle:""` Replicas int `compose:"replicas"`
// Volumes is a struct which contains all information about each volume // Volumes is a struct which contains all information about each volume
Volumes []Volumes `compose:"" bundle:""` Volumes []Volumes `compose:""`
} }
// EnvVar holds the environment variable struct of a container // EnvVar holds the environment variable struct of a container