From a3cb2b8a41b9cf7ec3e0f2b8869d0ee6b7e2ef81 Mon Sep 17 00:00:00 2001 From: joshvanl Date: Mon, 26 Jul 2021 17:03:58 +0100 Subject: [PATCH] Update ACME e2e tests to use apiextensions v1beta1 -> v1 Signed-off-by: joshvanl --- test/acme/dns/BUILD.bazel | 2 +- test/acme/dns/fixture.go | 4 ++-- test/acme/dns/options.go | 6 +++--- test/e2e/suite/issuers/acme/certificate/BUILD.bazel | 2 +- test/e2e/suite/issuers/acme/certificate/webhook.go | 4 ++-- test/e2e/util/BUILD.bazel | 2 +- test/e2e/util/util.go | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/acme/dns/BUILD.bazel b/test/acme/dns/BUILD.bazel index e8a29c8df..246898ef0 100644 --- a/test/acme/dns/BUILD.bazel +++ b/test/acme/dns/BUILD.bazel @@ -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", diff --git a/test/acme/dns/fixture.go b/test/acme/dns/fixture.go index cd74977c9..97c148fd3 100644 --- a/test/acme/dns/fixture.go +++ b/test/acme/dns/fixture.go @@ -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 diff --git a/test/acme/dns/options.go b/test/acme/dns/options.go index 2137ed654..c93ce7c2c 100644 --- a/test/acme/dns/options.go +++ b/test/acme/dns/options.go @@ -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} } } diff --git a/test/e2e/suite/issuers/acme/certificate/BUILD.bazel b/test/e2e/suite/issuers/acme/certificate/BUILD.bazel index 96ed0f47a..5979d3150 100644 --- a/test/e2e/suite/issuers/acme/certificate/BUILD.bazel +++ b/test/e2e/suite/issuers/acme/certificate/BUILD.bazel @@ -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", diff --git a/test/e2e/suite/issuers/acme/certificate/webhook.go b/test/e2e/suite/issuers/acme/certificate/webhook.go index c2f0cf790..a7b27499e 100644 --- a/test/e2e/suite/issuers/acme/certificate/webhook.go +++ b/test/e2e/suite/issuers/acme/certificate/webhook.go @@ -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(`{}`), }, }, diff --git a/test/e2e/util/BUILD.bazel b/test/e2e/util/BUILD.bazel index e0dd9afb0..1588c6546 100644 --- a/test/e2e/util/BUILD.bazel +++ b/test/e2e/util/BUILD.bazel @@ -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", diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go index 731b9e39a..008f4efc0 100644 --- a/test/e2e/util/util.go +++ b/test/e2e/util/util.go @@ -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)