Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f2eb7384
Commit
f2eb7384
authored
Aug 29, 2018
by
Weibin Lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use CertificatesV1beta1() instead of deprecated Certificates()
parent
11387279
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
certificates.go
pkg/kubectl/cmd/certificates.go
+10
-7
No files found.
pkg/kubectl/cmd/certificates.go
View file @
f2eb7384
...
@@ -29,7 +29,7 @@ import (
...
@@ -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 {
...
@@ -62,7 +62,7 @@ type CertificateOptions struct {
csrNames
[]
string
csrNames
[]
string
outputStyle
string
outputStyle
string
clientSet
kubernetes
.
Interface
clientSet
certificatesv1beta1client
.
CertificatesV1beta1
Interface
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
...
@@ -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 {
...
@@ -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
.
CertificatesV1beta1
Interface
,
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.
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment