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

Sets all conformance issuers to have generate name

Browse Source 
Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
This commit is contained in:
JoshVanL 2019-11-12 09:59:56 +00:00
parent 854c67d718
commit d57cd5a6c7
12 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ func (a *acmeIssuerProvisioner) createHTTP01Issuer(f *framework.Framework) cmmet
By("Creating an ACME HTTP01 Issuer")
issuer := &cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "acme-issuer-http01",
GenerateName: "acme-issuer-http01-",
},
Spec: a.createHTTP01IssuerSpec(),
}
@ -127,8 +127,8 @@ func (a *acmeIssuerProvisioner) createHTTP01Issuer(f *framework.Framework) cmmet
Expect(err).NotTo(HaveOccurred(), "failed to create acme HTTP01 issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -139,7 +139,7 @@ func (a *acmeIssuerProvisioner) createHTTP01ClusterIssuer(f *framework.Framework
By("Creating an ACME HTTP01 ClusterIssuer")
issuer := &cmapi.ClusterIssuer{
ObjectMeta: metav1.ObjectMeta{
Name: "acme-issuer-http01",
GenerateName: "acme-cluster-issuer-http01-",
},
Spec: a.createHTTP01IssuerSpec(),
}
@ -148,8 +148,8 @@ func (a *acmeIssuerProvisioner) createHTTP01ClusterIssuer(f *framework.Framework
Expect(err).NotTo(HaveOccurred(), "failed to create acme HTTP01 cluster issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -192,7 +192,7 @@ func (a *acmeIssuerProvisioner) createDNS01Issuer(f *framework.Framework) cmmeta
By("Creating an ACME DNS01 Issuer")
issuer := &cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "acme-issuer-dns01",
GenerateName: "acme-issuer-dns01-",
},
Spec: a.createDNS01IssuerSpec(),
}
@ -200,8 +200,8 @@ func (a *acmeIssuerProvisioner) createDNS01Issuer(f *framework.Framework) cmmeta
Expect(err).NotTo(HaveOccurred(), "failed to create acme DNS01 Issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -218,7 +218,7 @@ func (a *acmeIssuerProvisioner) createDNS01ClusterIssuer(f *framework.Framework)
By("Creating an ACME DNS01 ClusterIssuer")
issuer := &cmapi.ClusterIssuer{
ObjectMeta: metav1.ObjectMeta{
Name: "acme-issuer-dns01",
GenerateName: "acme-cluster-issuer-dns01-",
},
Spec: a.createDNS01IssuerSpec(),
}
@ -226,8 +226,8 @@ func (a *acmeIssuerProvisioner) createDNS01ClusterIssuer(f *framework.Framework)
Expect(err).NotTo(HaveOccurred(), "failed to create acme DNS01 ClusterIssuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}

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

@ -50,7 +50,7 @@ func createCAIssuer(f *framework.Framework) cmmeta.ObjectReference {
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "ca",
GenerateName: "ca-issuer-",
},
Spec: createCAIssuerSpec(rootCertSecret.Name),
})
@ -58,8 +58,8 @@ func createCAIssuer(f *framework.Framework) cmmeta.ObjectReference {
Expect(err).NotTo(HaveOccurred(), "failed to create ca issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -72,7 +72,7 @@ func createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(&cmapi.ClusterIssuer{
ObjectMeta: metav1.ObjectMeta{
Name: "ca",
GenerateName: "ca-cluster-issuer-",
},
Spec: createCAIssuerSpec(rootCertSecret.Name),
})
@ -80,8 +80,8 @@ func createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
Expect(err).NotTo(HaveOccurred(), "failed to create ca issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}

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

@ -43,18 +43,18 @@ var _ = framework.ConformanceDescribe("Certificates", func() {
func createSelfSignedIssuer(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a SelfSigned Issuer")
_, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "selfsigned",
GenerateName: "selfsigned-issuer-",
},
Spec: createSelfSignedIssuerSpec(),
})
Expect(err).NotTo(HaveOccurred(), "failed to create self signed issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Name: "selfsigned",
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -66,18 +66,18 @@ func deleteSelfSignedClusterIssuer(f *framework.Framework, issuer cmmeta.ObjectR
func createSelfSignedClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a SelfSigned ClusterIssuer")
_, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(&cmapi.ClusterIssuer{
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(&cmapi.ClusterIssuer{
ObjectMeta: metav1.ObjectMeta{
Name: "selfsigned",
GenerateName: "selfsigned-cluster-issuer-",
},
Spec: createSelfSignedIssuerSpec(),
})
Expect(err).NotTo(HaveOccurred(), "failed to create self signed issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Name: "selfsigned",
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}

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

@ -96,15 +96,15 @@ func (v *vaultAppRoleProvisioner) createIssuer(f *framework.Framework) cmmeta.Ob
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "vault-issuer",
GenerateName: "vault-issuer-",
},
Spec: v.createIssuerSpec(f, vaultSecrets),
})
Expect(err).NotTo(HaveOccurred(), "failed to create vault issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -119,15 +119,15 @@ func (v *vaultAppRoleProvisioner) createClusterIssuer(f *framework.Framework) cm
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "vault-issuer",
GenerateName: "vault-cluster-issuer-",
},
Spec: v.createIssuerSpec(f, vaultSecrets),
})
Expect(err).NotTo(HaveOccurred(), "failed to create vault issuer")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}

