diff --git a/glide.lock b/glide.lock index 6cb308885231..a62b8de36deb 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: 214343c22df4983a3bf7817d728277d35a9d8a446d24752f6205fb24b8ab59fa -updated: 2018-06-28T07:22:57.030219253-04:00 +updated: 2018-06-28T22:40:05.559304-04:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -86,7 +86,7 @@ imports: subpackages: - quantile - name: github.com/blang/semver - version: c5e971dbed7850a93c23aa6ff69db5771d8e23b3 + version: b38d23b8782a487059e8fc8773e9a5b228a77cb6 - name: github.com/certifi/gocertifi version: deb3ae2ef2610fde3330947281941c562861188b - name: github.com/chai2010/gettext-go @@ -1413,6 +1413,7 @@ imports: - pkg/api/errors - pkg/api/meta - pkg/api/meta/table + - pkg/api/meta/testrestmapper - pkg/api/resource - pkg/api/testing - pkg/api/testing/fuzzer @@ -1592,6 +1593,7 @@ imports: - discovery/cached - discovery/fake - dynamic + - dynamic/fake - informers - informers/admissionregistration - informers/admissionregistration/v1alpha1 @@ -1823,9 +1825,10 @@ imports: - pkg/handler - pkg/util - pkg/util/proto + - pkg/util/proto/testing - pkg/util/proto/validation - name: k8s.io/kubernetes - version: 808f4a0e9d88e9e44522d694ce29d914dc496868 + version: 55bb5105903b718c63a80556dd2ff5a8d4ce51b8 repo: https://github.com/openshift/kubernetes.git subpackages: - cmd/controller-manager/app @@ -1845,7 +1848,6 @@ imports: - cmd/kubeadm/app/util - cmd/kubelet/app - cmd/kubelet/app/options - - pkg/api - pkg/api/endpoints - pkg/api/events - pkg/api/legacyscheme @@ -2150,10 +2152,12 @@ imports: - pkg/kubectl/cmd/set - pkg/kubectl/cmd/set/env - pkg/kubectl/cmd/templates + - pkg/kubectl/cmd/testing - pkg/kubectl/cmd/util - pkg/kubectl/cmd/util/editor - pkg/kubectl/cmd/util/editor/crlf - pkg/kubectl/cmd/util/openapi + - pkg/kubectl/cmd/util/openapi/testing - pkg/kubectl/cmd/util/openapi/validation - pkg/kubectl/cmd/wait - pkg/kubectl/explain diff --git a/vendor/github.com/blang/semver/.gx/lastpubver b/vendor/github.com/blang/semver/.gx/lastpubver index 27ed26783817..073ce1eff629 100644 --- a/vendor/github.com/blang/semver/.gx/lastpubver +++ b/vendor/github.com/blang/semver/.gx/lastpubver @@ -1 +1 @@ -3.5.1: QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG +3.4.0: QmZTgGMg34JKEvF1hjr7wwYESvFhg9Khv2WFibDAi5dhno diff --git a/vendor/github.com/blang/semver/.travis.yml b/vendor/github.com/blang/semver/.travis.yml deleted file mode 100644 index 102fb9a691b6..000000000000 --- a/vendor/github.com/blang/semver/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: go -matrix: - include: - - go: 1.4.3 - - go: 1.5.4 - - go: 1.6.3 - - go: 1.7 - - go: tip - allow_failures: - - go: tip -install: -- go get golang.org/x/tools/cmd/cover -- go get github.com/mattn/goveralls -script: -- echo "Test and track coverage" ; $HOME/gopath/bin/goveralls -package "." -service=travis-ci - -repotoken $COVERALLS_TOKEN -- echo "Build examples" ; cd examples && go build -- echo "Check if gofmt'd" ; diff -u <(echo -n) <(gofmt -d -s .) -env: - global: - secure: HroGEAUQpVq9zX1b1VIkraLiywhGbzvNnTZq2TMxgK7JHP8xqNplAeF1izrR2i4QLL9nsY+9WtYss4QuPvEtZcVHUobw6XnL6radF7jS1LgfYZ9Y7oF+zogZ2I5QUMRLGA7rcxQ05s7mKq3XZQfeqaNts4bms/eZRefWuaFZbkw= diff --git a/vendor/github.com/blang/semver/README.md b/vendor/github.com/blang/semver/README.md index 6af4dde752e9..4399639e230f 100644 --- a/vendor/github.com/blang/semver/README.md +++ b/vendor/github.com/blang/semver/README.md @@ -1,4 +1,4 @@ -semver for golang [![Build Status](https://travis-ci.org/blang/semver.svg?branch=master)](https://travis-ci.org/blang/semver) [![GoDoc](https://godoc.org/github.com/blang/semver?status.svg)](https://godoc.org/github.com/blang/semver) [![Coverage Status](https://img.shields.io/coveralls/blang/semver.svg)](https://coveralls.io/r/blang/semver?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/blang/semver)](https://goreportcard.com/report/github.com/blang/semver) +semver for golang [![Build Status](https://drone.io/github.com/blang/semver/status.png)](https://drone.io/github.com/blang/semver/latest) [![GoDoc](https://godoc.org/github.com/blang/semver?status.png)](https://godoc.org/github.com/blang/semver) [![Coverage Status](https://img.shields.io/coveralls/blang/semver.svg)](https://coveralls.io/r/blang/semver?branch=master) ====== semver is a [Semantic Versioning](http://semver.org/) library written in golang. It fully covers spec version `2.0.0`. @@ -41,7 +41,6 @@ Features - Compare Helper Methods - InPlace manipulation - Ranges `>=1.0.0 <2.0.0 || >=3.0.0 !3.0.1-beta.1` -- Wildcards `>=1.x`, `<=2.5.x` - Sortable (implements sort.Interface) - database/sql compatible (sql.Scanner/Valuer) - encoding/json compatible (json.Marshaler/Unmarshaler) @@ -60,8 +59,6 @@ A condition is composed of an operator and a version. The supported operators ar - `1.0.0`, `=1.0.0`, `==1.0.0` Equal to `1.0.0` - `!1.0.0`, `!=1.0.0` Not equal to `1.0.0`. Excludes version `1.0.0`. -Note that spaces between the operator and the version will be gracefully tolerated. - A `Range` can link multiple `Ranges` separated by space: Ranges can be linked by logical AND: diff --git a/vendor/github.com/blang/semver/package.json b/vendor/github.com/blang/semver/package.json index 1cf8ebdd9c18..568be8d9431d 100644 --- a/vendor/github.com/blang/semver/package.json +++ b/vendor/github.com/blang/semver/package.json @@ -12,6 +12,6 @@ "license": "MIT", "name": "semver", "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", - "version": "3.5.1" + "version": "3.4.0" } diff --git a/vendor/github.com/blang/semver/range_test.go b/vendor/github.com/blang/semver/range_test.go index fc116704f903..83ee9c7878fe 100644 --- a/vendor/github.com/blang/semver/range_test.go +++ b/vendor/github.com/blang/semver/range_test.go @@ -175,13 +175,13 @@ func TestSplitORParts(t *testing.T) { o [][]string }{ {[]string{">1.2.3", "||", "<1.2.3", "||", "=1.2.3"}, [][]string{ - {">1.2.3"}, - {"<1.2.3"}, - {"=1.2.3"}, + []string{">1.2.3"}, + []string{"<1.2.3"}, + []string{"=1.2.3"}, }}, {[]string{">1.2.3", "<1.2.3", "||", "=1.2.3"}, [][]string{ - {">1.2.3", "<1.2.3"}, - {"=1.2.3"}, + []string{">1.2.3", "<1.2.3"}, + []string{"=1.2.3"}, }}, {[]string{">1.2.3", "||"}, nil}, {[]string{"||", ">1.2.3"}, nil}, @@ -271,19 +271,19 @@ func TestExpandWildcardVersion(t *testing.T) { i [][]string o [][]string }{ - {[][]string{{"foox"}}, nil}, - {[][]string{{">=1.2.x"}}, [][]string{{">=1.2.0"}}}, - {[][]string{{"<=1.2.x"}}, [][]string{{"<1.3.0"}}}, - {[][]string{{">1.2.x"}}, [][]string{{">=1.3.0"}}}, - {[][]string{{"<1.2.x"}}, [][]string{{"<1.2.0"}}}, - {[][]string{{"!=1.2.x"}}, [][]string{{"<1.2.0", ">=1.3.0"}}}, - {[][]string{{">=1.x"}}, [][]string{{">=1.0.0"}}}, - {[][]string{{"<=1.x"}}, [][]string{{"<2.0.0"}}}, - {[][]string{{">1.x"}}, [][]string{{">=2.0.0"}}}, - {[][]string{{"<1.x"}}, [][]string{{"<1.0.0"}}}, - {[][]string{{"!=1.x"}}, [][]string{{"<1.0.0", ">=2.0.0"}}}, - {[][]string{{"1.2.x"}}, [][]string{{">=1.2.0", "<1.3.0"}}}, - {[][]string{{"1.x"}}, [][]string{{">=1.0.0", "<2.0.0"}}}, + {[][]string{[]string{"foox"}}, nil}, + {[][]string{[]string{">=1.2.x"}}, [][]string{[]string{">=1.2.0"}}}, + {[][]string{[]string{"<=1.2.x"}}, [][]string{[]string{"<1.3.0"}}}, + {[][]string{[]string{">1.2.x"}}, [][]string{[]string{">=1.3.0"}}}, + {[][]string{[]string{"<1.2.x"}}, [][]string{[]string{"<1.2.0"}}}, + {[][]string{[]string{"!=1.2.x"}}, [][]string{[]string{"<1.2.0", ">=1.3.0"}}}, + {[][]string{[]string{">=1.x"}}, [][]string{[]string{">=1.0.0"}}}, + {[][]string{[]string{"<=1.x"}}, [][]string{[]string{"<2.0.0"}}}, + {[][]string{[]string{">1.x"}}, [][]string{[]string{">=2.0.0"}}}, + {[][]string{[]string{"<1.x"}}, [][]string{[]string{"<1.0.0"}}}, + {[][]string{[]string{"!=1.x"}}, [][]string{[]string{"<1.0.0", ">=2.0.0"}}}, + {[][]string{[]string{"1.2.x"}}, [][]string{[]string{">=1.2.0", "<1.3.0"}}}, + {[][]string{[]string{"1.x"}}, [][]string{[]string{">=1.0.0", "<2.0.0"}}}, } for _, tc := range tests { diff --git a/vendor/github.com/blang/semver/semver.go b/vendor/github.com/blang/semver/semver.go index ec26aa03fd8a..8ee0842e6ac7 100644 --- a/vendor/github.com/blang/semver/semver.go +++ b/vendor/github.com/blang/semver/semver.go @@ -26,7 +26,7 @@ type Version struct { Minor uint64 Patch uint64 Pre []PRVersion - Build []string //No Precedence + Build []string //No Precendence } // Version to string