Merge pull request #42 from subicura/support-patch-service

Support patch service

Author: aledbf

internal/apis/admin/service.go

@@ -15,6 +15,7 @@ type ServiceInterface interface {
 	List(url.Values) (*adminv1.ServiceList, error)
 	Get(string) (*adminv1.Service, *APIResponse)
 	Create(*adminv1.Service) (*adminv1.Service, *APIResponse)
+	Patch(string, *adminv1.Service) (*adminv1.Service, *APIResponse)
 	Delete(string) error
 }
 
@@ -28,6 +29,12 @@ func (a *serviceAPI) Create(service *adminv1.Service) (*adminv1.Service, *APIRes
 	return out, err
 }
 
+func (a *serviceAPI) Patch(id string, service *adminv1.Service) (*adminv1.Service, *APIResponse) {
+	out := &adminv1.Service{}
+	err := a.client.Patch(id, service, out)
+	return out, err
+}
+
 func (a *serviceAPI) Get(name string) (*adminv1.Service, *APIResponse) {
 	out := &adminv1.Service{}
 	err := a.client.Get(name, out)

internal/ingress/controller/kong.go

@@ -238,17 +238,19 @@ func (n *NGINXController) syncServices(ingressCfg *ingress.Configuration) (bool,
 					port = 443
 				}
 
-				_, res := client.Services().Get(name)
+				s, res := client.Services().Get(name)
 				if res.StatusCode == http.StatusNotFound {
-					s := &kongadminv1.Service{
+					s = &kongadminv1.Service{
 						Name:     name,
 						Path:     "/",
 						Protocol: proto,
 						Host:     name,
 						Port:     port,
 						Retries:  5,
 					}
+				}
 
+				if s != nil {
 					if kongIngress != nil && kongIngress.Proxy != nil {
 						if kongIngress.Proxy.Path != "" {
 							s.Path = kongIngress.Proxy.Path
@@ -271,11 +273,20 @@ func (n *NGINXController) syncServices(ingressCfg *ingress.Configuration) (bool,
 						}
 					}
 
-					glog.Infof("creating Kong Service name %v", name)
-					_, res := client.Services().Create(s)
-					if res.StatusCode != http.StatusCreated {
-						glog.Errorf("Unexpected error creating Kong Service: %v", res)
-						return false, res.Error()
+					if res.StatusCode == http.StatusNotFound {
+						glog.Infof("Creating Kong Service name %v", name)
+						_, res := client.Services().Create(s)
+						if res.StatusCode != http.StatusCreated {
+							glog.Errorf("Unexpected error creating Kong Service: %v", res)
+							return false, res.Error()
+						}
+					} else {
+						glog.Infof("Patching Kong Service name %v", name)
+						_, res := client.Services().Patch(s.ID, s)
+						if res.StatusCode != http.StatusOK {
+							glog.Errorf("Unexpected error patching Kong Service: %v", res)
+							return false, res.Error()
+						}
 					}
 				}