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
f56ce29a
Commit
f56ce29a
authored
Oct 30, 2017
by
wackxu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix TODO one of min-available/max-available must be specified when create pdb
parent
d0c4c564
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
pdb.go
pkg/kubectl/pdb.go
+3
-10
No files found.
pkg/kubectl/pdb.go
View file @
f56ce29a
...
@@ -18,7 +18,6 @@ package kubectl
...
@@ -18,7 +18,6 @@ package kubectl
import
(
import
(
"fmt"
"fmt"
"os"
policy
"k8s.io/api/policy/v1beta1"
policy
"k8s.io/api/policy/v1beta1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
@@ -167,15 +166,6 @@ func (s *PodDisruptionBudgetV2Generator) StructuredGenerate() (runtime.Object, e
...
@@ -167,15 +166,6 @@ func (s *PodDisruptionBudgetV2Generator) StructuredGenerate() (runtime.Object, e
return
nil
,
err
return
nil
,
err
}
}
if
len
(
s
.
MaxUnavailable
)
==
0
&&
len
(
s
.
MinAvailable
)
==
0
{
s
.
MinAvailable
=
"1"
// This behavior is intended for backward compatibility.
// TODO: remove in Kubernetes 1.8
fmt
.
Fprintln
(
os
.
Stderr
,
"Deprecated behavior in kubectl create pdb: Defaulting min-available to 1. "
+
"Kubernetes 1.8 will remove this default, and one of min-available/max-available must be specified. "
)
}
if
len
(
s
.
MaxUnavailable
)
>
0
{
if
len
(
s
.
MaxUnavailable
)
>
0
{
maxUnavailable
:=
intstr
.
Parse
(
s
.
MaxUnavailable
)
maxUnavailable
:=
intstr
.
Parse
(
s
.
MaxUnavailable
)
return
&
policy
.
PodDisruptionBudget
{
return
&
policy
.
PodDisruptionBudget
{
...
@@ -213,6 +203,9 @@ func (s *PodDisruptionBudgetV2Generator) validate() error {
...
@@ -213,6 +203,9 @@ func (s *PodDisruptionBudgetV2Generator) validate() error {
if
len
(
s
.
Selector
)
==
0
{
if
len
(
s
.
Selector
)
==
0
{
return
fmt
.
Errorf
(
"a selector must be specified"
)
return
fmt
.
Errorf
(
"a selector must be specified"
)
}
}
if
len
(
s
.
MaxUnavailable
)
==
0
&&
len
(
s
.
MinAvailable
)
==
0
{
return
fmt
.
Errorf
(
"one of min-available/max-available must be specified"
)
}
if
len
(
s
.
MaxUnavailable
)
>
0
&&
len
(
s
.
MinAvailable
)
>
0
{
if
len
(
s
.
MaxUnavailable
)
>
0
&&
len
(
s
.
MinAvailable
)
>
0
{
return
fmt
.
Errorf
(
"min-available and max-unavailable cannot be both specified"
)
return
fmt
.
Errorf
(
"min-available and max-unavailable cannot be both specified"
)
}
}
...
...
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