diff --git a/Makefile b/Makefile index 67ee028..330fcfd 100644 --- a/Makefile +++ b/Makefile @@ -56,9 +56,9 @@ .PHONY: generate-client generate-client: client-gen informer-gen lister-gen ## Generate code containing ClientSet, Client Informer and Client Lister method implementations. - rm -rf ./pkg/client/clientset - rm -rf ./pkg/client/listers - rm -rf ./pkg/client/informers + # rm -rf ./pkg/client/clientset + # rm -rf ./pkg/client/listers + # rm -rf ./pkg/client/informers $(CLIENT_GEN) --go-header-file $(LICENSE_PATH) \ --clientset-name versioned \ @@ -176,7 +176,7 @@ ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.5 -CONTROLLER_TOOLS_VERSION ?= v0.9.2 +CONTROLLER_TOOLS_VERSION ?= v0.10.0 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/config/crd/bases/anthos-cert-manager.io_certificaterequests.yaml b/config/crd/bases/anthos-cert-manager.io_certificaterequests.yaml index dc53954..c4f98ff 100644 --- a/config/crd/bases/anthos-cert-manager.io_certificaterequests.yaml +++ b/config/crd/bases/anthos-cert-manager.io_certificaterequests.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 + controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null name: certificaterequests.anthos-cert-manager.io spec: @@ -216,9 +216,3 @@ type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/anthos-cert-manager.io_certificates.yaml b/config/crd/bases/anthos-cert-manager.io_certificates.yaml index 720feb1..b5e3df3 100644 --- a/config/crd/bases/anthos-cert-manager.io_certificates.yaml +++ b/config/crd/bases/anthos-cert-manager.io_certificates.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 + controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null name: certificates.anthos-cert-manager.io spec: @@ -385,9 +385,3 @@ type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/anthos-cert-manager.io_clusterissuers.yaml b/config/crd/bases/anthos-cert-manager.io_clusterissuers.yaml index 702afca..ea86d72 100644 --- a/config/crd/bases/anthos-cert-manager.io_clusterissuers.yaml +++ b/config/crd/bases/anthos-cert-manager.io_clusterissuers.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 + controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null name: clusterissuers.anthos-cert-manager.io spec: @@ -137,9 +137,3 @@ type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/anthos-cert-manager.io_issuers.yaml b/config/crd/bases/anthos-cert-manager.io_issuers.yaml index 4415e79..5cdedc0 100644 --- a/config/crd/bases/anthos-cert-manager.io_issuers.yaml +++ b/config/crd/bases/anthos-cert-manager.io_issuers.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 + controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null name: issuers.anthos-cert-manager.io spec: @@ -137,9 +137,3 @@ type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/go.mod b/go.mod index b999717..bd53206 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitbucket.jerxie.com/yangyangxie/AnthosCertManager -go 1.19 +go 1.18 require ( github.com/go-logr/logr v1.2.3 diff --git a/pkg/apis/anthoscertmanager/v1/register.go b/pkg/apis/anthoscertmanager/v1/register.go index 5abe912..fc29a9b 100644 --- a/pkg/apis/anthoscertmanager/v1/register.go +++ b/pkg/apis/anthoscertmanager/v1/register.go @@ -47,10 +47,10 @@ scheme.AddKnownTypes(SchemeGroupVersion, &Certificate{}, &CertificateList{}, - // &Issuer{}, - // &IssuerList{}, - // &ClusterIssuer{}, - // &ClusterIssuerList{}, + &Issuer{}, + &IssuerList{}, + &ClusterIssuer{}, + &ClusterIssuerList{}, &CertificateRequest{}, &CertificateRequestList{}, ) diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 08dcf0f..2aa2dd9 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -38,14 +38,14 @@ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index daaa602..4c9afe4 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -38,14 +38,14 @@ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly.