Skip to content

Commit

Permalink
Remove unneeded createMeshServices method in controller
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpollet committed May 13, 2020
1 parent 0deb219 commit 4d6d857
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 37 deletions.
38 changes: 1 addition & 37 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package controller

import (
"context"
"fmt"
"reflect"
"time"

Expand Down Expand Up @@ -199,21 +198,14 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
// Handle a panic with logging and exiting.
defer utilruntime.HandleCrash()

c.logger.Debug("Initializing Mesh controller")
c.logger.Debug("Initializing mesh controller")

// Start the api.
c.api.Start()

// Start the informers.
c.startInformers(stopCh, 10*time.Second)

// Create the mesh services here to ensure that they exist.
c.logger.Info("Creating initial mesh services")

if err := c.createMeshServices(); err != nil {
c.logger.Errorf("Could not create mesh services: %v", err)
}

// Enable API readiness endpoint, informers are started and default conf is available.
c.api.EnableReadiness()

Expand Down Expand Up @@ -282,34 +274,6 @@ func (c *Controller) startInformers(stopCh <-chan struct{}, syncTimeout time.Dur
}
}

func (c *Controller) createMeshServices() error {
sel, err := c.ignoredResources.LabelSelector()
if err != nil {
return fmt.Errorf("unable to build label selectors: %w", err)
}

// Because createMeshServices is called after startInformers,
// then we already have the cache built, so we can use it.
svcs, err := c.serviceLister.List(sel)
if err != nil {
return fmt.Errorf("unable to get services: %w", err)
}

for _, service := range svcs {
if c.ignoredResources.IsIgnored(service.ObjectMeta) {
continue
}

c.logger.Debugf("Creating mesh for service: %v", service.Name)

if err := c.serviceManager.Create(service); err != nil {
return fmt.Errorf("unable to create mesh service: %w", err)
}
}

return nil
}

// isWatchedResource returns true if the given resource is not ignored, false otherwise.
func (c *Controller) isWatchedResource(obj interface{}) bool {
accessor, err := meta.Accessor(obj)
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ func NewHandler(log logrus.FieldLogger, serviceManager ServiceManager, configRef
func (h *Handler) OnAdd(obj interface{}) {
// If the created object is a service we have to create a corresponding shadow service.
if obj, isService := obj.(*corev1.Service); isService {
h.log.Debugf("MeshControllerHandler ObjectAdded with type: *corev1.Service: %s/%s", obj.Namespace, obj.Name)

if err := h.serviceManager.Create(obj); err != nil {
h.log.Errorf("Could not create mesh service: %v", err)
}
Expand Down

0 comments on commit 4d6d857

Please sign in to comment.