Action Asim's Feedback

This commit is contained in:
Ben Toogood
2020-02-06 09:17:10 +00:00
parent d8110b70a3
commit aa58a9749b
5 changed files with 15 additions and 42 deletions

View File

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

View File

@@ -1,9 +1,5 @@
package client
type DeploymentOptions struct {
BaseImage string
}
type LogOptions struct {
Params map[string]string
}
@@ -14,7 +10,6 @@ type WatchOptions struct {
type LogOption func(*LogOptions)
type WatchOption func(*WatchOptions)
type DeploymentOption func(*DeploymentOptions)
// LogParams provides additional params for logs
func LogParams(p map[string]string) LogOption {
@@ -29,24 +24,3 @@ func WatchParams(p map[string]string) WatchOption {
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
}