diff --git a/pkg/issuer/acme/dns/BUILD.bazel b/pkg/issuer/acme/dns/BUILD.bazel index 651087d07..dff08e222 100644 --- a/pkg/issuer/acme/dns/BUILD.bazel +++ b/pkg/issuer/acme/dns/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//pkg/issuer/acme/dns/webhook:go_default_library", "//pkg/logs:go_default_library", "@com_github_pkg_errors//: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_client_go//listers/core/v1:go_default_library", ], ) diff --git a/pkg/issuer/acme/dns/dns.go b/pkg/issuer/acme/dns/dns.go index f40546c3e..f92a52c31 100644 --- a/pkg/issuer/acme/dns/dns.go +++ b/pkg/issuer/acme/dns/dns.go @@ -24,7 +24,7 @@ import ( "time" "github.com/pkg/errors" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" corev1listers "k8s.io/client-go/listers/core/v1" "github.com/jetstack/cert-manager/pkg/acme/webhook" @@ -416,7 +416,7 @@ func (s *Solver) prepareChallengeRequest(issuer v1.GenericIssuer, ch *cmacme.Cha ResourceNamespace: resourceNamespace, Key: ch.Spec.Key, DNSName: ch.Spec.DNSName, - Config: &apiext.JSON{Raw: b}, + Config: &apiextensionsv1.JSON{Raw: b}, } return webhookSolver, req, nil diff --git a/pkg/issuer/acme/dns/rfc2136/BUILD.bazel b/pkg/issuer/acme/dns/rfc2136/BUILD.bazel index e5afbd5f0..4a9d850e1 100644 --- a/pkg/issuer/acme/dns/rfc2136/BUILD.bazel +++ b/pkg/issuer/acme/dns/rfc2136/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//pkg/internal/apis/certmanager/validation/util:go_default_library", "//pkg/logs:go_default_library", "@com_github_miekg_dns//: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_client_go//informers:go_default_library", "@io_k8s_client_go//kubernetes:go_default_library", "@io_k8s_client_go//listers/core/v1:go_default_library", diff --git a/pkg/issuer/acme/dns/rfc2136/provider.go b/pkg/issuer/acme/dns/rfc2136/provider.go index d4f238155..625f99e7e 100644 --- a/pkg/issuer/acme/dns/rfc2136/provider.go +++ b/pkg/issuer/acme/dns/rfc2136/provider.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" @@ -106,7 +106,7 @@ func (s *Solver) Initialize(kubeClientConfig *restclient.Config, stopCh <-chan s return nil } -func (s *Solver) loadConfig(cfgJSON extapi.JSON) (*cmacme.ACMEIssuerDNS01ProviderRFC2136, error) { +func (s *Solver) loadConfig(cfgJSON apiextensionsv1.JSON) (*cmacme.ACMEIssuerDNS01ProviderRFC2136, error) { cfg := cmacme.ACMEIssuerDNS01ProviderRFC2136{} if err := json.Unmarshal(cfgJSON.Raw, &cfg); err != nil { return nil, fmt.Errorf("error decoding solver config: %v", err) diff --git a/pkg/issuer/acme/dns/webhook/BUILD.bazel b/pkg/issuer/acme/dns/webhook/BUILD.bazel index a3f3904f0..50040ec5f 100644 --- a/pkg/issuer/acme/dns/webhook/BUILD.bazel +++ b/pkg/issuer/acme/dns/webhook/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//pkg/apis/acme/v1:go_default_library", "//pkg/client/clientset/versioned/scheme:go_default_library", "//pkg/logs: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/runtime/schema:go_default_library", "@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library", "@io_k8s_apimachinery//pkg/util/errors:go_default_library", diff --git a/pkg/issuer/acme/dns/webhook/webhook.go b/pkg/issuer/acme/dns/webhook/webhook.go index 43ea3b373..65e93108e 100644 --- a/pkg/issuer/acme/dns/webhook/webhook.go +++ b/pkg/issuer/acme/dns/webhook/webhook.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" utilerrors "k8s.io/apimachinery/pkg/util/errors" @@ -160,7 +160,7 @@ func (r *Webhook) buildPayload(ch *v1alpha1.ChallengeRequest, action v1alpha1.Ch return cl, pl, cfg.SolverName, nil } -func loadConfig(cfgJSON apiext.JSON) (*cmacme.ACMEIssuerDNS01ProviderWebhook, error) { +func loadConfig(cfgJSON apiextensionsv1.JSON) (*cmacme.ACMEIssuerDNS01ProviderWebhook, error) { cfg := cmacme.ACMEIssuerDNS01ProviderWebhook{} if err := json.Unmarshal(cfgJSON.Raw, &cfg); err != nil { return nil, fmt.Errorf("error decoding solver config: %v", err)