Runtime custom docker img (#1168)

* Add DeploymentOptions to K8s Client

* WithBaseImage for  Runtime

* Revert Change

* Fix sequencing
This commit is contained in:
ben-toogood 2020-02-06 08:52:25 +00:00 committed by GitHub
parent a44dc90d45
commit d8110b70a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 4 deletions

View File

@ -344,6 +344,7 @@ func (k *kubernetes) Delete(s *runtime.Service) error {
// create new kubernetes micro service // create new kubernetes micro service
service := newService(s, runtime.CreateOptions{ service := newService(s, runtime.CreateOptions{
Type: k.options.Type, Type: k.options.Type,
BaseImage: k.options.Source,
}) })
return service.Stop(k.client) return service.Stop(k.client)

View File

@ -16,7 +16,7 @@ type Options struct {
Source string Source string
} }
// WithSource sets the host addresses to be used by the broker // WithSource sets the base image / repository
func WithSource(src string) Option { func WithSource(src string) Option {
return func(o *Options) { return func(o *Options) {
o.Source = src o.Source = src
@ -51,6 +51,8 @@ type CreateOptions struct {
Output io.Writer Output io.Writer
// Type of service to create // Type of service to create
Type string Type string
// Base image for docker
BaseImage string
} }
// ReadOptions queries runtime services // ReadOptions queries runtime services
@ -92,6 +94,13 @@ func WithOutput(out io.Writer) CreateOption {
} }
} }
// WithBaseImage sets the docker img
func WithBaseImage(img string) CreateOption {
return func(o *CreateOptions) {
o.BaseImage = img
}
}
// ReadService returns services with the given name // ReadService returns services with the given name
func ReadService(service string) ReadOption { func ReadService(service string) ReadOption {
return func(o *ReadOptions) { return func(o *ReadOptions) {

View File

@ -226,9 +226,11 @@ func NewService(name, version, typ string) *Service {
} }
// NewService returns default micro kubernetes deployment definition // NewService returns default micro kubernetes deployment definition
func NewDeployment(name, version, typ string) *Deployment { func NewDeployment(name, version, typ string, opts ...DeploymentOption) *Deployment {
log.Tracef("kubernetes default deployment: name: %s, version: %s", name, version) log.Tracef("kubernetes default deployment: name: %s, version: %s", name, version)
options := NewDeploymentOptions(opts)
Labels := map[string]string{ Labels := map[string]string{
"name": name, "name": name,
"version": version, "version": version,
@ -265,7 +267,7 @@ func NewDeployment(name, version, typ string) *Deployment {
PodSpec: &PodSpec{ PodSpec: &PodSpec{
Containers: []Container{{ Containers: []Container{{
Name: name, Name: name,
Image: DefaultImage, Image: options.BaseImage,
Env: []EnvVar{env}, Env: []EnvVar{env},
Command: []string{"go", "run", "main.go"}, Command: []string{"go", "run", "main.go"},
Ports: []ContainerPort{{ Ports: []ContainerPort{{

View File

@ -1,5 +1,9 @@
package client package client
type DeploymentOptions struct {
BaseImage string
}
type LogOptions struct { type LogOptions struct {
Params map[string]string Params map[string]string
} }
@ -10,6 +14,7 @@ type WatchOptions struct {
type LogOption func(*LogOptions) type LogOption func(*LogOptions)
type WatchOption func(*WatchOptions) type WatchOption func(*WatchOptions)
type DeploymentOption func(*DeploymentOptions)
// LogParams provides additional params for logs // LogParams provides additional params for logs
func LogParams(p map[string]string) LogOption { func LogParams(p map[string]string) LogOption {
@ -24,3 +29,24 @@ func WatchParams(p map[string]string) WatchOption {
w.Params = p w.Params = p
} }
} }
// WithBaseImage sets the base image for the deployment
func WithBaseImage(img string) DeploymentOption {
return func(d *DeploymentOptions) {
d.BaseImage = img
}
}
// NewDeploymentOptions returns an initialized DeploymentOptions
func NewDeploymentOptions(opts []DeploymentOption) DeploymentOptions {
var options DeploymentOptions
for _, o := range opts {
o(&options)
}
if options.BaseImage == "" {
options.BaseImage = DefaultImage
}
return options
}