github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69295 from deads2k/kbuectl-13-wait-false 

allow condition value to specified for kubectl wait
pull/58/head
k8s-ci-robot 2018-10-03 21:32:12 -07:00 committed by GitHub
parent 68536e4382 122529b97d
commit 2d1ef05ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubectl/cmd/wait/wait.go
View File

@ -174,10 +174,15 @@ func conditionFuncFor(condition string) (ConditionFunc, error) {
} }
if strings.HasPrefix(condition, "condition=") { if strings.HasPrefix(condition, "condition=") {
conditionName := condition[len("condition="):] conditionName := condition[len("condition="):]
conditionValue := "true"
if equalsIndex := strings.Index(conditionName, "="); equalsIndex != -1 {
conditionValue = conditionName[equalsIndex+1:]
conditionName = conditionName[0:equalsIndex]
}
return ConditionalWait{ return ConditionalWait{
conditionName: conditionName, conditionName: conditionName,
// TODO allow specifying a false conditionStatus: conditionValue,
conditionStatus: "true",
}.IsConditionMet, nil }.IsConditionMet, nil
} }