1
test/e2e/suite/conformance/certificates/venafi/BUILD.bazel
View File

@ -6,7 +6,6 @@ go_library(
importpath = "github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates/venafi",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/certmanager/v1alpha2:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon:go_default_library",

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

@ -20,7 +20,6 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
@ -89,8 +88,8 @@ func (v *venafiProvisioner) createIssuer(f *framework.Framework) cmmeta.ObjectRe
Expect(err).NotTo(HaveOccurred(), "failed to create issuer for venafi")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}
@ -115,8 +114,8 @@ func (v *venafiProvisioner) createClusterIssuer(f *framework.Framework) cmmeta.O
Expect(err).NotTo(HaveOccurred(), "failed to create issuer for venafi")
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.ClusterIssuerKind,
Group: issuer.GroupVersionKind().Group,
Kind: issuer.Kind,
Name: issuer.Name,
}
}

1
test/e2e/suite/issuers/vault/certificate/BUILD.bazel
View File

@ -13,6 +13,7 @@ go_library(
"//pkg/apis/certmanager/v1alpha2:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/framework/addon/vault:go_default_library",
"//test/e2e/util:go_default_library",

3
test/e2e/suite/issuers/vault/certificate/approle.go
View File

@ -26,6 +26,7 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/e2e/util"
@ -83,7 +84,7 @@ func runVaultAppRoleTests(issuerKind string) {
if issuerKind == cmapi.IssuerKind {
vaultSecretNamespace = f.Namespace.Name
} else {
vaultSecretNamespace = "kube-system"
vaultSecretNamespace = addon.CertManager.Namespace
}
vaultInit = &vaultaddon.VaultInitializer{

3
test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go
View File

@ -26,6 +26,7 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/e2e/util"
@ -82,7 +83,7 @@ func runVaultCustomAppRoleTests(issuerKind string) {
if issuerKind == cmapi.IssuerKind {
vaultSecretNamespace = f.Namespace.Name
} else {
vaultSecretNamespace = "kube-system"
vaultSecretNamespace = addon.CertManager.Namespace
}
vaultInit = &vaultaddon.VaultInitializer{

1
test/e2e/suite/issuers/vault/certificaterequest/BUILD.bazel
View File

@ -12,6 +12,7 @@ go_library(
"//pkg/apis/certmanager/v1alpha2:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/framework/addon/vault:go_default_library",
"//test/e2e/util:go_default_library",

3
test/e2e/suite/issuers/vault/certificaterequest/approle.go
View File

@ -29,6 +29,7 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/e2e/util"
@ -90,7 +91,7 @@ func runVaultAppRoleTests(issuerKind string) {
if issuerKind == cmapi.IssuerKind {
vaultSecretNamespace = f.Namespace.Name
} else {
vaultSecretNamespace = "kube-system"
vaultSecretNamespace = addon.CertManager.Namespace
}
vaultInit = &vaultaddon.VaultInitializer{

3
test/e2e/suite/issuers/vault/certificaterequest/approle_custom_mount.go
View File

@ -29,6 +29,7 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
"github.com/jetstack/cert-manager/test/e2e/util"
@ -92,7 +93,7 @@ func runVaultCustomAppRoleTests(issuerKind string) {
if issuerKind == cmapi.IssuerKind {
vaultSecretNamespace = f.Namespace.Name
} else {
vaultSecretNamespace = "kube-system"
vaultSecretNamespace = addon.CertManager.Namespace
}
vaultInit = &vaultaddon.VaultInitializer{