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

Ensure ClusterIssuer is deleted after tests

Browse Source 
Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
This commit is contained in:
JoshVanL 2019-11-11 16:35:23 +00:00
parent 56a40ddba7
commit 854c67d718
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/suite/conformance/certificates/acme/acme.go
View File

@ -99,6 +99,11 @@ func (a *acmeIssuerProvisioner) delete(f *framework.Framework, ref cmmeta.Object
Expect(a.cloudflare.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision cloudflare")
}
Expect(a.tiller.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tiller")
if ref.Kind == "ClusterIssuer" {
err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(ref.Name, nil)
Expect(err).NotTo(HaveOccurred())
}
}
// createXXX will deploy the required components to run an ACME issuer based test.

15
test/e2e/suite/conformance/certificates/ca/ca.go
View File

@ -38,13 +38,14 @@ var _ = framework.ConformanceDescribe("Certificates", func() {
(&certificates.Suite{
Name: "CA ClusterIssuer",
CreateIssuerFunc: createCAClusterIssuer,
DeleteIssuerFunc: deleteCAClusterIssuer,
}).Define()
})
func createCAIssuer(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a CA Issuer")
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name).Create(newSigningKeypairSecret("root-cert"))
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name).Create(newSigningKeypairSecret("root-ca-cert"))
Expect(err).NotTo(HaveOccurred(), "failed to create root signing keypair secret")
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
@ -66,7 +67,7 @@ func createCAIssuer(f *framework.Framework) cmmeta.ObjectReference {
func createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a CA ClusterIssuer")
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Create(newSigningKeypairSecret("root-cert"))
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Create(newSigningKeypairSecret("root-ca-cert"))
Expect(err).NotTo(HaveOccurred(), "failed to create root signing keypair secret")
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(&cmapi.ClusterIssuer{
@ -85,6 +86,16 @@ func createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
}
}
func deleteCAClusterIssuer(f *framework.Framework, issuer cmmeta.ObjectReference) {
By("Deleting CA ClusterIssuer")
err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Delete("root-ca-cert", nil)
Expect(err).NotTo(HaveOccurred(), "failed to delete root signing keypair secret")
err = f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(issuer.Name, nil)
Expect(err).NotTo(HaveOccurred(), "failed to delete ca issuer")
}
func createCAIssuerSpec(rootCertSecretName string) cmapi.IssuerSpec {
return cmapi.IssuerSpec{
IssuerConfig: cmapi.IssuerConfig{

8
test/e2e/suite/conformance/certificates/selfsigned/selfsigned.go
View File

@ -36,6 +36,7 @@ var _ = framework.ConformanceDescribe("Certificates", func() {
(&certificates.Suite{
Name: "SelfSigned ClusterIssuer",
CreateIssuerFunc: createSelfSignedClusterIssuer,
DeleteIssuerFunc: deleteSelfSignedClusterIssuer,
}).Define()
})
@ -57,10 +58,15 @@ func createSelfSignedIssuer(f *framework.Framework) cmmeta.ObjectReference {
}
}
func deleteSelfSignedClusterIssuer(f *framework.Framework, issuer cmmeta.ObjectReference) {
err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(issuer.Name, nil)
Expect(err).NotTo(HaveOccurred())
}
func createSelfSignedClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a SelfSigned ClusterIssuer")
_, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
_, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(&cmapi.ClusterIssuer{
ObjectMeta: metav1.ObjectMeta{
Name: "selfsigned",
},

8
test/e2e/suite/conformance/certificates/vault/vault_approle.go
View File

@ -76,6 +76,14 @@ func (v *vaultAppRoleProvisioner) delete(f *framework.Framework, ref cmmeta.Obje
Expect(v.vaultInit.Clean()).NotTo(HaveOccurred(), "failed to deprovision vault initializer")
Expect(v.vault.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision vault")
Expect(v.tiller.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tiller")
if ref.Kind == "ClusterIssuer" {
err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(ref.Name, nil)
Expect(err).NotTo(HaveOccurred())
err = f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Delete(vaultSecretAppRoleName, nil)
Expect(err).NotTo(HaveOccurred())
}
}
func (v *vaultAppRoleProvisioner) createIssuer(f *framework.Framework) cmmeta.ObjectReference {

5
test/e2e/suite/conformance/certificates/venafi/venafi.go
View File

@ -62,6 +62,11 @@ type venafiProvisioner struct {
func (v *venafiProvisioner) delete(f *framework.Framework, ref cmmeta.ObjectReference) {
Expect(v.tpp.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tpp venafi")
if ref.Kind == "ClusterIssuer" {
err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(ref.Name, nil)
Expect(err).NotTo(HaveOccurred())
}
}
func (v *venafiProvisioner) createIssuer(f *framework.Framework) cmmeta.ObjectReference {