Skip to content

Commit

Permalink
Merge pull request #11210 from juanvallejo/jvallejo/allow-empty-annot…
Browse files Browse the repository at this point in the history
…ation-values

Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Oct 18, 2016
2 parents 3ed3b35 + cd48fb0 commit f6bd74b
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 10 deletions.
28 changes: 28 additions & 0 deletions test/cmd/annotations.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash
source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"
trap os::test::junit::reconcile_output EXIT

# Cleanup cluster resources created by this test
(
set +e
oc delete all,templates --all
exit 0
) &>/dev/null


os::test::junit::declare_suite_start "cmd/annotate"
# This test validates empty values in key-value pairs set by the annotate command
os::cmd::expect_success_and_text 'oc process -f examples/zookeeper/template.json | oc apply -f -' 'pod "zookeeper-1" created'
os::cmd::expect_success_and_text 'oc annotate pod zookeeper-1 node-selector=""' 'pod "zookeeper-1" annotated'
os::cmd::expect_success_and_text 'oc get pod zookeeper-1 --template="{{.metadata.annotations}}"' 'node-selector:'

echo "annotate: ok"
os::test::junit::declare_suite_end

os::test::junit::declare_suite_start "cmd/label"
# This test validates empty values in key-value pairs set by the label command
os::cmd::expect_success_and_text 'oc label pod zookeeper-1 label2=""' 'pod "zookeeper-1" labeled'
os::cmd::expect_success_and_text 'oc get pod zookeeper-1 --template="{{.metadata.labels}}"' 'label2\: '

echo "label: ok"
os::test::junit::declare_suite_end
13 changes: 7 additions & 6 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/annotate_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/kubectl/cmd/label.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/label_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/helpers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f6bd74b

Please sign in to comment.