go fmt fixes

controller/controller.go

@@ -24,7 +24,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
-*/
+ */
 
 package controller
 
@@ -56,6 +56,7 @@ const (
 	ingressClassKey = "kubernetes.io/ingress.class"
 	resyncPeriod    = 0
 	watchNamespace  = api_v1.NamespaceAll
+
 //	resyncPeriod    = 30 * time.Second
 )
 
@@ -436,7 +437,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
 	}
 	for _, rule := range ing.Spec.Rules {
 		if rule.Host == "" {
-			return vclSpec,	fmt.Errorf("Ingress rule contains "+
+			return vclSpec, fmt.Errorf("Ingress rule contains " +
 				"empty Host")
 		}
 		vclRule := vcl.Rule{Host: rule.Host}
@@ -447,7 +448,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
 		}
 		for _, path := range rule.IngressRuleValue.HTTP.Paths {
 			addrs, err := ingc.ingBackend2Addrs(path.Backend,
-				ing.Namespace);
+				ing.Namespace)
 			if err != nil {
 				return vclSpec, err
 			}
@@ -486,10 +487,10 @@ func (ingc *IngressController) ingBackend2Addrs(backend extensions.IngressBacken
 	targetPort := int32(0)
 	ingSvcPort := backend.ServicePort
 	for _, port := range svc.Spec.Ports {
-		if ((ingSvcPort.Type == intstr.Int &&
+		if (ingSvcPort.Type == intstr.Int &&
 			port.Port == int32(ingSvcPort.IntValue())) ||
 			(ingSvcPort.Type == intstr.String &&
-			port.Name == ingSvcPort.String())) {
+				port.Name == ingSvcPort.String()) {
 
 			targetPort, err = ingc.getTargetPort(&port, svc)
 			if err != nil {

controller/utils.go

@@ -24,7 +24,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
-*/
+ */
 
 package controller
 
@@ -143,7 +143,7 @@ func NewTask(key string, obj interface{}) (Task, error) {
 	var k Kind
 	switch t := obj.(type) {
 	case *extensions.Ingress:
-//		ing := obj.(*extensions.Ingress)
+		//		ing := obj.(*extensions.Ingress)
 		k = Ingress
 	case *api_v1.Endpoints:
 		k = Endpoints

main.go

@@ -10,8 +10,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"code.uplex.de/uplex-varnish/k8s-ingress/varnish"
 	"code.uplex.de/uplex-varnish/k8s-ingress/controller"
+	"code.uplex.de/uplex-varnish/k8s-ingress/varnish"
 
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

varnish/varnish.go

@@ -24,7 +24,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
-*/
+ */
 
 /*
 // TODO
@@ -142,7 +142,7 @@ func (vc *VarnishController) Start(errChan chan error) {
 	// XXX config the timeout
 	vsm := vsm.New()
 	if vsm == nil {
-		vc.errChan <- errors.New("Cannot initiate attachment to "+
+		vc.errChan <- errors.New("Cannot initiate attachment to " +
 			"Varnish shared memory")
 		return
 	}
@@ -196,7 +196,7 @@ func (vc *VarnishController) Update(key string, spec vcl.Spec) error {
 	wr.Flush()
 	f.Close()
 	log.Printf("Wrote new VCL config to %s", tmpPath)
-	
+
 	ctr := atomic.AddUint64(&configCtr, 1)
 	configName := fmt.Sprintf("ingress-%d", ctr)
 	if err := vc.adm.VCLLoad(configName, tmpPath); err != nil {

varnish/vcl/vcl.go

@@ -24,7 +24,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
-*/
+ */
 
 package vcl