From 973d4fc4e1cd1969ce3a8932359a693dcabdf1fb Mon Sep 17 00:00:00 2001 From: Sharon Jerop Kipruto Date: Wed, 22 May 2019 16:37:50 -0400 Subject: [PATCH 1/3] temporarily use branch version with upstream validation implemented --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 794eb522d7..4dccae126b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 1.11.497 - 0.7.0 + 0.7.0-qa-SNAPSHOT ${singularity.jar.name.format} oss-release 1.3.1 From b1be0b077b34cb9d35d9d697d57666ddac6fc721 Mon Sep 17 00:00:00 2001 From: Sharon Jerop Kipruto Date: Wed, 22 May 2019 16:38:26 -0400 Subject: [PATCH 2/3] enable upstream validation --- .../com/hubspot/singularity/hooks/LoadBalancerClientImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SingularityService/src/main/java/com/hubspot/singularity/hooks/LoadBalancerClientImpl.java b/SingularityService/src/main/java/com/hubspot/singularity/hooks/LoadBalancerClientImpl.java index cade723314..fb81f780ea 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/hooks/LoadBalancerClientImpl.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/hooks/LoadBalancerClientImpl.java @@ -211,7 +211,7 @@ public SingularityLoadBalancerUpdate makeAndSendLoadBalancerRequest(LoadBalancer final BaragonService lbService = new BaragonService(deploy.getLoadBalancerServiceIdOverride().or(request.getId()), serviceOwners, deploy.getServiceBasePath().get(), deploy.getLoadBalancerAdditionalRoutes().or(Collections.emptyList()), loadBalancerGroups, deploy.getLoadBalancerOptions().orNull(), deploy.getLoadBalancerTemplate(), deploy.getLoadBalancerDomains().or(Collections.emptySet())); - final BaragonRequest loadBalancerRequest = new BaragonRequest(loadBalancerRequestId.toString(), lbService, addUpstreams, removeUpstreams); + final BaragonRequest loadBalancerRequest = new BaragonRequest(loadBalancerRequestId.toString(), lbService, addUpstreams, removeUpstreams, Collections.emptyList(),Optional.absent(), Optional.of(RequestAction.UPDATE), false, false, false, true); return sendLoadBalancerRequest(loadBalancerRequestId, loadBalancerRequest, LoadBalancerMethod.ENQUEUE); } From f5adbf2860517185e552211d10f432535916da2b Mon Sep 17 00:00:00 2001 From: Sharon Jerop Kipruto Date: Thu, 30 May 2019 16:41:45 -0400 Subject: [PATCH 3/3] update baragon version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4dccae126b..57d7fe9b64 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 1.11.497 - 0.7.0-qa-SNAPSHOT + 0.8.0 ${singularity.jar.name.format} oss-release 1.3.1