github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

use CertificatesV1beta1() instead of deprecated Certificates()

Browse Source
This commit is contained in:
Weibin Lin 2018-08-29 09:50:12 +08:00
parent 113872798d
commit f2eb73846c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubectl/cmd/certificates.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/printers"
"k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/cli-runtime/pkg/genericclioptions/resource"
"k8s.io/client-go/kubernetes" certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
@ -62,7 +62,7 @@ type CertificateOptions struct {
csrNames []string csrNames []string
outputStyle string outputStyle string
clientSet kubernetes.Interface clientSet certificatesv1beta1client.CertificatesV1beta1Interface
builder *resource.Builder builder *resource.Builder
genericclioptions.IOStreams genericclioptions.IOStreams
@ -82,7 +82,12 @@ func (o *CertificateOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, arg
} }
o.builder = f.NewBuilder() o.builder = f.NewBuilder()
o.clientSet, err = f.KubernetesClientSet()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return err
}
o.clientSet, err = certificatesv1beta1client.NewForConfig(clientConfig)
if err != nil { if err != nil {
return err return err
} }
@ -206,7 +211,7 @@ func (o *CertificateOptions) RunCertificateDeny(force bool) error {
}) })
} }
func (options *CertificateOptions) modifyCertificateCondition(builder *resource.Builder, clientSet kubernetes.Interface, force bool, modify func(csr *certificatesv1beta1.CertificateSigningRequest) (*certificatesv1beta1.CertificateSigningRequest, bool)) error { func (options *CertificateOptions) modifyCertificateCondition(builder *resource.Builder, clientSet certificatesv1beta1client.CertificatesV1beta1Interface, force bool, modify func(csr *certificatesv1beta1.CertificateSigningRequest) (*certificatesv1beta1.CertificateSigningRequest, bool)) error {
var found int var found int
r := builder. r := builder.
WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...). WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...).
@ -225,9 +230,7 @@ func (options *CertificateOptions) modifyCertificateCondition(builder *resource.
csr := info.Object.(*certificatesv1beta1.CertificateSigningRequest) csr := info.Object.(*certificatesv1beta1.CertificateSigningRequest)
csr, hasCondition := modify(csr) csr, hasCondition := modify(csr)
if !hasCondition || force { if !hasCondition || force {
csr, err = clientSet.Certificates(). csr, err = clientSet.CertificateSigningRequests().UpdateApproval(csr)
CertificateSigningRequests().
UpdateApproval(csr)
if errors.IsConflict(err) && i < 10 { if errors.IsConflict(err) && i < 10 {
if err := info.Get(); err != nil { if err := info.Get(); err != nil {
return err return err