Merge remote-tracking branch 'origin/master' into ogronnesby/persist-scaling-events

1 files changed, 16 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ControllerIdentityProvider.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ControllerIdentityProvider.java
new file mode 100644
index 00000000000..d2a7fb01ae2
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ControllerIdentityProvider.java
@@ -0,0 +1,16 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.api.integration;
+
+import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
+
+import javax.net.ssl.SSLSocketFactory;
+
+/**
+ * @author freva
+ */
+public interface ControllerIdentityProvider extends ServiceIdentityProvider {
+
+    /** Returns SSLSocketFactory that creates appropriate sockets to talk to the different config servers */
+    SSLSocketFactory getConfigServerSslSocketFactory();
+
+}