aboutsummaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-29 10:21:40 +0200
committerjonmv <venstad@gmail.com>2022-04-29 10:21:40 +0200
commit130958eea280ecfa70f86dd8b3a7fc6ab1b0f85c (patch)
treea19718c98b6938d9357e856edc872ed7c0c2dfc8 /orchestrator
parent5b105439f736f8960c83eb4d20e7f91361384319 (diff)
Accept application/json from CCs, remove removed dependency
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/pom.xml6
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java2
2 files changed, 2 insertions, 6 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index 3052c6f81cd..d3e9351efc5 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -89,12 +89,6 @@
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>jaxrs_client_utils</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.yahoo.vespa</groupId>
<artifactId>application</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
index c34aeed132c..577a030d658 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
@@ -7,6 +7,7 @@ import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
import com.google.inject.Inject;
import com.yahoo.component.AbstractComponent;
import com.yahoo.vespa.applicationmodel.HostName;
+import org.apache.hc.core5.http.message.BasicHeader;
import java.io.IOException;
import java.util.List;
@@ -26,6 +27,7 @@ public class RetryingClusterControllerClientFactory extends AbstractComponent im
public RetryingClusterControllerClientFactory() {
this(AbstractHttpClient.wrapping(VespaHttpClientBuilder.create()
.setUserAgent("orchestrator-cluster-controller-client")
+ .setDefaultHeaders(List.of(new BasicHeader("Accept", "application/json")))
.build()));
}