From d87ac770fed67bbd2ff00ccc5a2ae668ba7c81f8 Mon Sep 17 00:00:00 2001 From: joshvanl Date: Mon, 26 Jul 2021 16:59:42 +0100 Subject: [PATCH] Change ACME API to use apiextensions v1beta1 -> v1 Signed-off-by: joshvanl --- pkg/apis/acme/v1/BUILD.bazel | 2 +- pkg/apis/acme/v1/types_issuer.go | 4 ++-- pkg/apis/acme/v1/zz_generated.deepcopy.go | 4 ++-- pkg/apis/acme/v1alpha2/BUILD.bazel | 2 +- pkg/apis/acme/v1alpha2/types_issuer.go | 4 ++-- pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go | 4 ++-- pkg/apis/acme/v1alpha3/BUILD.bazel | 2 +- pkg/apis/acme/v1alpha3/types_issuer.go | 4 ++-- pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go | 4 ++-- pkg/apis/acme/v1beta1/BUILD.bazel | 2 +- pkg/apis/acme/v1beta1/types_issuer.go | 4 ++-- pkg/apis/acme/v1beta1/zz_generated.deepcopy.go | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/apis/acme/v1/BUILD.bazel b/pkg/apis/acme/v1/BUILD.bazel index b3726970d..13b26a657 100644 --- a/pkg/apis/acme/v1/BUILD.bazel +++ b/pkg/apis/acme/v1/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//pkg/apis/acme:go_default_library", "//pkg/apis/meta/v1: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/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/acme/v1/types_issuer.go b/pkg/apis/acme/v1/types_issuer.go index 76691fb4d..f884dad77 100644 --- a/pkg/apis/acme/v1/types_issuer.go +++ b/pkg/apis/acme/v1/types_issuer.go @@ -18,7 +18,7 @@ package v1 import ( corev1 "k8s.io/api/core/v1" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) @@ -541,7 +541,7 @@ type ACMEIssuerDNS01ProviderWebhook struct { // For details on the schema of this field, consult the webhook provider // implementation's documentation. // +optional - Config *apiext.JSON `json:"config,omitempty"` + Config *apiextensionsv1.JSON `json:"config,omitempty"` } type ACMEIssuerStatus struct { diff --git a/pkg/apis/acme/v1/zz_generated.deepcopy.go b/pkg/apis/acme/v1/zz_generated.deepcopy.go index 40c190234..d1359e868 100644 --- a/pkg/apis/acme/v1/zz_generated.deepcopy.go +++ b/pkg/apis/acme/v1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1 import ( metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" corev1 "k8s.io/api/core/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -550,7 +550,7 @@ func (in *ACMEIssuerDNS01ProviderWebhook) DeepCopyInto(out *ACMEIssuerDNS01Provi *out = *in if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(v1beta1.JSON) + *out = new(apiextensionsv1.JSON) (*in).DeepCopyInto(*out) } return diff --git a/pkg/apis/acme/v1alpha2/BUILD.bazel b/pkg/apis/acme/v1alpha2/BUILD.bazel index 6e4387705..62cd2144a 100644 --- a/pkg/apis/acme/v1alpha2/BUILD.bazel +++ b/pkg/apis/acme/v1alpha2/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//pkg/apis/acme:go_default_library", "//pkg/apis/meta/v1: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/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/acme/v1alpha2/types_issuer.go b/pkg/apis/acme/v1alpha2/types_issuer.go index 21b268894..990a9d579 100644 --- a/pkg/apis/acme/v1alpha2/types_issuer.go +++ b/pkg/apis/acme/v1alpha2/types_issuer.go @@ -18,7 +18,7 @@ package v1alpha2 import ( corev1 "k8s.io/api/core/v1" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) @@ -541,7 +541,7 @@ type ACMEIssuerDNS01ProviderWebhook struct { // For details on the schema of this field, consult the webhook provider // implementation's documentation. // +optional - Config *apiext.JSON `json:"config,omitempty"` + Config *apiextensionsv1.JSON `json:"config,omitempty"` } type ACMEIssuerStatus struct { diff --git a/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go index a0772368a..4ba05b22a 100644 --- a/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1alpha2 import ( metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" v1 "k8s.io/api/core/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -550,7 +550,7 @@ func (in *ACMEIssuerDNS01ProviderWebhook) DeepCopyInto(out *ACMEIssuerDNS01Provi *out = *in if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(v1beta1.JSON) + *out = new(apiextensionsv1.JSON) (*in).DeepCopyInto(*out) } return diff --git a/pkg/apis/acme/v1alpha3/BUILD.bazel b/pkg/apis/acme/v1alpha3/BUILD.bazel index a5d50ff80..df8b28715 100644 --- a/pkg/apis/acme/v1alpha3/BUILD.bazel +++ b/pkg/apis/acme/v1alpha3/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//pkg/apis/acme:go_default_library", "//pkg/apis/meta/v1: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/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/acme/v1alpha3/types_issuer.go b/pkg/apis/acme/v1alpha3/types_issuer.go index ca132658e..85a7b59a5 100644 --- a/pkg/apis/acme/v1alpha3/types_issuer.go +++ b/pkg/apis/acme/v1alpha3/types_issuer.go @@ -18,7 +18,7 @@ package v1alpha3 import ( corev1 "k8s.io/api/core/v1" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) @@ -541,7 +541,7 @@ type ACMEIssuerDNS01ProviderWebhook struct { // For details on the schema of this field, consult the webhook provider // implementation's documentation. // +optional - Config *apiext.JSON `json:"config,omitempty"` + Config *apiextensionsv1.JSON `json:"config,omitempty"` } type ACMEIssuerStatus struct { diff --git a/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go index 4b3f51f4a..220eb4552 100644 --- a/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1alpha3 import ( metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" v1 "k8s.io/api/core/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -550,7 +550,7 @@ func (in *ACMEIssuerDNS01ProviderWebhook) DeepCopyInto(out *ACMEIssuerDNS01Provi *out = *in if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(v1beta1.JSON) + *out = new(apiextensionsv1.JSON) (*in).DeepCopyInto(*out) } return diff --git a/pkg/apis/acme/v1beta1/BUILD.bazel b/pkg/apis/acme/v1beta1/BUILD.bazel index 0df75b79f..7382f6c58 100644 --- a/pkg/apis/acme/v1beta1/BUILD.bazel +++ b/pkg/apis/acme/v1beta1/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//pkg/apis/acme:go_default_library", "//pkg/apis/meta/v1: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/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/acme/v1beta1/types_issuer.go b/pkg/apis/acme/v1beta1/types_issuer.go index b08260a9e..ec86cc347 100644 --- a/pkg/apis/acme/v1beta1/types_issuer.go +++ b/pkg/apis/acme/v1beta1/types_issuer.go @@ -18,7 +18,7 @@ package v1beta1 import ( corev1 "k8s.io/api/core/v1" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) @@ -541,7 +541,7 @@ type ACMEIssuerDNS01ProviderWebhook struct { // For details on the schema of this field, consult the webhook provider // implementation's documentation. // +optional - Config *apiext.JSON `json:"config,omitempty"` + Config *apiextensionsv1.JSON `json:"config,omitempty"` } type ACMEIssuerStatus struct { diff --git a/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go b/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go index 9b090025a..45a049d42 100644 --- a/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1beta1 import ( metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" v1 "k8s.io/api/core/v1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -550,7 +550,7 @@ func (in *ACMEIssuerDNS01ProviderWebhook) DeepCopyInto(out *ACMEIssuerDNS01Provi *out = *in if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(apiextensionsv1beta1.JSON) + *out = new(apiextensionsv1.JSON) (*in).DeepCopyInto(*out) } return