summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@pvv.ntnu.no>2019-08-26 23:28:24 +0200
committerGitHub <noreply@github.com>2019-08-26 23:28:24 +0200
commitcd738a251fd218ce297b051b0ba8e97c1e48dabc (patch)
tree420b9562842db8967015c74f8aa6521a5f844e77 /configserver
parentb04a95077d8831a3c0d3606df80c5857b72db75f (diff)
Revert "provision certificates for directly routed zones"
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
index 78d39ef996b..eaa4916d8fc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
@@ -59,15 +59,17 @@ public class TlsSecretsKeys {
}
private Optional<TlsSecrets> readFromSecretStore(Optional<String> secretKeyname) {
- if (secretKeyname.isEmpty()) return Optional.empty();
+ if(secretKeyname.isEmpty()) return Optional.empty();
+ TlsSecrets tlsSecretParameters = TlsSecrets.MISSING;
try {
String cert = secretStore.getSecret(secretKeyname.get() + "-cert");
String key = secretStore.getSecret(secretKeyname.get() + "-key");
- return Optional.of(new TlsSecrets(cert, key));
+ tlsSecretParameters = new TlsSecrets(cert, key);
} catch (RuntimeException e) {
// Assume not ready yet
- return Optional.of(TlsSecrets.MISSING);
+// log.log(LogLevel.DEBUG, "Could not fetch certificate/key with prefix: " + secretKeyname.get(), e);
}
+ return Optional.of(tlsSecretParameters);
}
/** Returns a transaction which deletes these tls secrets key if they exist */