fix: resolve conflict with chartmuseum and kubernetes

go.mod

@@ -3,8 +3,11 @@ module tkestack.io/tke
 go 1.12
 
 replace (
+ // wait https://github.com/chartmuseum/storage/pull/34 to be merged
+ github.com/chartmuseum/storage => github.com/choujimmy/storage v0.5.1-0.20191225102245-210f7683d0a6
  github.com/deislabs/oras => github.com/deislabs/oras v0.8.0
- github.com/dexidp/dex => github.com/choujimmy/dex v0.0.0-20191224125158-5641130772f5
+ // wait https://github.com/dexidp/dex/pull/1607 to be merged
+ github.com/dexidp/dex => github.com/choujimmy/dex v0.0.0-20191225100859-b1cb4b898bb7
  k8s.io/client-go => k8s.io/client-go v0.17.0
 )
 
@@ -14,7 +17,7 @@ require (
  github.com/Masterminds/semver v1.4.2 // indirect
  github.com/NYTimes/gziphandler v1.1.1 // indirect
  github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
- github.com/aws/aws-sdk-go v1.20.18
+ github.com/aws/aws-sdk-go v1.25.7
  github.com/bitly/go-simplejson v0.5.0
  github.com/blang/semver v3.5.1+incompatible
  github.com/casbin/casbin/v2 v2.1.2

go.sum

@@ -101,6 +101,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.20.18 h1:k8y5kuh6w8Jw8AOoXAZBygCTDmGNMqfkZK5/OffOB0E=
 github.com/aws/aws-sdk-go v1.20.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.25.7 h1:MRnnec09yF/nL/lfpMsYqHHyXUUt4P9LofFZA2D93PE=
+github.com/aws/aws-sdk-go v1.25.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/baidubce/bce-sdk-go v0.0.0-20190612031215-9245260b0d93 h1:8DxBydC6rruih2tjG7f1wuatqhWF9je3vVP+Q2Jbreg=
 github.com/baidubce/bce-sdk-go v0.0.0-20190612031215-9245260b0d93/go.mod h1:T3yEA2H7hXAlvniSEJRsPlDYlh8OEZZzH0zlIP/1JIY=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
@@ -141,10 +143,16 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chartmuseum/auth v0.2.0 h1:i/pWlR8qc5dBFx1h3DAOfIB15cKMIJtCv/5YrL5mMS4=
 github.com/chartmuseum/auth v0.2.0/go.mod h1:174JHg+DhDPGnFGgqHq6rT9chnmrBZgVQeiLu3mMglA=
-github.com/chartmuseum/storage v0.5.0 h1:BEbpnx8RxXnjzraDtm++nKXRGmcYRNQMTTEPlZcS0gU=
 github.com/chartmuseum/storage v0.5.0/go.mod h1:cdCT6Orq1pqJNeWu6u7R0vQWzE6YozS1PU4QKMdqTqY=
 github.com/choujimmy/dex v0.0.0-20191224125158-5641130772f5 h1:6thfJyDNffCPmsUi+fI3kU6pUMIjNOFJek+Ptyf4JBk=
 github.com/choujimmy/dex v0.0.0-20191224125158-5641130772f5/go.mod h1:H2iunuQJQ02QtSpFP5D2JjujCk8vmMs652ZsqkW5stI=
+github.com/choujimmy/dex v0.0.0-20191225100859-b1cb4b898bb7 h1:+8QcTUwanBics8b5Y4/ZCRrykpwkbizfjhpoUY8W2OU=
+github.com/choujimmy/dex v0.0.0-20191225100859-b1cb4b898bb7/go.mod h1:H2iunuQJQ02QtSpFP5D2JjujCk8vmMs652ZsqkW5stI=
+github.com/choujimmy/storage v0.5.1-0.20191225095617-0e4c6ffb1ad6/go.mod h1:4FNTZEClpqGTvZE0l3MioStVge0DdUxvASapXqQDL+c=
+github.com/choujimmy/storage v0.5.1-0.20191225101404-a01e79549caa h1:BoDYXFDuCBIXXALm4QVWzhgwp9t15/rTBoHwSL5q4sU=
+github.com/choujimmy/storage v0.5.1-0.20191225101404-a01e79549caa/go.mod h1:pq7GY/HdizD5OmyGcmvTrHDIhvOUzG7Kt/7gtgjK9x4=
+github.com/choujimmy/storage v0.5.1-0.20191225102245-210f7683d0a6 h1:wY9ObO6VJtogVixIYRqj2Rbu9Wh6OgI4lEHriWz4REA=
+github.com/choujimmy/storage v0.5.1-0.20191225102245-210f7683d0a6/go.mod h1:pq7GY/HdizD5OmyGcmvTrHDIhvOUzG7Kt/7gtgjK9x4=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -173,6 +181,8 @@ github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.15+incompatible h1:+9RjdC18gMxNQVvSiXvObLu29mOFmkgdsB4cRTlV+EE=
 github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNNP3dXwIq1lE=
+github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
@@ -827,6 +837,8 @@ go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.etcd.io/etcd v3.3.18+incompatible h1:5aomL5mqoKHxw6NG+oYgsowk8tU8aOalo2IdZxdWHkw=
+go.etcd.io/etcd v3.3.18+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=