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

Update apis in e2e conformance tests

Browse Source 
Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
This commit is contained in:
JoshVanL 2019-09-23 15:16:03 +01:00
parent cd53c9e004
commit 030d28ed5b
4 changed files with 14 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/e2e/suite/conformance/certificates/vault/BUILD.bazel
View File

@ -1,31 +0,0 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["vault.go"],
importpath = "github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates/vault",
visibility = ["//visibility:public"],
deps = [
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon/tiller:go_default_library",
"//test/e2e/framework/addon/vault:go_default_library",
"//test/e2e/suite/conformance/certificates:go_default_library",
"@com_github_onsi_ginkgo//:go_default_library",
"@com_github_onsi_gomega//:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

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

@ -23,7 +23,8 @@ import (
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
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/tiller"
vault "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
@ -45,12 +46,12 @@ type vaultProvisioner struct {
vault *vault.Vault
}
func (v *vaultProvisioner) delete(f *framework.Framework, ref cmapi.ObjectReference) {
func (v *vaultProvisioner) delete(f *framework.Framework, ref cmmeta.ObjectReference) {
Expect(v.vault.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision vault")
Expect(v.tiller.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tiller")
}
func (v *vaultProvisioner) create(f *framework.Framework) cmapi.ObjectReference {
func (v *vaultProvisioner) create(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a Vault issuer")
v.tiller = &tiller.Tiller{
@ -92,7 +93,7 @@ func (v *vaultProvisioner) create(f *framework.Framework) cmapi.ObjectReference
_, err = f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name).Create(vault.NewVaultAppRoleSecret(vaultSecretAppRoleName, secretID))
Expect(err).NotTo(HaveOccurred(), "vault to store app role secret from vault")
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(&cmapi.Issuer{
ObjectMeta: metav1.ObjectMeta{
Name: "vault-issuer",
},
@ -106,9 +107,9 @@ func (v *vaultProvisioner) create(f *framework.Framework) cmapi.ObjectReference
AppRole: cmapi.VaultAppRole{
Path: authPath,
RoleId: roleID,
SecretRef: cmapi.SecretKeySelector{
SecretRef: cmmeta.SecretKeySelector{
Key: "secretkey",
LocalObjectReference: cmapi.LocalObjectReference{
LocalObjectReference: cmmeta.LocalObjectReference{
Name: vaultSecretAppRoleName,
},
},
@ -120,7 +121,7 @@ func (v *vaultProvisioner) create(f *framework.Framework) cmapi.ObjectReference
})
Expect(err).NotTo(HaveOccurred(), "failed to create vault issuer")
return cmapi.ObjectReference{
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Name: issuer.Name,

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

@ -1,30 +0,0 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["venafi.go"],
importpath = "github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates/venafi",
visibility = ["//visibility:public"],
deps = [
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/util/errors:go_default_library",
"//test/e2e/suite/conformance/certificates:go_default_library",
"//test/e2e/suite/issuers/venafi/addon:go_default_library",
"@com_github_onsi_ginkgo//:go_default_library",
"@com_github_onsi_gomega//:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

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

@ -20,7 +20,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
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/util/errors"
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
@ -51,11 +52,11 @@ type venafiProvisioner struct {
tpp *vaddon.VenafiTPP
}
func (v *venafiProvisioner) delete(f *framework.Framework, ref cmapi.ObjectReference) {
func (v *venafiProvisioner) delete(f *framework.Framework, ref cmmeta.ObjectReference) {
Expect(v.tpp.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tpp venafi")
}
func (v *venafiProvisioner) create(f *framework.Framework) cmapi.ObjectReference {
func (v *venafiProvisioner) create(f *framework.Framework) cmmeta.ObjectReference {
By("Creating a Venafi issuer")
v.tpp = &vaddon.VenafiTPP{
@ -71,10 +72,10 @@ func (v *venafiProvisioner) create(f *framework.Framework) cmapi.ObjectReference
Expect(v.tpp.Provision()).NotTo(HaveOccurred(), "failed to provision tpp venafi")
issuer := v.tpp.Details().BuildIssuer()
issuer, err = f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(issuer)
issuer, err = f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(issuer)
Expect(err).NotTo(HaveOccurred(), "failed to create issuer for venafi")
return cmapi.ObjectReference{
return cmmeta.ObjectReference{
Group: cmapi.SchemeGroupVersion.Group,
Kind: cmapi.IssuerKind,
Name: issuer.Name,