Skip to content

Commit c06001f

Browse files
authored
Merge pull request #415 from feiskyer/update-1.13
Update kubernetes version to v1.13
2 parents 0c5c47a + 3d80b92 commit c06001f

File tree

141 files changed

+12923
-6104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+12923
-6104
lines changed

cmd/crictl/main.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"flag"
2120
"fmt"
2221
"os"
2322
"sort"
@@ -90,10 +89,6 @@ func getRuntimeService(context *cli.Context) (cri.RuntimeService, error) {
9089
}
9190

9291
func main() {
93-
// Do not log to files.
94-
if err := flag.Set("logtostderr", "true"); err != nil {
95-
logrus.WithError(err).Fatal("Failed to set logtostderr=true")
96-
}
9792
app := cli.NewApp()
9893
app.Name = "crictl"
9994
app.Usage = "client for CRI"

vendor.conf

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d
33
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
44
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
55
github.com/fsnotify/fsnotify f12c6236fe7b5cf6bcf30e5935d08cb079d78334
6-
github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
6+
github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577
77
github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02
88
github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
99
github.com/golang/protobuf b4deda0973fb4c70b50d226b1af49f3da59f5265
1010
github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
11-
github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682
11+
github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82
1212
github.com/Microsoft/go-winio v0.4.11
1313
github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8
1414
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94
15-
github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
15+
github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8
1616
github.com/onsi/ginkgo 67b9df7f55fe1165fd9ad49aca7754cce01a42b8
1717
github.com/onsi/gomega d59fa0ac68bb5dd932ee8d24eed631cdd519efc3
18-
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
18+
github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb
1919
github.com/opencontainers/selinux 4a2974bf1ee960774ffd517717f1f45325af0206
2020
github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4
2121
github.com/pkg/errors v0.8.0
@@ -28,11 +28,13 @@ golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce
2828
golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01
2929
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
3030
google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85
31-
google.golang.org/grpc v1.7.5
31+
google.golang.org/grpc v1.13.0
3232
gopkg.in/inf.v0 v0.9.0
33-
gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a
34-
k8s.io/api 9fcf73cc980bd64f38a4f721a7371b0ebb72e1ff
35-
k8s.io/apimachinery 2e0dc82819fd32377f2ecdae51c98ef9b00378f2
36-
k8s.io/client-go 585e98112a2f5f80d5b9d421f67028aa905b880e
37-
k8s.io/kubernetes 5a8f831964e48b2c381b8a2ab61889085852b66c
38-
k8s.io/utils 4c3feeb576b06ef8fea769809bd3db5e5e78dc23
33+
gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183
34+
k8s.io/api d04500c8c3dda9c980b668c57abc2ca61efcf5c4
35+
k8s.io/apimachinery 57dc7e687b5426ecb5df4cabdcdce30fddb74f22
36+
k8s.io/client-go v10.0.0
37+
k8s.io/klog 8139d8cb77af419532b33dfa7dd09fbc5f1d344f
38+
k8s.io/kubernetes v1.13.0
39+
k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed
40+
sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480

vendor/github.com/ghodss/yaml/README.md

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ghodss/yaml/fields.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ghodss/yaml/yaml.go

Lines changed: 40 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ghodss/yaml/yaml_go110.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/modern-go/reflect2/reflect2.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/modern-go/reflect2/type_map.go

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/go-digest/README.md

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)