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

Change internal ACME API to use apiextensions v1beta1 -> v1

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl
2021-07-26 17:00:08 +01:00
parent d87ac770fe
commit f180f0a0e6
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/internal/apis/acme/BUILD.bazel
+1 -1
View File
@@ -16,7 +16,7 @@ go_library(
"//pkg/apis/acme:go_default_library",
"//pkg/internal/apis/meta: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",
pkg/internal/apis/acme/fuzzer/BUILD.bazel
+1 -1
View File
@@ -9,7 +9,7 @@ go_library(
"//pkg/apis/certmanager/v1:go_default_library",
"//pkg/internal/apis/acme:go_default_library",
"@com_github_google_gofuzz//: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/serializer:go_default_library",
],
)
pkg/internal/apis/acme/fuzzer/fuzzer.go
+2 -2
View File
@@ -18,7 +18,7 @@ package fuzzer
import (
fuzz "github.com/google/gofuzz"
apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
@@ -42,7 +42,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
s.Spec.IssuerRef.Kind = v1.IssuerKind
}
},
func(s *apiext.JSON, c fuzz.Continue) {
func(s *apiextensionsv1.JSON, c fuzz.Continue) {
// ensure the webhook's config is valid JSON
s.Raw = []byte("{}")
},
pkg/internal/apis/acme/types_issuer.go
+2 -2
View File
@@ -18,7 +18,7 @@ package acme
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/internal/apis/meta"
)
@@ -474,7 +474,7 @@ type ACMEIssuerDNS01ProviderWebhook struct {
// should use a SecretKeySelector to reference a Secret resource.
// For details on the schema of this field, consult the webhook provider
// implementation's documentation.
Config *apiext.JSON
Config *apiextensionsv1.JSON
}
type ACMEIssuerStatus struct {
pkg/internal/apis/acme/v1/BUILD.bazel
+1 -1
View File
@@ -19,7 +19,7 @@ go_library(
"//pkg/internal/apis/meta:go_default_library",
"//pkg/internal/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/conversion:go_default_library",
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
pkg/internal/apis/acme/v1/zz_generated.conversion.go
+3 -3
View File
@@ -29,7 +29,7 @@ import (
meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
metav1 "github.com/jetstack/cert-manager/pkg/internal/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"
pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1_ACMEIssuerDNS01ProviderRo
func autoConvert_v1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
@@ -1210,7 +1210,7 @@ func Convert_v1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWe
func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
pkg/internal/apis/acme/v1alpha2/BUILD.bazel
+1 -1
View File
@@ -20,7 +20,7 @@ go_library(
"//pkg/internal/apis/meta:go_default_library",
"//pkg/internal/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/conversion:go_default_library",
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
+3 -3
View File
@@ -29,7 +29,7 @@ import (
meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
metav1 "github.com/jetstack/cert-manager/pkg/internal/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"
pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1alpha2_ACMEIssuerDNS01Prov
func autoConvert_v1alpha2_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1alpha2.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
@@ -1210,7 +1210,7 @@ func Convert_v1alpha2_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Prov
func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1alpha2_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1alpha2.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
pkg/internal/apis/acme/v1alpha3/BUILD.bazel
+1 -1
View File
@@ -20,7 +20,7 @@ go_library(
"//pkg/internal/apis/meta:go_default_library",
"//pkg/internal/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/conversion:go_default_library",
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
+3 -3
View File
@@ -29,7 +29,7 @@ import (
meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
metav1 "github.com/jetstack/cert-manager/pkg/internal/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"
pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1alpha3_ACMEIssuerDNS01Prov
func autoConvert_v1alpha3_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1alpha3.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
@@ -1210,7 +1210,7 @@ func Convert_v1alpha3_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Prov
func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1alpha3_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1alpha3.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*v1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
pkg/internal/apis/acme/v1beta1/BUILD.bazel
+1 -1
View File
@@ -19,7 +19,7 @@ go_library(
"//pkg/internal/apis/meta:go_default_library",
"//pkg/internal/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/conversion:go_default_library",
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go
+3 -3
View File
@@ -29,7 +29,7 @@ import (
meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
metav1 "github.com/jetstack/cert-manager/pkg/internal/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"
pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1198,7 +1198,7 @@ func Convert_acme_ACMEIssuerDNS01ProviderRoute53_To_v1beta1_ACMEIssuerDNS01Provi
func autoConvert_v1beta1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01ProviderWebhook(in *v1beta1.ACMEIssuerDNS01ProviderWebhook, out *acme.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*apiextensionsv1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
@@ -1210,7 +1210,7 @@ func Convert_v1beta1_ACMEIssuerDNS01ProviderWebhook_To_acme_ACMEIssuerDNS01Provi
func autoConvert_acme_ACMEIssuerDNS01ProviderWebhook_To_v1beta1_ACMEIssuerDNS01ProviderWebhook(in *acme.ACMEIssuerDNS01ProviderWebhook, out *v1beta1.ACMEIssuerDNS01ProviderWebhook, s conversion.Scope) error {
out.GroupName = in.GroupName
out.SolverName = in.SolverName
out.Config = (*apiextensionsv1beta1.JSON)(unsafe.Pointer(in.Config))
out.Config = (*apiextensionsv1.JSON)(unsafe.Pointer(in.Config))
return nil
}
pkg/internal/apis/acme/zz_generated.deepcopy.go
+2 -2
View File
@@ -23,7 +23,7 @@ package acme
import (
meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta"
v1 "k8s.io/api/core/v1"
v1beta1 "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"
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