Repository: brooklyn-server Updated Branches: refs/heads/master 0f59ec8c8 -> 215f28f25
deploy-to-k8s: make trustCerts configurable Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/20b498dc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/20b498dc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/20b498dc Branch: refs/heads/master Commit: 20b498dc6b2973a37df22c23215eb1c77e3737da Parents: 0f59ec8 Author: Aled Sage <aled.s...@gmail.com> Authored: Wed Aug 22 10:33:08 2018 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Wed Aug 22 10:33:08 2018 +0100 ---------------------------------------------------------------------- .../location/kubernetes/KubernetesClientRegistryImpl.java | 3 ++- .../location/kubernetes/KubernetesLocationConfig.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/20b498dc/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java index 8ac1c64..0d81059 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java @@ -115,6 +115,7 @@ public class KubernetesClientRegistryImpl implements KubernetesClientRegistry { } } else { String masterUrl = checkNotNull(conf.get(KubernetesLocationConfig.MASTER_URL), "master url must not be null"); + Boolean trustCerts = conf.get(KubernetesLocationConfig.TRUST_CERTS); URL url; try { @@ -124,7 +125,7 @@ public class KubernetesClientRegistryImpl implements KubernetesClientRegistry { } configBuilder.withMasterUrl(masterUrl) - .withTrustCerts(false); + .withTrustCerts(trustCerts != null ? trustCerts : Boolean.FALSE); if (url.getProtocol().equals("https")) { KubernetesCerts certs = new KubernetesCerts(conf); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/20b498dc/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java index 0a6a38d..fabf300 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java @@ -191,5 +191,9 @@ public interface KubernetesLocationConfig extends CloudLocationConfig { .description("Whether to inject login credentials (if null, will infer from image choice); ignored if explicit 'loginUser.password' supplied") .build(); + ConfigKey<Boolean> TRUST_CERTS = ConfigKeys.builder(Boolean.class) + .name("trustCerts") + .description("Whether to trust self-signed certs") + .defaultValue(false) + .build(); } -
