github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22530 from mwielgus/rcconfig

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-04 12:42:29 -08:00
commit 1b64d6b3fd
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/util.go
View File

@ -270,6 +270,11 @@ type RCConfig struct {
// Ports to declare in the container (map of name to containerPort). // Ports to declare in the container (map of name to containerPort).
Ports map[string]int Ports map[string]int
// Ports to declare in the container as host and container ports.
HostPorts map[string]int
Volumes []api.Volume
VolumeMounts []api.VolumeMount
// Pointer to a list of pods; if non-nil, will be set to a list of pods // Pointer to a list of pods; if non-nil, will be set to a list of pods
// created by this RC by RunRC. // created by this RC by RunRC.
@ -1780,6 +1785,12 @@ func (config *RCConfig) applyTo(template *api.PodTemplateSpec) {
c.Ports = append(c.Ports, api.ContainerPort{Name: k, ContainerPort: v}) c.Ports = append(c.Ports, api.ContainerPort{Name: k, ContainerPort: v})
} }
} }
if config.HostPorts != nil {
for k, v := range config.HostPorts {
c := &template.Spec.Containers[0]
c.Ports = append(c.Ports, api.ContainerPort{Name: k, ContainerPort: v, HostPort: v})
}
}
if config.CpuLimit > 0 || config.MemLimit > 0 { if config.CpuLimit > 0 || config.MemLimit > 0 {
template.Spec.Containers[0].Resources.Limits = api.ResourceList{} template.Spec.Containers[0].Resources.Limits = api.ResourceList{}
} }
@ -1798,6 +1809,12 @@ func (config *RCConfig) applyTo(template *api.PodTemplateSpec) {
if config.MemRequest > 0 { if config.MemRequest > 0 {
template.Spec.Containers[0].Resources.Requests[api.ResourceMemory] = *resource.NewQuantity(config.MemRequest, resource.DecimalSI) template.Spec.Containers[0].Resources.Requests[api.ResourceMemory] = *resource.NewQuantity(config.MemRequest, resource.DecimalSI)
} }
if len(config.Volumes) > 0 {
template.Spec.Volumes = config.Volumes
}
if len(config.VolumeMounts) > 0 {
template.Spec.Containers[0].VolumeMounts = config.VolumeMounts
}
} }
func (config *RCConfig) start() error { func (config *RCConfig) start() error {