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

* 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

View File

@ -4,4 +4,4 @@ RUN apk --no-cache add make git gcc libtool musl-dev
WORKDIR / WORKDIR /
COPY go.mod . COPY go.mod .
COPY go.sum . COPY go.sum .
RUN go mod download RUN go mod download && rm go.mod go.sum

View File

@ -38,6 +38,8 @@ type Kubernetes interface {
// DefaultService returns default micro kubernetes service definition // DefaultService returns default micro kubernetes service definition
func DefaultService(name, version string) *Service { func DefaultService(name, version string) *Service {
log.Debugf("kubernetes default service: name: %s, version: %s", name, version)
Labels := map[string]string{ Labels := map[string]string{
"name": name, "name": name,
"version": version, "version": version,
@ -73,7 +75,9 @@ func DefaultService(name, version string) *Service {
} }
// DefaultService returns default micro kubernetes deployment definition // DefaultService returns default micro kubernetes deployment definition
func DefaultDeployment(name, version string) *Deployment { func DefaultDeployment(name, version, source string) *Deployment {
log.Debugf("kubernetes default deployment: name: %s, version: %s, source: %s", name, version, source)
Labels := map[string]string{ Labels := map[string]string{
"name": name, "name": name,
"version": version, "version": version,
@ -102,7 +106,12 @@ func DefaultDeployment(name, version string) *Deployment {
log.Debugf("Runtime could not parse build: %v", err) log.Debugf("Runtime could not parse build: %v", err)
} }
// TODO: change the image name here // enable go modules by default
env := EnvVar{
Name: "GO111MODULE",
Value: "on",
}
Spec := &DeploymentSpec{ Spec := &DeploymentSpec{
Replicas: 1, Replicas: 1,
Selector: &LabelSelector{ Selector: &LabelSelector{
@ -114,8 +123,8 @@ func DefaultDeployment(name, version string) *Deployment {
Containers: []Container{{ Containers: []Container{{
Name: name, Name: name,
Image: DefaultImage, Image: DefaultImage,
Env: []EnvVar{}, Env: []EnvVar{env},
Command: []string{"go", "run", "main.go"}, Command: []string{"go", "run", source},
Ports: []ContainerPort{{ Ports: []ContainerPort{{
Name: name + "-port", Name: name + "-port",
ContainerPort: 8080, ContainerPort: 8080,

View File

@ -1,8 +1,8 @@
package client package client
var templates = map[string]string{ var templates = map[string]string{
"deployments": deploymentTmpl, "deployment": deploymentTmpl,
"services": serviceTmpl, "service": serviceTmpl,
} }
var deploymentTmpl = ` var deploymentTmpl = `

View File

@ -10,9 +10,9 @@ import (
"text/template" "text/template"
) )
// renderTemplateFile renders template file in path into writer w with supplied data // renderTemplateFile renders template for a given resource into writer w
func renderTemplate(text string, w io.Writer, data interface{}) error { func renderTemplate(resource string, w io.Writer, data interface{}) error {
t := template.Must(template.New("kubernetes").Parse(text)) t := template.Must(template.New("kubernetes").Parse(templates[resource]))
if err := t.Execute(w, data); err != nil { if err := t.Execute(w, data); err != nil {
return err return err

View File

@ -7,19 +7,20 @@ import (
func TestTemplates(t *testing.T) { func TestTemplates(t *testing.T) {
name := "foo" name := "foo"
version := "1.2.3" version := "123"
source := "github.com/foo/bar"
// Render default service // Render default service
s := DefaultService(name, version) s := DefaultService(name, version)
bs := new(bytes.Buffer) bs := new(bytes.Buffer)
if err := renderTemplate(serviceTmpl, bs, s); err != nil { if err := renderTemplate(templates["service"], bs, s); err != nil {
t.Errorf("Failed to render kubernetes service: %v", err) t.Errorf("Failed to render kubernetes service: %v", err)
} }
// Render default deployment // Render default deployment
d := DefaultDeployment(name, version) d := DefaultDeployment(name, version, source)
bd := new(bytes.Buffer) bd := new(bytes.Buffer)
if err := renderTemplate(deploymentTmpl, bd, d); err != nil { if err := renderTemplate(templates["deployment"], bd, d); err != nil {
t.Errorf("Failed to render kubernetes deployment: %v", err) t.Errorf("Failed to render kubernetes deployment: %v", err)
} }
} }

View File

@ -19,7 +19,7 @@ type service struct {
func newService(s *runtime.Service, c runtime.CreateOptions) *service { func newService(s *runtime.Service, c runtime.CreateOptions) *service {
kservice := client.DefaultService(s.Name, s.Version) 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)) env := make([]client.EnvVar, 0, len(c.Env))
for _, evar := range 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]}) 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 default environment
// if environment has been supplied update deployment
if len(env) > 0 { 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 Exec/Command has been supplied override the default command
if len(c.Command) > 0 { if len(s.Exec) > 0 {
kdeploy.Spec.Template.PodSpec.Containers[0].Command = c.Command 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{ return &service{