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

Fix nil panic

Browse Source
This commit is contained in:
Louis Taylor 2018-07-19 16:37:21 +01:00
parent 4601c95557
commit e5e5362e2a
No known key found for this signature in database
GPG Key ID: 8E81A6DAE13E7098
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/certificate/certificate_selfsigned.go
View File

@ -27,15 +27,16 @@ import (
var _ = framework.CertManagerDescribe("Self Signed Certificate", func() {
f := framework.NewDefaultFramework("create-selfsigned-certificate")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
issuerName := "test-selfsigned-issuer"
certificateName := "test-selfsigned-certificate"
certificateSecretName := "test-selfsigned-certificate"
It("should generate a signed keypair", func() {
By("Creating an Issuer")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
_, err := f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(util.NewCertManagerSelfSignedIssuer(issuerName))
Expect(err).NotTo(HaveOccurred())
By("Waiting for Issuer to become Ready")
@ -47,7 +48,7 @@ var _ = framework.CertManagerDescribe("Self Signed Certificate", func() {
})
Expect(err).NotTo(HaveOccurred())
By("Creating a Certificate")
_, err = f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name).Create(util.NewCertManagerBasicCertificate(certificateName, certificateSecretName, issuerName, v1alpha1.IssuerKind))
_, err = certClient.Create(util.NewCertManagerBasicCertificate(certificateName, certificateSecretName, issuerName, v1alpha1.IssuerKind))
Expect(err).NotTo(HaveOccurred())
err = util.WaitCertificateIssuedValid(certClient, secretClient, certificateName, time.Minute*2)
Expect(err).NotTo(HaveOccurred())

14
test/e2e/certificate/certificate_vault.go
View File

@ -17,9 +17,6 @@ import (
var _ = framework.CertManagerDescribe("Vault Certificate (AppRole)", func() {
f := framework.NewDefaultFramework("create-vault-certificate")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
rootMount := "root-ca"
intermediateMount := "intermediate-ca"
role := "kubernetes-vault"
@ -59,6 +56,10 @@ var _ = framework.CertManagerDescribe("Vault Certificate (AppRole)", func() {
vaultURL := "http://vault.vault:8200"
It("should generate a new valid certificate", func() {
By("Creating an Issuer")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
_, err := f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(util.NewCertManagerVaultIssuerAppRole(issuerName, vaultURL, vaultPath, roleId, vaultSecretAppRoleName, authPath))
Expect(err).NotTo(HaveOccurred())
@ -84,9 +85,6 @@ var _ = framework.CertManagerDescribe("Vault Certificate (AppRole)", func() {
var _ = framework.CertManagerDescribe("Vault Certificate (AppRole with a custom mount path)", func() {
f := framework.NewDefaultFramework("create-vault-certificate")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
rootMount := "root-ca"
intermediateMount := "intermediate-ca"
authPath := "custom/path"
@ -126,6 +124,10 @@ var _ = framework.CertManagerDescribe("Vault Certificate (AppRole with a custom
vaultURL := "http://vault.vault:8200"
It("should generate a new valid certificate", func() {
By("Creating an Issuer")
certClient := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name)
secretClient := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name)
_, err := f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(util.NewCertManagerVaultIssuerAppRole(issuerName, vaultURL, vaultPath, roleId, vaultSecretAppRoleName, authPath))
Expect(err).NotTo(HaveOccurred())