diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 44ca10c5..5bfca3fc 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/client-go", - "GoVersion": "go1.9", + "GoVersion": "go1.10", "GodepVersion": "v80", "Packages": [ "./..." @@ -268,327 +268,327 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/coordination/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/imagepolicy/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/scheduling/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "9e5ffd1f1320950b238cfce291b926411f0af722" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "ed135c5b96450fd24e5e981c708114fbbd950697" + "Rev": "ded72da34a273a447508135b315f865aa6e48fc8" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", diff --git a/util/jsonpath/parser.go b/util/jsonpath/parser.go index ef0f9213..99b45849 100644 --- a/util/jsonpath/parser.go +++ b/util/jsonpath/parser.go @@ -94,7 +94,7 @@ func (p *Parser) consumeText() string { // next returns the next rune in the input. func (p *Parser) next() rune { - if int(p.pos) >= len(p.input) { + if p.pos >= len(p.input) { p.width = 0 return eof } @@ -266,7 +266,7 @@ Loop: } } text := p.consumeText() - text = string(text[1 : len(text)-1]) + text = text[1 : len(text)-1] if text == "*" { text = ":" } @@ -373,7 +373,7 @@ Loop: } reg := regexp.MustCompile(`^([^!<>=]+)([!<>=]+)(.+?)$`) text := p.consumeText() - text = string(text[:len(text)-2]) + text = text[:len(text)-2] value := reg.FindStringSubmatch(text) if value == nil { parser, err := parseAction("text", text)