From f66a2069f1b26ff9987b008ba4b0c91ac3b682cc Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 5 Sep 2019 16:58:06 +0200 Subject: Update buildah to v1.11.0 Vendor in the latest changes for buildah to apply the implemented features here as well. Signed-off-by: Sascha Grunert --- vendor/k8s.io/api/core/v1/taint.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'vendor/k8s.io/api/core/v1/taint.go') diff --git a/vendor/k8s.io/api/core/v1/taint.go b/vendor/k8s.io/api/core/v1/taint.go index 7b606a309..db71bd2fd 100644 --- a/vendor/k8s.io/api/core/v1/taint.go +++ b/vendor/k8s.io/api/core/v1/taint.go @@ -24,8 +24,14 @@ func (t *Taint) MatchTaint(taintToMatch *Taint) bool { return t.Key == taintToMatch.Key && t.Effect == taintToMatch.Effect } -// taint.ToString() converts taint struct to string in format key=value:effect or key:effect. +// taint.ToString() converts taint struct to string in format '=:', '=:', ':', or ''. func (t *Taint) ToString() string { + if len(t.Effect) == 0 { + if len(t.Value) == 0 { + return fmt.Sprintf("%v", t.Key) + } + return fmt.Sprintf("%v=%v:", t.Key, t.Value) + } if len(t.Value) == 0 { return fmt.Sprintf("%v:%v", t.Key, t.Effect) } -- cgit v1.2.3-54-g00ecf