Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Entrust: add organization handling-error in script

This commit is contained in:
sirferl 2020-11-13 07:57:06 +01:00
parent 50ffe6a29c
commit b191b32312
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/plugins/lemur_entrust/plugin.py
View File

@ -79,7 +79,9 @@ def process_options(options, client_id):
"certType": product_type, "certType": product_type,
"certExpiryDate": validity_end, "certExpiryDate": validity_end,
# "keyType": "RSA", Entrust complaining about this parameter # "keyType": "RSA", Entrust complaining about this parameter
"tracking": tracking_data "tracking": tracking_data,
"org": options.get("organization"),
"clientId": client_id
} }
return data return data

2
lemur/plugins/lemur_kubernetes/plugin.py
View File

@ -96,7 +96,7 @@ def build_secret(secret_format, secret_name, body, private_key, cert_chain):
if secret_format == "TLS": if secret_format == "TLS":
secret["type"] = "kubernetes.io/tls" secret["type"] = "kubernetes.io/tls"
secret["data"] = { secret["data"] = {
"tls.crt": base64encode(body), "tls.crt": base64encode("%s\n%s" % (body, cert_chain)),
"tls.key": base64encode(private_key), "tls.key": base64encode(private_key),
} }
if secret_format == "Certificate": if secret_format == "Certificate":