home/cert-manager
2
0
Fork 0
mirror of https://github.com/wahyd4/cert-manager.git synced 2026-08-09 05:06:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Update ACME e2e tests to use apiextensions v1beta1 -> v1

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl
2021-07-26 17:03:58 +01:00
parent 12d4246c8a
commit a3cb2b8a41
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acme/dns/BUILD.bazel
+1 -1
View File
@@ -22,7 +22,7 @@ go_library(
"//test/internal/apiserver:go_default_library",
"@com_github_miekg_dns//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/util/wait:go_default_library",
"@io_k8s_client_go//kubernetes:go_default_library",
test/acme/dns/fixture.go
+2 -2
View File
@@ -23,7 +23,7 @@ import (
"testing"
"time"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -47,7 +47,7 @@ type fixture struct {
resolvedFQDN string
resolvedZone string
allowAmbientCredentials bool
jsonConfig *v1beta1.JSON
jsonConfig *apiextensionsv1.JSON
strictMode bool
useAuthoritative *bool
kubectlManifestsPath string
test/acme/dns/options.go
+3 -3
View File
@@ -23,7 +23,7 @@ import (
"strings"
"time"
extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"github.com/jetstack/cert-manager/pkg/acme/webhook"
)
@@ -61,7 +61,7 @@ func applyDefaults(f *fixture) {
if f.kubectlManifestsPath != "" {
d, err := ioutil.ReadFile(f.kubectlManifestsPath + "/config.json")
if err == nil {
f.jsonConfig = &extapi.JSON{
f.jsonConfig = &apiextensionsv1.JSON{
Raw: d,
}
}
@@ -121,7 +121,7 @@ func SetConfig(i interface{}) Option {
if err != nil {
panic(err)
}
f.jsonConfig = &extapi.JSON{Raw: d}
f.jsonConfig = &apiextensionsv1.JSON{Raw: d}
}
}
test/e2e/suite/issuers/acme/certificate/BUILD.bazel
+1 -1
View File
@@ -27,7 +27,7 @@ go_library(
"@com_github_onsi_gomega//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
"@io_k8s_api//networking/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/util/intstr:go_default_library",
"@io_k8s_apimachinery//pkg/util/wait:go_default_library",
test/e2e/suite/issuers/acme/certificate/webhook.go
+2 -2
View File
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
@@ -66,7 +66,7 @@ var _ = framework.CertManagerDescribe("ACME webhook DNS provider", func() {
Webhook: &cmacme.ACMEIssuerDNS01ProviderWebhook{
GroupName: f.Config.Addons.DNS01Webhook.GroupName,
SolverName: f.Config.Addons.DNS01Webhook.SolverName,
Config: &v1beta1.JSON{
Config: &apiextensionsv1.JSON{
Raw: []byte(`{}`),
},
},
test/e2e/util/BUILD.bazel
+1 -1
View File
@@ -19,7 +19,7 @@ go_library(
"//test/e2e/framework/log:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
"@io_k8s_api//networking/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/client/clientset/clientset/typed/apiextensions/v1:go_default_library",
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/util/intstr:go_default_library",
test/e2e/util/util.go
+2 -2
View File
@@ -31,7 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
apiextcs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
@@ -272,7 +272,7 @@ func WaitForCertificateToExist(client clientset.CertificateInterface, name strin
// WaitForCRDToNotExist waits for the CRD with the given name to no
// longer exist.
func WaitForCRDToNotExist(client apiextcs.CustomResourceDefinitionInterface, name string) error {
func WaitForCRDToNotExist(client apiextensionsv1.CustomResourceDefinitionInterface, name string) error {
return wait.PollImmediate(500*time.Millisecond, time.Minute,
func() (bool, error) {
log.Logf("Waiting for CRD %v to not exist", name)