diff --git a/lemur/plugins/lemur_kubernetes/plugin.py b/lemur/plugins/lemur_kubernetes/plugin.py index fc427878..444b8412 100644 --- a/lemur/plugins/lemur_kubernetes/plugin.py +++ b/lemur/plugins/lemur_kubernetes/plugin.py @@ -10,15 +10,13 @@ .. moduleauthor:: Mikhail Khodorovskiy """ -from cryptography import x509 -from cryptography.hazmat.backends import default_backend -from lemur.certificates.models import get_cn -from lemur.plugins.bases import DestinationPlugin - -import itertools import base64 -import requests import urllib +import requests +import itertools + +from lemur.certificates.models import Certificate +from lemur.plugins.bases import DestinationPlugin DEFAULT_API_VERSION = 'v1' @@ -109,11 +107,10 @@ class KubernetesDestinationPlugin(DestinationPlugin): k8s_api = K8sSession(k8_bearer, k8_cert) - cert = x509.load_pem_x509_certificate(str(body), default_backend()) - name = get_cn(cert) + cert = Certificate(body=body) # in the future once runtime properties can be passed-in - use passed-in secret name - secret_name = 'certs-' + urllib.quote_plus(name) + secret_name = 'certs-' + urllib.quote_plus(cert.name) err = ensure_resource(k8s_api, k8s_base_uri=k8_base_uri, namespace=k8_namespace, kind="secret", name=secret_name, data={ 'apiVersion': 'v1', diff --git a/setup.py b/setup.py index 539673e1..d03c78cb 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,8 @@ install_requires = [ 'inflection==0.3.1', 'future==0.15.2', 'boto==2.38.0', # we might make this optional - 'boto3==1.3.0' + 'boto3==1.3.0', + 'acme==0.1.0' ] tests_require = [