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

Merge pull request #122 from ngtuna/update-objects

Browse Source 
fix #121: update all objects, even when port is missing
This commit is contained in:
Tuna 2016-08-24 15:04:27 +07:00 committed by GitHub
commit 3f94d778d7
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/transformer/kubernetes/k8sutils.go
View File

@ -225,9 +225,20 @@ func PortsExist(name string, service kobject.ServiceConfig) bool {
// create a kubernetes Service // create a kubernetes Service
func CreateService(name string, service kobject.ServiceConfig, objects []runtime.Object) *api.Service { func CreateService(name string, service kobject.ServiceConfig, objects []runtime.Object) *api.Service {
svc := InitSvc(name, service) svc := InitSvc(name, service)
// Configure the service ports.
servicePorts := ConfigServicePorts(name, service)
svc.Spec.Ports = servicePorts
// Configure annotations
annotations := transformer.ConfigAnnotations(service)
svc.ObjectMeta.Annotations = annotations
return svc
}
func UpdateKubernetesObjects(name string, service kobject.ServiceConfig, objects []runtime.Object) {
// Configure the environment variables. // Configure the environment variables.
envs := ConfigEnvs(name, service) envs := ConfigEnvs(name, service)
@ -240,13 +251,8 @@ func CreateService(name string, service kobject.ServiceConfig, objects []runtime
// Configure the container ports. // Configure the container ports.
ports := ConfigPorts(name, service) ports := ConfigPorts(name, service)
// Configure the service ports.
servicePorts := ConfigServicePorts(name, service)
svc.Spec.Ports = servicePorts
// Configure annotations // Configure annotations
annotations := transformer.ConfigAnnotations(service) annotations := transformer.ConfigAnnotations(service)
svc.ObjectMeta.Annotations = annotations
// fillTemplate fills the pod template with the value calculated from config // fillTemplate fills the pod template with the value calculated from config
fillTemplate := func(template *api.PodTemplateSpec) { fillTemplate := func(template *api.PodTemplateSpec) {
@ -289,6 +295,4 @@ func CreateService(name string, service kobject.ServiceConfig, objects []runtime
for _, obj := range objects { for _, obj := range objects {
UpdateController(obj, fillTemplate, fillObjectMeta) UpdateController(obj, fillTemplate, fillObjectMeta)
} }
return svc
} }

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

@ -244,6 +244,8 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
objects = append(objects, svc) objects = append(objects, svc)
} }
UpdateKubernetesObjects(name, service, objects)
allobjects = append(allobjects, objects...) allobjects = append(allobjects, objects...)
} }

3
pkg/transformer/openshift/openshift.go
View File

@ -78,6 +78,9 @@ func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
svc := kubernetes.CreateService(name, service, objects) svc := kubernetes.CreateService(name, service, objects)
objects = append(objects, svc) objects = append(objects, svc)
} }
kubernetes.UpdateKubernetesObjects(name, service, objects)
allobjects = append(allobjects, objects...) allobjects = append(allobjects, objects...)
} }