added-all

voyagermesh · Jan 10, 2018 · 6ddef70 · 6ddef70
1 parent 71c3aeb
commit 6ddef70
Show file tree

Hide file tree

Showing 12 changed files with 164 additions and 179 deletions.
diff --git a/pkg/ingress/controller.go b/pkg/ingress/controller.go
@@ -24,9 +24,9 @@ import (
 )
 
 type Controller interface {
-	IsExists() bool
+	//IsExists() bool
 	Create() error
-	Update(mode UpdateMode, old *api.Ingress) error
+	//Update(mode UpdateMode, old *api.Ingress) error
 	Delete()
 	EnsureFirewall(svc *core.Service) error
 }

diff --git a/pkg/ingress/create.go b/pkg/ingress/create.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	tools "github.com/appscode/kube-mon"
+	"github.com/appscode/kutil"
 	core_util "github.com/appscode/kutil/core/v1"
 	"github.com/appscode/kutil/tools/analytics"
 	api "github.com/appscode/voyager/apis/voyager/v1beta1"
@@ -19,12 +20,12 @@ const (
 	ErrorFilesCommand        = "errorfile"
 )
 
-func (c *controller) ensureConfigMap() error {
+func (c *controller) ensureConfigMap() (*core.ConfigMap, kutil.VerbType, error) {
 	meta := metav1.ObjectMeta{
 		Name:      c.Ingress.OffshootName(),
 		Namespace: c.Ingress.Namespace,
 	}
-	_, _, err := core_util.CreateOrPatchConfigMap(c.KubeClient, meta, func(obj *core.ConfigMap) *core.ConfigMap {
+	return core_util.CreateOrPatchConfigMap(c.KubeClient, meta, func(obj *core.ConfigMap) *core.ConfigMap {
 		if obj.Annotations == nil {
 			obj.Annotations = make(map[string]string)
 		}
@@ -35,7 +36,6 @@ func (c *controller) ensureConfigMap() error {
 		}
 		return obj
 	})
-	return err
 }
 
 func (c *controller) ensureRBAC() error {
@@ -87,13 +87,13 @@ func (c *controller) getExporterSidecar() (*core.Container, error) {
 	return nil, nil
 }
 
-func (c *controller) ensureStatsService() error {
+func (c *controller) ensureStatsService() (*core.Service, kutil.VerbType, error) {
 	meta := metav1.ObjectMeta{
 		Name:      c.Ingress.StatsServiceName(),
 		Namespace: c.Ingress.Namespace,
 	}
 
-	_, _, err := core_util.CreateOrPatchService(c.KubeClient, meta, func(in *core.Service) *core.Service {
+	return core_util.CreateOrPatchService(c.KubeClient, meta, func(in *core.Service) *core.Service {
 		in.Labels = c.Ingress.StatsLabels()
 		if in.Annotations == nil {
 			in.Annotations = map[string]string{}
@@ -123,7 +123,6 @@ func (c *controller) ensureStatsService() error {
 		in.Spec.Ports = core_util.MergeServicePorts(in.Spec.Ports, desired)
 		return in
 	})
-	return err
 }
 
 func (c *controller) ensureOriginAnnotations(annotation map[string]string) (map[string]string, bool) {

diff --git a/pkg/ingress/delete.go b/pkg/ingress/delete.go
@@ -44,7 +44,7 @@ func (c *controller) ensureServiceDeleted() error {
 }
 
 func (c *controller) ensureStatsServiceDeleted() error {
-	c.logger.Infof("Deleting Deployment %s/%s", c.Ingress.Namespace, c.Ingress.StatsServiceName())
+	c.logger.Infof("Deleting Stats Service %s/%s", c.Ingress.Namespace, c.Ingress.StatsServiceName())
 	err := c.KubeClient.CoreV1().Services(c.Ingress.Namespace).Delete(
 		c.Ingress.StatsServiceName(),
 		&metav1.DeleteOptions{},

diff --git a/pkg/ingress/hostport.go b/pkg/ingress/hostport.go
@@ -139,7 +139,7 @@ func (c *hostPortController) Create() error {
 		)
 		return errors.FromErr(err).Err()
 	}
-	err = c.ensureConfigMap()
+	_, _, err = c.ensureConfigMap()
 	if err != nil {
 		c.recorder.Eventf(
 			c.Ingress.ObjectReference(),
@@ -226,7 +226,7 @@ func (c *hostPortController) Create() error {
 	)
 
 	if c.Ingress.Stats() {
-		err := c.ensureStatsService()
+		_, _, err := c.ensureStatsService()
 		// Error ignored intentionally
 		if err != nil {
 			c.recorder.Eventf(
@@ -363,7 +363,7 @@ func (c *hostPortController) Update(mode UpdateMode, old *api.Ingress) error {
 
 	if mode&UpdateStats > 0 {
 		if c.Ingress.Stats() {
-			err := c.ensureStatsService()
+			_, _, err := c.ensureStatsService()
 			if err != nil {
 				c.recorder.Eventf(
 					c.Ingress.ObjectReference(),

diff --git a/pkg/ingress/internal.go b/pkg/ingress/internal.go
@@ -104,7 +104,7 @@ func (c *internalController) Create() error {
 		)
 		return errors.FromErr(err).Err()
 	}
-	err = c.ensureConfigMap()
+	_, _, err = c.ensureConfigMap()
 	if err != nil {
 		c.recorder.Eventf(
 			c.Ingress.ObjectReference(),
@@ -180,7 +180,7 @@ func (c *internalController) Create() error {
 	)
 
 	if c.Ingress.Stats() {
-		err := c.ensureStatsService()
+		_, _, err := c.ensureStatsService()
 		// Error ignored intentionally
 		if err != nil {
 			c.recorder.Eventf(
@@ -305,7 +305,7 @@ func (c *internalController) Update(mode UpdateMode, old *api.Ingress) error {
 
 	if mode&UpdateStats > 0 {
 		if c.Ingress.Stats() {
-			err := c.ensureStatsService()
+			_, _, err := c.ensureStatsService()
 			if err != nil {
 				c.recorder.Eventf(
 					c.Ingress.ObjectReference(),