From b191b32312d380543e37ce3b5340d58ceeb50437 Mon Sep 17 00:00:00 2001 From: sirferl Date: Fri, 13 Nov 2020 07:57:06 +0100 Subject: [PATCH] Entrust: add organization handling-error in script --- lemur/plugins/lemur_entrust/plugin.py | 4 +++- lemur/plugins/lemur_kubernetes/plugin.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lemur/plugins/lemur_entrust/plugin.py b/lemur/plugins/lemur_entrust/plugin.py index 3e00a1f4..924345eb 100644 --- a/lemur/plugins/lemur_entrust/plugin.py +++ b/lemur/plugins/lemur_entrust/plugin.py @@ -79,7 +79,9 @@ def process_options(options, client_id): "certType": product_type, "certExpiryDate": validity_end, # "keyType": "RSA", Entrust complaining about this parameter - "tracking": tracking_data + "tracking": tracking_data, + "org": options.get("organization"), + "clientId": client_id } return data diff --git a/lemur/plugins/lemur_kubernetes/plugin.py b/lemur/plugins/lemur_kubernetes/plugin.py index f7ff00f7..b8ea3d1b 100644 --- a/lemur/plugins/lemur_kubernetes/plugin.py +++ b/lemur/plugins/lemur_kubernetes/plugin.py @@ -96,7 +96,7 @@ def build_secret(secret_format, secret_name, body, private_key, cert_chain): if secret_format == "TLS": secret["type"] = "kubernetes.io/tls" secret["data"] = { - "tls.crt": base64encode(body), + "tls.crt": base64encode("%s\n%s" % (body, cert_chain)), "tls.key": base64encode(private_key), } if secret_format == "Certificate":