Skip to content

Commit 144fa4e

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#67368 from islinwb/cleanup
Automatic merge from submit-queue (batch tested with PRs 67368, 59930, 68074). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. use CertificatesV1beta1() instead of deprecated Certificates() **What this PR does / why we need it**: /kind cleanup **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
2 parents e45d74d + 7d7df52 commit 144fa4e

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

pkg/kubectl/cmd/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ go_library(
124124
"//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library",
125125
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
126126
"//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
127+
"//staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1:go_default_library",
127128
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
128129
"//staging/src/k8s.io/client-go/rest:go_default_library",
129130
"//staging/src/k8s.io/client-go/scale:go_default_library",

pkg/kubectl/cmd/certificates.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/cli-runtime/pkg/genericclioptions"
3030
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
3131
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
32-
"k8s.io/client-go/kubernetes"
32+
certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
3333
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
3434
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3535
"k8s.io/kubernetes/pkg/kubectl/scheme"
@@ -62,7 +62,7 @@ type CertificateOptions struct {
6262
csrNames []string
6363
outputStyle string
6464

65-
clientSet kubernetes.Interface
65+
clientSet certificatesv1beta1client.CertificatesV1beta1Interface
6666
builder *resource.Builder
6767

6868
genericclioptions.IOStreams
@@ -82,7 +82,12 @@ func (o *CertificateOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, arg
8282
}
8383

8484
o.builder = f.NewBuilder()
85-
o.clientSet, err = f.KubernetesClientSet()
85+
86+
clientConfig, err := f.ToRESTConfig()
87+
if err != nil {
88+
return err
89+
}
90+
o.clientSet, err = certificatesv1beta1client.NewForConfig(clientConfig)
8691
if err != nil {
8792
return err
8893
}
@@ -206,7 +211,7 @@ func (o *CertificateOptions) RunCertificateDeny(force bool) error {
206211
})
207212
}
208213

209-
func (options *CertificateOptions) modifyCertificateCondition(builder *resource.Builder, clientSet kubernetes.Interface, force bool, modify func(csr *certificatesv1beta1.CertificateSigningRequest) (*certificatesv1beta1.CertificateSigningRequest, bool)) error {
214+
func (options *CertificateOptions) modifyCertificateCondition(builder *resource.Builder, clientSet certificatesv1beta1client.CertificatesV1beta1Interface, force bool, modify func(csr *certificatesv1beta1.CertificateSigningRequest) (*certificatesv1beta1.CertificateSigningRequest, bool)) error {
210215
var found int
211216
r := builder.
212217
WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...).
@@ -225,9 +230,7 @@ func (options *CertificateOptions) modifyCertificateCondition(builder *resource.
225230
csr := info.Object.(*certificatesv1beta1.CertificateSigningRequest)
226231
csr, hasCondition := modify(csr)
227232
if !hasCondition || force {
228-
csr, err = clientSet.Certificates().
229-
CertificateSigningRequests().
230-
UpdateApproval(csr)
233+
csr, err = clientSet.CertificateSigningRequests().UpdateApproval(csr)
231234
if errors.IsConflict(err) && i < 10 {
232235
if err := info.Get(); err != nil {
233236
return err

0 commit comments

Comments
 (0)