weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix check for certificate in ingress-shim e2e

Browse Source
This commit is contained in:
James Munnelly 2017-12-01 01:41:40 +00:00
parent 3ccadb5f73
commit 70e2a2ec60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/framework.go
View File

@ -28,7 +28,7 @@ import (
const (
certManagerPodName = "test-cert-manager"
ingressShimPodName = "test-cert-manager"
ingressShimPodName = "test-ingress-shim"
)
// Framework supports common operations used by e2e tests; it will keep a client & a namespace for you.

6
test/e2e/ingress/certificate_acme.go
View File

@ -94,17 +94,17 @@ var _ = framework.CertManagerDescribe("ACME Certificate with Ingress (HTTP01)",
It("should obtain a signed certificate with a single CN from the ACME server when putting an annotation on an ingress resource", func() {
By("Creating an Ingress with the issuer name annotation set")
_, err := f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.Namespace.Name).Create(util.NewIngress(certificateName, certificateSecretName, map[string]string{
_, err := f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.Namespace.Name).Create(util.NewIngress(certificateSecretName, certificateSecretName, map[string]string{
"certmanager.k8s.io/issuer": issuerName,
"certmanager.k8s.io/acme-challenge-provider": "http01",
}, acmeCertificateDomain))
Expect(err).NotTo(HaveOccurred())
By("Waiting for Certificate to exist")
err = util.WaitForCertificateToExist(f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name), certificateName, foreverTestTimeout)
err = util.WaitForCertificateToExist(f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name), certificateSecretName, foreverTestTimeout)
Expect(err).NotTo(HaveOccurred())
By("Waiting for Certificate to become Ready")
err = util.WaitForCertificateCondition(f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name),
certificateName,
certificateSecretName,
v1alpha1.CertificateCondition{
Type: v1alpha1.CertificateConditionReady,
Status: v1alpha1.ConditionTrue,