2018-04-09 11:54:08 +08:00
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/code-generator",
|
Merge pull request #67178 from cblecker/cfssl
Automatic merge from submit-queue (batch tested with PRs 66602, 67178, 67207, 67125, 66332). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Vendor cfssl/cfssljson utilities
**What this PR does / why we need it**:
Vendors the `cfssl` and `cfssljson` tools. Updates `kube::util::ensure-cfssl` to use them.
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
fixes #66995, fixes #60070
**Special notes for your reviewer**:
1. Add cfssl/cfssljson ot the required bins for saving
2. Manually cloned/checked out the new dependencies to my gopath. `godep restore` doesn't pull them down because they aren't required or already in the `Godeps.json`. Used @BenTheElder's list here: https://github.com/kubernetes/kubernetes/issues/66995#issuecomment-410594532
3. `hack/godep-save.sh` to add the packages and dependencies to godep
4. Fixed two bugs when building:
a. `golang.org/x/crypto` needed to be updated
b. `github.com/cloudflare/cfssl` needed to be updated to https://github.com/cloudflare/cfssl/commit/56268a613adfed278936377c18b1152d2c4ad5da so we can vendor their fork of `crypto/tls`, as we discard their modified vendored stdlib.
5. Update staging godeps
6. Update the `kube::util::ensure-cfssl` to install from vendor
**Release note**:
```release-note
NONE
```
Kubernetes-commit: 818e632c1fde5fb01bc8ccf9b9ee6201f33a28b4
2018-08-11 05:13:08 +08:00
|
|
|
"GoVersion": "go1.10",
|
2018-04-20 21:22:31 +08:00
|
|
|
"GodepVersion": "v80",
|
2018-04-09 11:54:08 +08:00
|
|
|
"Packages": [
|
|
|
|
|
"./..."
|
|
|
|
|
],
|
|
|
|
|
"Deps": [
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/PuerkitoBio/purell",
|
|
|
|
|
"Rev": "8a290539e2e8629dbc4e6bad948158f790ec31f4"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/PuerkitoBio/urlesc",
|
|
|
|
|
"Rev": "5bd2802263f21d8788851d5305584c82a5c75d7e"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/emicklei/go-restful",
|
|
|
|
|
"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/emicklei/go-restful/log",
|
|
|
|
|
"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/go-openapi/jsonpointer",
|
|
|
|
|
"Rev": "46af16f9f7b149af66e5d1bd010e3574dc06de98"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/go-openapi/jsonreference",
|
|
|
|
|
"Rev": "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/go-openapi/spec",
|
|
|
|
|
"Rev": "1de3e0542de65ad8d75452a595886fdd0befb363"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/go-openapi/swag",
|
|
|
|
|
"Rev": "f3f9494671f93fcff853e3c6e9e948b3eb71e590"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/gogoproto",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/compare",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/defaultcheck",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/description",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/embedcheck",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/enumstringer",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/equal",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/face",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/gostring",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/marshalto",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/oneofcheck",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/populate",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/size",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/stringer",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/testgen",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/union",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/plugin/unmarshal",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/proto",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/descriptor",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/generator",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/grpc",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/plugin",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/sortkeys",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/vanity",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/gogo/protobuf/vanity/command",
|
|
|
|
|
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/golang/glog",
|
|
|
|
|
"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/mailru/easyjson/buffer",
|
|
|
|
|
"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/mailru/easyjson/jlexer",
|
|
|
|
|
"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/mailru/easyjson/jwriter",
|
|
|
|
|
"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "github.com/spf13/pflag",
|
2018-04-15 03:21:01 +08:00
|
|
|
"Rev": "583c0c0531f06d5278b7d917446061adc344b5cd"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/net/idna",
|
|
|
|
|
"Rev": "1c05540f6879653db88113bc4a2b70aec4bd491f"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/cases",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/internal",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/internal/tag",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/language",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/runes",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/secure/bidirule",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/secure/precis",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/transform",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/unicode/bidi",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/unicode/norm",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/text/width",
|
|
|
|
|
"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/tools/go/ast/astutil",
|
|
|
|
|
"Rev": "2382e3994d48b1d22acc2c86bcad0a2aff028e32"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "golang.org/x/tools/imports",
|
|
|
|
|
"Rev": "2382e3994d48b1d22acc2c86bcad0a2aff028e32"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "gopkg.in/yaml.v2",
|
|
|
|
|
"Rev": "670d4cfef0544295bc27a114dbac37980d83185a"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/args",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/generator",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/namer",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/parser",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/gengo/types",
|
2018-07-08 07:25:08 +08:00
|
|
|
"Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
2018-07-14 09:00:00 +08:00
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/kube-openapi/cmd/openapi-gen/args",
|
|
|
|
|
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
|
|
|
|
},
|
2018-04-09 11:54:08 +08:00
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/kube-openapi/pkg/common",
|
2018-07-14 09:00:00 +08:00
|
|
|
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
2018-04-09 11:54:08 +08:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/kube-openapi/pkg/generators",
|
2018-07-14 09:00:00 +08:00
|
|
|
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/kube-openapi/pkg/generators/rules",
|
|
|
|
|
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"ImportPath": "k8s.io/kube-openapi/pkg/util/sets",
|
|
|
|
|
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
2018-04-09 11:54:08 +08:00
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|