Skip to content

Commit fad6c42

Browse files
committed
wait: don't lowercase condition in --for argument
1 parent 60c4c2b commit fad6c42

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ func conditionFuncFor(condition string, errOut io.Writer) (ConditionFunc, error)
195195
case lowercaseCond == "create":
196196
return IsCreated, nil
197197

198-
case strings.HasPrefix(lowercaseCond, "condition="):
199-
conditionName := lowercaseCond[len("condition="):]
198+
case strings.HasPrefix(condition, "condition="):
199+
conditionName := strings.TrimPrefix(condition, "condition=")
200200
conditionValue := "true"
201201
if equalsIndex := strings.Index(conditionName, "="); equalsIndex != -1 {
202202
conditionValue = conditionName[equalsIndex+1:]
@@ -209,8 +209,8 @@ func conditionFuncFor(condition string, errOut io.Writer) (ConditionFunc, error)
209209
errOut: errOut,
210210
}.IsConditionMet, nil
211211

212-
case strings.HasPrefix(lowercaseCond, "jsonpath="):
213-
jsonPathInput := strings.TrimPrefix(lowercaseCond, "jsonpath=")
212+
case strings.HasPrefix(condition, "jsonpath="):
213+
jsonPathInput := strings.TrimPrefix(condition, "jsonpath=")
214214
jsonPathExp, jsonPathValue, err := processJSONPathInput(jsonPathInput)
215215
if err != nil {
216216
return nil, err

test/cmd/wait.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ run_wait_tests() {
5151
# Post-Condition: Wait failed
5252
kube::test::if_has_string "${output_message}" 'timed out'
5353

54+
# wait with mixed case jsonpath
55+
output_message=$(kubectl wait --for=jsonpath=.status.unavailableReplicas=1 deploy/test-1 2>&1)
56+
57+
# Post-Condition: Wait failed
58+
kube::test::if_has_string "${output_message}" 'test-1 condition met'
59+
5460
# Delete all deployments async to kubectl wait
5561
( sleep 2 && kubectl delete deployment --all ) &
5662

0 commit comments

Comments
 (0)