diff --git a/Gopkg.lock b/Gopkg.lock index d70cbcb0b83..52fcc173bda 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,35 +2,20 @@ [[projects]] - digest = "1:5849d8fb74a3464195e7fb187ea0d2bfb85731172e37f17726f24fd6919a9f8e" + digest = "1:9f3bc9b251182aa0a26ac45e39a226c0f91e8f59dd91d8cab7d56b301684ee6a" name = "cloud.google.com/go" packages = ["compute/metadata"] pruneopts = "T" - revision = "97efc2c9ffd9fe8ef47f7f3203dc60bbca547374" - version = "v0.28.0" + revision = "c9474f2f8deb81759839474b6bd1726bbfe1c1c4" + version = "v0.36.0" [[projects]] - digest = "1:94720ccc2dacdd653d725aa848403c595377a6b3f8737aed8df98a6440a497ec" + digest = "1:2ba7ac901400e5ac6b29aabdce5ae8d85234bc799ad8cc2d7bafca1ef06387c6" name = "git.apache.org/thrift.git" packages = ["lib/go/thrift"] pruneopts = "T" - revision = "c564651dd404d7e9ff6bf7e5b343f429b9e5208" - -[[projects]] - digest = "1:56a1f3949ebb7fa22fa6b4e4ac0fe0f77cc4faee5b57413e6fa9199a8458faf1" - name = "github.com/google/uuid" - packages = ["."] - pruneopts = "NT" - revision = "9b3b1e0f5f99ae461456d768e7d301a7acdaa2d8" - version = "v1.1.0" - -[[projects]] - digest = "1:93b1d84c5fa6d1ea52f4114c37714cddd84d5b78f151b62bb101128dd51399bf" - name = "github.com/pborman/uuid" - packages = ["."] - pruneopts = "NT" - revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1" - version = "v1.2" + revision = "384647d290e2e4a55a14b1b7ef1b7e66293a2c33" + version = "v0.12.0" [[projects]] digest = "1:352fc094dbd1438593b64251de6788bffdf30f9925cf763c7f62e1fd27142b76" @@ -65,15 +50,15 @@ version = "v1.1.1" [[projects]] - digest = "1:0ffd93121f3971aea43f6a26b3eaaa64c8af20fb0ff0731087d8dab7164af5a8" + digest = "1:7f98547edaaa86eeaba758dd915cb2ee9264568257febdaad73c6b697e19b561" name = "github.com/emicklei/go-restful" packages = [ ".", "log", ] pruneopts = "T" - revision = "3eb9738c1697594ea6e71a7156a9bb32ed216cf0" - version = "v2.8.0" + revision = "85d198d05a92d31823b852b4a5928114912e8949" + version = "v2.9.0" [[projects]] digest = "1:7fc160b460a6fc506b37fcca68332464c3f2cd57b6e3f111f26c5bbfd2d5518e" @@ -100,12 +85,12 @@ revision = "9fb12b3b21c5415d16ac18dc5cd42c1cfdd40c4e" [[projects]] - branch = "master" digest = "1:ce43ad4015e7cdad3f0e8f2c8339439dd4470859a828d2a6988b0f713699e94a" name = "github.com/go-logr/zapr" packages = ["."] pruneopts = "T" revision = "7536572e8d55209135cd5e7ccf7fce43dca217ab" + version = "v0.1.0" [[projects]] digest = "1:701ec53dfa0182bf25e5c09e664906f11d697e779b59461a2607dbd4dc75a4f9" @@ -113,7 +98,7 @@ packages = ["."] pruneopts = "T" revision = "ef5f0afec364d3b9396b7b77b43dbe26bf1f8004" - version = "v0.17.2" + version = "v0.18.0" [[projects]] digest = "1:3f17ebd557845adeb347c9e398394e96ebc18e0ec94cc04972be87851a4679e0" @@ -121,50 +106,50 @@ packages = ["."] pruneopts = "T" revision = "8483a886a90412cd6858df4ea3483dce9c8e35a3" - version = "v0.17.2" + version = "v0.18.0" [[projects]] - digest = "1:76b8b440ca412e287dff607469a5a40a9445fe7168ad1fb85916d87c66011c83" + digest = "1:aab0bf9ea37838fc396fa23a503c51f12335e3f571fe78e0025d35e498bf7689" name = "github.com/go-openapi/spec" packages = ["."] pruneopts = "T" - revision = "5bae59e25b21498baea7f9d46e9c147ec106a42e" - version = "v0.17.2" + revision = "5b6cdde3200976e3ecceb2868706ee39b6aff3e4" + version = "v0.18.0" [[projects]] - digest = "1:0d8057a212a27a625bb8e57b1e25fb8e8e4a0feb0b7df543fd46d8d15c31d870" + digest = "1:1b0d6468099d6a5b331ce46f5a398ef368abc6220d79825baf03a672f9d4e816" name = "github.com/go-openapi/swag" packages = ["."] pruneopts = "T" - revision = "5899d5c5e619fda5fa86e14795a835f473ca284c" - version = "v0.17.2" + revision = "1d29f06aebd59ccdf11ae04aa0334ded96e2d909" + version = "v0.18.0" [[projects]] - digest = "1:d6bd34d9f9b8cb40469c1e5cca1e5d866f139f1c762e954f95d07e9f936aa86d" + digest = "1:92d9d8d25bbab74ef8a3c546c121e24542ac984ccdc4f99678e06042a45e71f8" name = "github.com/go-sql-driver/mysql" packages = ["."] pruneopts = "T" - revision = "d523deb1b23d913de5bdada721a6071e71283618" - version = "v1.4.0" + revision = "72cd26f257d44c1114970e19afddcd812016007e" + version = "v1.4.1" [[projects]] - digest = "1:011e8eca01fb5af3497e6f1b79d670bb6b8519b4b0c287b710f984b364aaafb8" + digest = "1:74c676217f6583261297ef51c00d945ab470ff5ec5db5a9bf3dcd4cce85ea95f" name = "github.com/gobuffalo/envy" packages = ["."] pruneopts = "T" - revision = "3c96536452167a705ca5a70b831d3810e1e10452" - version = "v1.6.4" + revision = "fa0dfdc10b5366ce365b7d9d1755a03e4e797bc5" + version = "v1.6.15" [[projects]] - digest = "1:da39f4a22829ca95e63566208e0ea42d6f055f41dff1b14fdab88d88f62df653" + digest = "1:f5ccd717b5f093cbabc51ee2e7a5979b92f17d217f9031d6d64f337101c408e4" name = "github.com/gogo/protobuf" packages = [ "proto", "sortkeys", ] pruneopts = "T" - revision = "636bf0302bc95575d69441b25a2603156ffdddf1" - version = "v1.1.1" + revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7" + version = "v1.2.0" [[projects]] branch = "master" @@ -176,19 +161,19 @@ [[projects]] branch = "master" - digest = "1:29342f636f875ca5478b6fd926212c37d89ae3c858ab3ec4680ee1eed7d32945" + digest = "1:fdd1399bcba383bf3cd94862c7280c76b241e33c518bf018fcb2ebbc326961a9" name = "github.com/golang/groupcache" packages = ["lru"] pruneopts = "T" - revision = "24b0969c4cb722950103eed87108c8d291a8df00" + revision = "5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b" [[projects]] - digest = "1:db4ee29dee022c4cd49908553e35dd1c1c01ac56273bdf0c66a18bfba2eead30" + digest = "1:7912bb30698616cf0c41e5ef6a29a447c9a3e76bfcacbc21420ed3cdf616fd94" name = "github.com/golang/mock" packages = ["gomock"] pruneopts = "T" - revision = "c34cdb4725f4c3844d095133c6e40e448b86589b" - version = "v1.1.1" + revision = "51421b967af1f557f93a59e0057aaf15ca02e29c" + version = "v1.2.0" [[projects]] digest = "1:a2ecb56e5053d942aafc86738915fb94c9131bac848c543b8b6764365fd69080" @@ -212,6 +197,14 @@ revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" version = "v1.2.0" +[[projects]] + branch = "master" + digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df" + name = "github.com/google/btree" + packages = ["."] + pruneopts = "T" + revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" + [[projects]] branch = "master" digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" @@ -220,6 +213,14 @@ pruneopts = "T" revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" +[[projects]] + digest = "1:236d7e1bdb50d8f68559af37dbcf9d142d56b431c9b2176d41e2a009b664cda8" + name = "github.com/google/uuid" + packages = ["."] + pruneopts = "T" + revision = "9b3b1e0f5f99ae461456d768e7d301a7acdaa2d8" + version = "v1.1.0" + [[projects]] digest = "1:35735e2255fa34521c2a1355fb2a3a2300bc9949f487be1c1ce8ee8efcfa2d04" name = "github.com/googleapis/gnostic" @@ -232,6 +233,17 @@ revision = "7c663266750e7d82587642f65e60bc4083f1f84e" version = "v0.2.0" +[[projects]] + branch = "master" + digest = "1:2a7b09c37abc890d89d5c66cc60c9559c3628f09c16cae54a902aa3673d69362" + name = "github.com/gregjones/httpcache" + packages = [ + ".", + "diskcache", + ] + pruneopts = "T" + revision = "3befbb6ad0cc97d4c25d851e9528915809e1a22f" + [[projects]] digest = "1:69cd81163a00bb8405194d47b8be19283744779b6104f2d6b3735e2a01cdb6fa" name = "github.com/grpc-ecosystem/grpc-gateway" @@ -283,14 +295,6 @@ revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" version = "v1.0.0" -[[projects]] - branch = "master" - digest = "1:0778dc7fce1b4669a8bfa7ae506ec1f595b6ab0f8989c1c0d22a8ca1144e9972" - name = "github.com/howeyc/gopass" - packages = ["."] - pruneopts = "T" - revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8" - [[projects]] digest = "1:8f20c8dd713564fa97299fbcb77d729c6de9c33f3222812a76e6ecfaef80fd61" name = "github.com/hpcloud/tail" @@ -306,12 +310,12 @@ version = "v1.0.0" [[projects]] - digest = "1:3477d9dd8c135faab978bac762eaeafb31f28d6da97ef500d5c271966f74140a" + digest = "1:f53ef9250fa86a357d164aa5188ff02762a6b0ee5129671ad231ed6ba986b4c5" name = "github.com/imdario/mergo" packages = ["."] pruneopts = "T" - revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" - version = "v0.3.6" + revision = "7c29201646fa3de8506f701213473dd407f19646" + version = "v0.3.7" [[projects]] digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" @@ -338,23 +342,23 @@ version = "v1.1.5" [[projects]] - digest = "1:11eef84ee2fae64144174a994ee8b5c96c028c091565a325303d771d2c73e705" + digest = "1:83ac030e105f19c505940ec8cbeab42c08a46c4acaf019d601aac265097ff386" name = "github.com/kubeflow/pytorch-operator" packages = ["pkg/apis/pytorch/v1beta1"] pruneopts = "T" - revision = "97b3b9974baf73959329ae9ee4d18ef5b85a61a7" - version = "v0.4.0-rc.1" + revision = "da7798e7c2c127a270735c409f9305f3a6c06fd8" + version = "v0.5.0-rc.1" [[projects]] - digest = "1:931643b24140b2960fb80e46d15c68587485c41d1ee9d9f887563e0d11ab8f15" + digest = "1:64050ccb900fa5444419c795172576c0e5594aebdece709531959b54dcbe03ed" name = "github.com/kubeflow/tf-operator" packages = [ "pkg/apis/common/v1beta1", "pkg/apis/tensorflow/v1beta1", ] pruneopts = "T" - revision = "bb0115fbf9eefa19875241da8700aa8d00ff7084" - version = "v0.4.0-rc.1" + revision = "c2849477dffdeacc2ebc11de66f826a6ce5cf690" + version = "v0.4.0" [[projects]] digest = "1:53e8c5c79716437e601696140e8b1801aae4204f4ec54a504333702a49572c4f" @@ -377,20 +381,28 @@ revision = "60711f1a8329503b04e1c88535f419d0bb440bff" [[projects]] - digest = "1:e60b8e2ad986a90b522fd74a87c4f5b3bb173c6a6bc5d88744d70cb0c760afdd" + digest = "1:3804a3a02964db8e6db3e5e7960ac1c1a9b12835642dd4f4ac4e56c749ec73eb" name = "github.com/markbates/inflect" packages = ["."] pruneopts = "T" - revision = "dd7de90c06bca70f18136e59dec2270c19a401e7" - version = "v1.0.0" + revision = "24b83195037b3bc61fcda2d28b7b0518bce293b6" + version = "v1.0.4" [[projects]] - digest = "1:645110e089152bd0f4a011a2648fbb0e4df5977be73ca605781157ac297f50c4" + branch = "master" + digest = "1:fc2b04b0069d6b10bdef96d278fe20c345794009685ed3c8c7f1a6dc023eefec" + name = "github.com/mattbaird/jsonpatch" + packages = ["."] + pruneopts = "T" + revision = "81af80346b1a01caae0cbc27fd3c1ba5b11e189f" + +[[projects]] + digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318" name = "github.com/mitchellh/mapstructure" packages = ["."] pruneopts = "T" - revision = "fa473d140ef3c6adf42d6b391fe76707f1f243c8" - version = "v1.0.0" + revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" + version = "v1.1.2" [[projects]] digest = "1:33422d238f147d247752996a26574ac48dcf472976eda7f5134015f06bf16563" @@ -409,7 +421,7 @@ version = "1.0.1" [[projects]] - digest = "1:99ec7b4370b05816679fe9ae77f1f8af4eae3df0abaeef8c3d2d42d86f55f549" + digest = "1:1de2ef6996903caab4bcf41f7885aa276d8e20076ba52ca80b2c6c32efb9c5f5" name = "github.com/onsi/ginkgo" packages = [ ".", @@ -432,11 +444,11 @@ "types", ] pruneopts = "T" - revision = "3774a09d95489ccaa16032e0770d08ea77ba6184" - version = "v1.6.0" + revision = "2e1be8f7d90e9d3e3e58b0ce470f2f14d075406f" + version = "v1.7.0" [[projects]] - digest = "1:8dd7bb91b515b86408de9c0d553f14e97ffa21c65c643976242e63d11a28999a" + digest = "1:4f40f5e1925c58d5f9b6a953d1b02f475a6be704e9b5f1a21df6c62c434bde13" name = "github.com/onsi/gomega" packages = [ ".", @@ -455,8 +467,16 @@ "types", ] pruneopts = "T" - revision = "7615b9433f86a8bdf29709bf288bc4fd0636a369" - version = "v1.4.2" + revision = "65fb64232476ad9046e57c26cd0bff3d3a8dc6cd" + version = "v1.4.3" + +[[projects]] + digest = "1:e5d0bd87abc2781d14e274807a470acd180f0499f8bf5bb18606e9ec22ad9de9" + name = "github.com/pborman/uuid" + packages = ["."] + pruneopts = "T" + revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1" + version = "v1.2" [[projects]] digest = "1:ccf9949c9c53e85dcb7e2905fc620571422567040925381e6baa62f0b7b850fe" @@ -467,47 +487,75 @@ version = "v1.2.0" [[projects]] - digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" + branch = "master" + digest = "1:0c29d499ffc3b9f33e7136444575527d0c3a9463a89b3cbeda0523b737f910b3" + name = "github.com/petar/GoLLRB" + packages = ["llrb"] + pruneopts = "T" + revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + +[[projects]] + digest = "1:598241bd36d3a5f6d9102a306bd9bf78f3bc253672460d92ac70566157eae648" + name = "github.com/peterbourgon/diskv" + packages = ["."] + pruneopts = "T" + revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" + version = "v2.0.1" + +[[projects]] + digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" name = "github.com/pkg/errors" packages = ["."] pruneopts = "T" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" + revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" + version = "v0.8.1" [[projects]] - digest = "1:0e75314747e02628283e4143dd5b51091c756b5444351353fae6551f3dc73bfa" + digest = "1:c9283a02d3388f26e1c0a6596a278a2408be500052926ceddfd7e95786ddae86" name = "github.com/pressly/chi" packages = ["."] pruneopts = "T" - revision = "b5294d10673813fac8558e7f47242bc9e61b4c25" - version = "v3.3.3" + revision = "1a6bb108ccf279c8dac6f9bad857d773b4f9b421" + version = "v4.0.1" [[projects]] - digest = "1:1da92105f7353df0e98181412a353a1c9b1976514dbe24368fb36bd054233edd" + digest = "1:0fc5e12942c39b6c99ad3d52c03778560e1378a841a24e9b30c4f064af1cf1ef" + name = "github.com/rogpeppe/go-internal" + packages = [ + "modfile", + "module", + "semver", + ] + pruneopts = "T" + revision = "2ea7272aa4c7de5c8a568dff504404e8dc49945d" + version = "v1.2.1" + +[[projects]] + digest = "1:40e527269f1feb16b3069bfe80ff05a462d190eacfe07eb0a59fa25c381db7af" name = "github.com/russross/blackfriday" packages = ["."] pruneopts = "T" - revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5" - version = "v1.5.1" + revision = "05f3235734ad95d0016f6a23902f06461fcf567a" + version = "v1.5.2" [[projects]] - digest = "1:b7bf9fd95d38ebe6726a63b7d0320611f7c920c64e2c8313eba0cec51926bf55" + digest = "1:2c31831b97353515f0bb77a3e7f2df69e50c4173116aad4250e22b1c664a1484" name = "github.com/spf13/afero" packages = [ ".", "mem", ] pruneopts = "T" - revision = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd" - version = "v1.1.2" + revision = "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5" + version = "v1.2.1" [[projects]] - digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" + digest = "1:08d65904057412fc0270fc4812a1c90c594186819243160dc779a402d4b6d0bc" name = "github.com/spf13/cast" packages = ["."] pruneopts = "T" - revision = "8965335b8c7107321228e3e3702cab9832751bac" - version = "v1.2.0" + revision = "8c9545af88b134710ab1cd196795e7f2388358d7" + version = "v1.3.0" [[projects]] digest = "1:8be8b3743fc9795ec21bbd3e0fc28ff6234018e1a269b0a7064184be95ac13e0" @@ -529,20 +577,20 @@ version = "v1.0.0" [[projects]] - digest = "1:9ba911fe3884995431690e7eb180cf848da0d637ba5f61711783b795d031793f" + digest = "1:0f775ea7a72e30d5574267692aaa9ff265aafd15214a7ae7db26bc77f2ca04dc" name = "github.com/spf13/pflag" packages = ["."] pruneopts = "T" - revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" - version = "v1.0.2" + revision = "298182f68c66c05229eb03ac171abe6e309ee79a" + version = "v1.0.3" [[projects]] - digest = "1:9e76aa59a9fa6f242f6b965938083a52037133306f6f53c003018edf303ad550" + digest = "1:fefab651e5663d271bda04e3fac63e52d642b454ef88dc1b78deca05f267e94e" name = "github.com/spf13/viper" packages = ["."] pruneopts = "T" - revision = "8fb642006536c8d3760c99d4fa2389f5e2205631" - version = "v1.2.0" + revision = "6d33b5a963d922d182c91e8a1c88d81fd150cfd4" + version = "v1.3.1" [[projects]] digest = "1:365b8ecb35a5faf5aa0ee8d798548fc9cd4200cb95d77a5b0b285ac881bae499" @@ -577,11 +625,11 @@ [[projects]] branch = "master" - digest = "1:62fac8c414ce3fb59b87102ebebb04edd0287a721c0cd6b36f4dc866a42cf772" + digest = "1:d153577f655cf6a13047c1bdee3484897464ebaa6d1c896f10d30ea1127b0e91" name = "golang.org/x/crypto" packages = ["ssh/terminal"] pruneopts = "T" - revision = "0e37d006457bf46f9e6692014ba72ef82c33022c" + revision = "74369b46fc6756741c016591724fd1cb8e26845f" [[projects]] digest = "1:03b79d18832370034cb2b8ea8f122d38e17c76b927d30ccc891e22e1a4edd4d8" @@ -605,7 +653,7 @@ [[projects]] branch = "master" - digest = "1:b532962365df3c36d313cb4a9c0551523b1ed562b9e5736780577b02835086f7" + digest = "1:0e7daa40947bf901c8aaaa6d5f41c21d8986dc6e4343a479c82eeebcd25c1e28" name = "golang.org/x/oauth2" packages = [ ".", @@ -615,18 +663,18 @@ "jwt", ] pruneopts = "T" - revision = "d2e6202438beef2727060aa7cabdd924d92ebfd9" + revision = "3e8b2be1363542a95c52ea0796d4a40dacfb5b95" [[projects]] branch = "master" - digest = "1:6acc06b9cbb44d203b7eeb5a8e82e2220fa520d0f62706e0c7b1abde24e38015" + digest = "1:4a6249b02c82711226c433be5d993e20b2e1204e82e4aeb18d8d854f17397824" name = "golang.org/x/sys" packages = [ "unix", "windows", ] pruneopts = "T" - revision = "d641721ec2dead6fe5ca284096fe4b1fcd49e427" + revision = "983097b1a8a340cd1cc7df17d735154d89e10b1a" [[projects]] digest = "1:6164911cb5e94e8d8d5131d646613ff82c14f5a8ce869de2f6d80d9889df8c5a" @@ -666,26 +714,35 @@ [[projects]] branch = "master" - digest = "1:59a73243379bd5412feb268ec3d9ec0c55acb596ce15fdf937ec29ea6dab441f" + digest = "1:077216d94c076b8cd7bd057cb6f7c6d224970cc991bdfe49c0c7a24e8e39ee33" name = "golang.org/x/time" packages = ["rate"] pruneopts = "T" - revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" + revision = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd" [[projects]] branch = "master" - digest = "1:cb1e49e44ee2c2e747ac5aff392dc05e20bbcf2706219c8dbb0f7f21d19ff1ae" + digest = "1:0f7d9e8a3d208f6faecdd7f47118436723ae8e0a9085d651040c61c7ced6a56a" name = "golang.org/x/tools" packages = [ "go/ast/astutil", + "go/gcexportdata", + "go/internal/cgo", + "go/internal/gcimporter", + "go/internal/packagesdriver", + "go/packages", + "go/types/typeutil", "imports", "internal/fastwalk", + "internal/gopathwalk", + "internal/module", + "internal/semver", ] pruneopts = "T" - revision = "90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d" + revision = "508f945e1a9bd8b5e3a9444bb2cdd13d0896132e" [[projects]] - digest = "1:193075fba81bbed6bbb7909249582de60770f5e67ed1c9321f4eeb2d9b56c7a4" + digest = "1:1469235a5a8e192cfe6a99c4804b883a02f0ff96a693cd1660515a3a3b94d5ac" name = "google.golang.org/appengine" packages = [ ".", @@ -701,39 +758,44 @@ "urlfetch", ] pruneopts = "T" - revision = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06" - version = "v1.2.0" + revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" + version = "v1.4.0" [[projects]] branch = "master" - digest = "1:b6225010c089d419d86aa7bc8e80f50364a9464adad138bb6b46f4012c052177" + digest = "1:91f75dc679abcf04b29b064a5b9c40a0b0561c86c322010fbf6fc08040cc48bc" name = "google.golang.org/genproto" packages = [ "googleapis/api/annotations", "googleapis/rpc/status", ] pruneopts = "T" - revision = "c3f76f3b92d1ffa4c58a9ff842a58b8877655e0f" + revision = "4b09977fb92221987e99d190c8f88f2c92727a29" [[projects]] - digest = "1:1cbd746dcb73e28898e1539bf866044a9e5b96c965112772c111bffbb4037255" + digest = "1:adec72b8770ba7ad04c7a5a8ef8c6cc13a766bd11f900b60f360303b4f56e0b1" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/internal", "encoding", "encoding/proto", "grpclog", "internal", "internal/backoff", + "internal/binarylog", "internal/channelz", "internal/envconfig", "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", "internal/transport", "keepalive", "metadata", @@ -749,16 +811,16 @@ "tap", ] pruneopts = "T" - revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" - version = "v1.15.0" + revision = "a02b0774206b209466313a0b525d2c738fe407eb" + version = "v1.18.0" [[projects]] - digest = "1:9e96087ee84ca7a3e93c8df64360fdbfc892b2d9147eddbda5cb4ac421f1f6e2" + digest = "1:ac39152382a4c8cac6bd3962f0481750a64c1b54689c56a1e8d67834f3330bb7" name = "gopkg.in/DATA-DOG/go-sqlmock.v1" packages = ["."] pruneopts = "T" - revision = "d76b18b42f285b792bf985118980ce9eacea9d10" - version = "v1.3.0" + revision = "472e287dbafe67e526a3797165b64cb14f34705a" + version = "v1.3.2" [[projects]] digest = "1:7fc160b460a6fc506b37fcca68332464c3f2cd57b6e3f111f26c5bbfd2d5518e" @@ -786,17 +848,18 @@ revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8" [[projects]] - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" + digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" name = "gopkg.in/yaml.v2" packages = ["."] pruneopts = "T" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" + revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" + version = "v2.2.2" [[projects]] - digest = "1:7b4520bed4eee8895eeb2c30611178146a30b70e9a4d2b07068e3795c6a3bcaf" + digest = "1:75905606c2db8d9526ccff0acf5655759afe3d901d1d64868bd87985b4a46e36" name = "k8s.io/api" packages = [ + "admission/v1beta1", "admissionregistration/v1alpha1", "admissionregistration/v1beta1", "apps/v1", @@ -821,36 +884,34 @@ "rbac/v1alpha1", "rbac/v1beta1", "scheduling/v1alpha1", + "scheduling/v1beta1", "settings/v1alpha1", "storage/v1", "storage/v1alpha1", "storage/v1beta1", ] pruneopts = "T" - revision = "73d903622b7391f3312dcbac6483fed484e185f8" - version = "kubernetes-1.10.1" + revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:93787b85c4d0e2ee4ebd1ea1eeb97a4c074536928c045d94333e0654eb3f4428" + digest = "1:3fe3cb0c5e5a140f0b40c18796b884d3432efbd690b0bda8cbd838d38a3ea585" name = "k8s.io/apiextensions-apiserver" packages = [ "pkg/apis/apiextensions", "pkg/apis/apiextensions/v1beta1", ] pruneopts = "T" - revision = "4347b330d0ff094db860f2f75fa725b4f4b53618" - version = "kubernetes-1.10.1" + revision = "408db4a50408e2149acbd657bceb2480c13cb0a4" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:40b0f5d488cfde8efb3953dbcff84d2211fd51e560044c64151273ec54683dc6" + digest = "1:e2035d60919705a125feeb8b13926383aff8817634b2c4550743c19ca21f3b08" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", "pkg/api/meta", "pkg/api/resource", - "pkg/apimachinery", - "pkg/apimachinery/announced", - "pkg/apimachinery/registered", "pkg/apis/meta/internalversion", "pkg/apis/meta/v1", "pkg/apis/meta/v1/unstructured", @@ -892,11 +953,11 @@ "third_party/forked/golang/reflect", ] pruneopts = "T" - revision = "302974c03f7e50f16561ba237db776ab93594ef6" - version = "kubernetes-1.10.1" + revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:b324d81a2e103152a81439ec0889b2193c0a14a154bf68f7a24a5b880b7f3ffa" + digest = "1:0a19f9bf56ecc683569299c8c2282ee3ac70d4e32eeb170d3265761bff8d5e12" name = "k8s.io/client-go" packages = [ "discovery", @@ -927,17 +988,20 @@ "kubernetes/typed/rbac/v1alpha1", "kubernetes/typed/rbac/v1beta1", "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1beta1", "kubernetes/typed/settings/v1alpha1", "kubernetes/typed/storage/v1", "kubernetes/typed/storage/v1alpha1", "kubernetes/typed/storage/v1beta1", "pkg/apis/clientauthentication", "pkg/apis/clientauthentication/v1alpha1", + "pkg/apis/clientauthentication/v1beta1", "pkg/version", "plugin/pkg/client/auth/exec", "plugin/pkg/client/auth/gcp", "rest", "rest/watch", + "restmapper", "third_party/forked/golang/template", "tools/auth", "tools/cache", @@ -945,6 +1009,8 @@ "tools/clientcmd/api", "tools/clientcmd/api/latest", "tools/clientcmd/api/v1", + "tools/leaderelection", + "tools/leaderelection/resourcelock", "tools/metrics", "tools/pager", "tools/record", @@ -952,6 +1018,7 @@ "transport", "util/buffer", "util/cert", + "util/connrotation", "util/flowcontrol", "util/homedir", "util/integer", @@ -960,12 +1027,11 @@ "util/workqueue", ] pruneopts = "T" - revision = "989be4278f353e42f26c416c53757d16fcff77db" - version = "kubernetes-1.10.1" + revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1" + version = "kubernetes-1.11.2" [[projects]] - branch = "master" - digest = "1:4e2addcdbe0330f43800c1fcb905fc7a21b86415dfcca619e5c606c87257af1b" + digest = "1:8ab487a323486c8bbbaa3b689850487fdccc6cbea8690620e083b2d230a4447e" name = "k8s.io/code-generator" packages = [ "cmd/deepcopy-gen", @@ -973,11 +1039,12 @@ "pkg/util", ] pruneopts = "T" - revision = "aae79feb89bdded3679da91fd8c19b6dfcbdb79a" + revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a" + version = "kubernetes-1.11.2" [[projects]] branch = "master" - digest = "1:f58422ce44ba581f34423e12c951061d139fa3518441b0e791b1f57a6494d603" + digest = "1:2b9071c93303f1196cfe959c7f7f69ed1e4a5180f240a259536c5886f79f86d4" name = "k8s.io/gengo" packages = [ "args", @@ -989,7 +1056,15 @@ "types", ] pruneopts = "T" - revision = "4242d8e6c5dba56827bb7bcf14ad11cda38f3991" + revision = "0689ccc1d7d65d9dd1bedcc3b0b1ed7df91ba266" + +[[projects]] + digest = "1:ed9fcc00d9b154265b72e4117e7e41c4af049bf2c4a7ee9171960f938ff1ca65" + name = "k8s.io/klog" + packages = ["."] + pruneopts = "T" + revision = "71442cd4037d612096940ceb0f3fec3f7fff66e0" + version = "v0.2.0" [[projects]] branch = "release-1.10" @@ -1003,7 +1078,7 @@ revision = "39cb288412c48cb533ba4be5d6c28620b9a0c1b4" [[projects]] - digest = "1:355ef996107f9975903d75f1f091fca168603d3b5c8eb88d858ee6b90e80d1f5" + digest = "1:ca3f51201a90f3a23bf35938ee910d2fb3095ece453cf56c8b723e935c194ebd" name = "sigs.k8s.io/controller-runtime" packages = [ "pkg/cache", @@ -1017,7 +1092,9 @@ "pkg/handler", "pkg/internal/controller", "pkg/internal/recorder", + "pkg/leaderelection", "pkg/manager", + "pkg/patch", "pkg/predicate", "pkg/reconcile", "pkg/recorder", @@ -1027,13 +1104,16 @@ "pkg/runtime/signals", "pkg/source", "pkg/source/internal", + "pkg/webhook/admission", + "pkg/webhook/admission/types", + "pkg/webhook/types", ] pruneopts = "T" - revision = "67e28744a963c78a34108c3b52aadbc5e02f4384" - version = "v0.1.1" + revision = "5fd1e9e9fac5261e9ad9d47c375afc014fc31d21" + version = "v0.1.7" [[projects]] - digest = "1:58b878c2275390dcf5160957c3121ebc61e97eb632ae02726d11a4d1988da41f" + digest = "1:92290e452e328ffe6bd62f969e51d3aadd57a30a68b5fcf31ccdeda62068bb5d" name = "sigs.k8s.io/controller-tools" packages = [ "cmd/controller-gen", @@ -1045,19 +1125,20 @@ "pkg/util", ] pruneopts = "T" - revision = "62b5a17481a76b7a1feea0b16188d52a6f61ec64" - version = "v0.1.3" + revision = "38b2f3f497ed6b8ea5d2844ecf00c28ac4b5c2c4" + version = "v0.1.6" [[projects]] - branch = "master" - digest = "1:fd7fb0f1f6e3259ec03c9730c675f7c97bcbd9d2a1037364734b197eaa76eee7" + digest = "1:290b4da306982122bcdff12dbababbb95c6e4a94a2995db88baf235ef2f6e93e" name = "sigs.k8s.io/testing_frameworks" packages = [ "integration", + "integration/addr", "integration/internal", ] pruneopts = "T" - revision = "5818a3a284a11812aaed11d5ca0bcadec2c50e83" + revision = "d348cb12705b516376e0c323bacca72b00a78425" + version = "v0.1.1" [solve-meta] analyzer-name = "dep" @@ -1099,11 +1180,14 @@ "k8s.io/api/extensions/v1beta1", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", "k8s.io/apimachinery/pkg/api/errors", + "k8s.io/apimachinery/pkg/api/meta", "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/labels", "k8s.io/apimachinery/pkg/runtime", "k8s.io/apimachinery/pkg/runtime/schema", "k8s.io/apimachinery/pkg/runtime/serializer", "k8s.io/apimachinery/pkg/types", + "k8s.io/apimachinery/pkg/util/uuid", "k8s.io/apimachinery/pkg/util/yaml", "k8s.io/client-go/kubernetes", "k8s.io/client-go/kubernetes/scheme", diff --git a/Gopkg.toml b/Gopkg.toml index 3b86b0af8b6..9d2a90df9f5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -59,23 +59,27 @@ required = [ [[constraint]] name = "k8s.io/api" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[constraint]] name = "k8s.io/apimachinery" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[constraint]] name = "k8s.io/client-go" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" + +[[constraint]] + name = "k8s.io/code-generator" + version = "kubernetes-1.11.2" [[constraint]] name = "sigs.k8s.io/controller-runtime" - version = "0.1.1" + version = "0.1.7" [[override]] name="k8s.io/apiextensions-apiserver" - version="kubernetes-1.10.1" + version="kubernetes-1.11.2" [[override]] name = "gopkg.in/fsnotify.v1" @@ -84,8 +88,8 @@ required = [ [[constraint]] name = "github.com/kubeflow/tf-operator" - version = "0.4.0-rc.1" + version = "0.4.0" [[constraint]] name = "github.com/kubeflow/pytorch-operator" - version = "0.4.0-rc.1" + version = "0.5.0-rc.1" diff --git a/pkg/controller/studyjob/pod_control.go b/pkg/controller/studyjob/pod_control.go deleted file mode 100644 index aab23e73293..00000000000 --- a/pkg/controller/studyjob/pod_control.go +++ /dev/null @@ -1,61 +0,0 @@ -/* - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package studyjob - -import ( - "log" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - clientset "k8s.io/client-go/kubernetes" - restclient "k8s.io/client-go/rest" -) - -type PodControl struct { - kubeClient clientset.Interface -} - -func NewPodControl() (*PodControl, error) { - config, err := restclient.InClusterConfig() - if err != nil { - return nil, err - } - kc, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - return &PodControl{ - kubeClient: kc, - }, nil -} - -func (c PodControl) DeletePodsForWorker(namespace string, wid string) error { - selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{ - MatchLabels: map[string]string{"job-name":wid}, - }) - if err != nil { - return err - } - log.Printf("Deleting pods with selector %v", selector.String()) - listOptions := metav1.ListOptions{ - LabelSelector: selector.String(), - } - err = c.kubeClient.CoreV1().Pods(namespace).DeleteCollection(&metav1.DeleteOptions{}, listOptions) - if err != nil { - return err - } - log.Printf("Deleted pods with selector %v.", selector.String()) - return nil -} diff --git a/pkg/controller/studyjob/studyjob_controller.go b/pkg/controller/studyjob/studyjob_controller.go index 9a9459275b8..1945160c877 100644 --- a/pkg/controller/studyjob/studyjob_controller.go +++ b/pkg/controller/studyjob/studyjob_controller.go @@ -53,7 +53,7 @@ const ( ) var ( - invalidCRDResources [] string + invalidCRDResources []string ) /** @@ -74,11 +74,7 @@ func Add(mgr manager.Manager) error { // newReconciler returns a new reconcile.Reconciler func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) { - pc, err := NewPodControl() - if err != nil { - return nil, err - } - return &ReconcileStudyJobController{Client: mgr.GetClient(), scheme: mgr.GetScheme(), muxMap: sync.Map{}, podControl: pc}, nil + return &ReconcileStudyJobController{Client: mgr.GetClient(), scheme: mgr.GetScheme(), muxMap: sync.Map{}}, nil } // add adds a new Controller to mgr with r as the reconcile.Reconciler @@ -143,9 +139,8 @@ var _ reconcile.Reconciler = &ReconcileStudyJobController{} // ReconcileStudyJobController reconciles a StudyJob object type ReconcileStudyJobController struct { client.Client - scheme *runtime.Scheme - muxMap sync.Map - podControl *PodControl + scheme *runtime.Scheme + muxMap sync.Map } type WorkerStatus struct { @@ -312,14 +307,7 @@ func (r *ReconcileStudyJobController) deleteWorkerResources(instance *katibv1alp if !wretain { joberr := r.Client.Get(context.TODO(), nname, obj) if joberr == nil { - if err := r.Delete(context.TODO(), obj); err != nil { - return err - } - // In order to integrate with tf-operator and pytorch-operator, we need to - // downgrade the k8s dependency for katib from 1.11.2 to 1.10.1, and - // controller-runtime from 0.1.3 to 0.1.1. This means that we cannot use - // DeletePropagationForeground to clean up pods, and must do this manually. - if err := r.podControl.DeletePodsForWorker(ns, wid); err != nil { + if err := r.Delete(context.TODO(), obj, client.PropagationPolicy(metav1.DeletePropagationForeground)); err != nil { return err } }