unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

Pass source of service to Deployment API; render templates properly (#969)

Browse Source 
* Pass source of service to Deployment API; render templates properly

* Enable Go modules by default. Honor runtime.Service.Exec

* Make sure you remove go.mod and go.sum
This commit is contained in:
Milos Gajdos
2019-11-21 17:31:13 +00:00
committed by Asim Aslam
parent 212144d658
commit 8dc3fb964e
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/kubernetes/service.go
View File

@@ -19,7 +19,7 @@ type service struct {
func newService(s *runtime.Service, c runtime.CreateOptions) *service {
kservice := client.DefaultService(s.Name, s.Version)
kdeploy := client.DefaultDeployment(s.Name, s.Version)
kdeploy := client.DefaultDeployment(s.Name, s.Version, s.Source)
env := make([]client.EnvVar, 0, len(c.Env))
for _, evar := range c.Env {
@@ -27,15 +27,18 @@ func newService(s *runtime.Service, c runtime.CreateOptions) *service {
env = append(env, client.EnvVar{Name: evarPair[0], Value: evarPair[1]})
}
// TODO: should we append instead of overriding?
// if environment has been supplied update deployment
// if environment has been supplied update deployment default environment
if len(env) > 0 {
kdeploy.Spec.Template.PodSpec.Containers[0].Env = env
kdeploy.Spec.Template.PodSpec.Containers[0].Env = append(kdeploy.Spec.Template.PodSpec.Containers[0].Env, env...)
}
// if Command has been supplied override the default command
if len(c.Command) > 0 {
kdeploy.Spec.Template.PodSpec.Containers[0].Command = c.Command
// if Exec/Command has been supplied override the default command
if len(s.Exec) > 0 {
kdeploy.Spec.Template.PodSpec.Containers[0].Command = s.Exec
} else {
if len(c.Command) > 0 {
kdeploy.Spec.Template.PodSpec.Containers[0].Command = c.Command
}
}
return &service{