diff --git a/go.mod b/go.mod index 4860ff6890..2c15d858a1 100644 --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ replace ( github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.1 github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b github.com/rancher/k3s/pkg/data => ./pkg/data + github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.5 go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.0-k3s1 go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.0-k3s1 go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s1 @@ -88,7 +89,7 @@ require ( github.com/google/uuid v1.2.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.2 - github.com/k3s-io/helm-controller v0.10.5 + github.com/k3s-io/helm-controller v0.11.3 github.com/k3s-io/kine v0.7.3 github.com/klauspost/compress v1.12.2 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 @@ -103,11 +104,11 @@ require ( github.com/opencontainers/selinux v1.8.2 github.com/pierrec/lz4 v2.6.0+incompatible github.com/pkg/errors v0.9.1 - github.com/rancher/dynamiclistener v0.2.3 + github.com/rancher/dynamiclistener v0.2.6 + github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 github.com/rancher/remotedialer v0.2.0 github.com/rancher/wharfie v0.3.4 github.com/rancher/wrangler v0.8.3 - github.com/rancher/wrangler-api v0.6.0 github.com/robfig/cron/v3 v3.0.1 github.com/rootless-containers/rootlesskit v0.14.0 github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index 84764aea84..1c7abf6b25 100644 --- a/go.sum +++ b/go.sum @@ -74,11 +74,9 @@ github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cq github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.0 h1:FqK94z34ly8Baa6K+G8Mmza9rYWTKOJk+yckIBB5qVk= @@ -224,7 +222,6 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -268,7 +265,6 @@ github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83 h1:ngHdSomn2My github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod h1:v6o7m/E9bfvm79dE1iFiF+3T7zLBnrjYjkWMa1J+Hv0= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -298,7 +294,6 @@ github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqF github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= @@ -330,14 +325,12 @@ github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2 github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -352,7 +345,6 @@ github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCs github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -363,7 +355,6 @@ github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pL github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -436,10 +427,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod h1:yZAFP63pRshzrEYLXLGPmUt0Ay+2zdjmMN1loCnRLUk= github.com/google/go-containerregistry v0.5.0 h1:eb9sinv4PKm0AUwQGov0mvIdA4pyBGjRofxN4tWnMwM= github.com/google/go-containerregistry v0.5.0/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -461,8 +450,6 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= @@ -522,7 +509,6 @@ github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Go github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -531,7 +517,6 @@ github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod h1:TKl4jN github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod h1:zzwpsgcYhzzIP5WyF8g9ivCv38cY9uAV9Gu0m3lThhE= -github.com/jetstack/cert-manager v0.7.2/go.mod h1:nbddmhjWxYGt04bxvwVGUSeLhZ2PCyNvd7MpXdq+yWY= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -549,7 +534,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+ github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -576,8 +560,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s1 h1:G0u+ShI11UDcP4Z8OP3CSl4/Wg63OgR github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s1/go.mod h1:o98rKMCibbFAG8QS9KmvlYDGDShmmIbmRE8vSofzYNg= github.com/k3s-io/etcd/server/v3 v3.5.0-k3s1 h1:be2d2LS1w+OxyHE/PF6tmGVzF72+7L2FZ6BmxK1Q0ow= github.com/k3s-io/etcd/server/v3 v3.5.0-k3s1/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -github.com/k3s-io/helm-controller v0.10.5 h1:zrStmx4ZkhtFU/OqJYoAZFGFB1Bu+jZs0N8dtlVRxDk= -github.com/k3s-io/helm-controller v0.10.5/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= +github.com/k3s-io/helm-controller v0.11.3 h1:DSPAOCGHxF5pmF4vzQP5AgPT3tiGRJRZu+08hwWtbGI= +github.com/k3s-io/helm-controller v0.11.3/go.mod h1:z0ExsRRIkTO/QC//3/Esn5ItTD6AiQSluwzMaS7RI/4= github.com/k3s-io/kine v0.7.3 h1:YHj4DQmTGuF4GyriKyFx5gH9ywchCadHhl3Llj5oyuw= github.com/k3s-io/kine v0.7.3/go.mod h1:tksdHCn3Vof8ZKHd+QJkLRi4LbyQglKBrokaBBrHIcY= github.com/k3s-io/kubernetes v1.22.1-k3s1 h1:evi+JkMnC0HDEJ8A7aLqPKZ+0cP/CK6udFquf7KVq1I= @@ -643,9 +627,6 @@ github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= -github.com/knative/build v0.6.0/go.mod h1:/sU74ZQkwlYA5FwYDJhYTy61i/Kn+5eWfln2jDbw3Qo= -github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod h1:7Ijfhw7rfB+H9VtosIsDYvZQ+qYTz7auK3fHW/5z4ww= -github.com/knative/serving v0.6.1/go.mod h1:ljvMfwQy2qanaM/8xnBSK4Mz3Vv2NawC2fo5kFRJS1A= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -669,7 +650,6 @@ github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -677,7 +657,6 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -745,7 +724,6 @@ github.com/moby/vpnkit v0.5.0/go.mod h1:KyjUrL9cb6ZSNNAUwZfqRjhwwgJ3BJN+kXh0t43W github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -793,7 +771,6 @@ github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= @@ -828,7 +805,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -868,23 +844,16 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= -github.com/rancher/dynamiclistener v0.2.3 h1:FHn0Gkx+kIUqsFs3zMMR2QC9ufH/AoBLqO5zH5hbtqw= -github.com/rancher/dynamiclistener v0.2.3/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU= +github.com/rancher/dynamiclistener v0.2.6 h1:qcNhQQOidheum5K6mtLxDTJQMTWKm1zm/PjZ5x0xV7A= +github.com/rancher/dynamiclistener v0.2.6/go.mod h1:iXFvJLvLjmTzEJBrLFZl9UaMfDLOhv6fHp9fHQRlHGg= github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 h1:NxR8Fh0eE7/5/5Zvlog9B5NVjWKqBSb1WYMUF7/IE5c= github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08/go.mod h1:9qZd/S8DqWzfKtjKGgSoHqGEByYmUE3qRaBaaAHwfEM= -github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U= github.com/rancher/remotedialer v0.2.0 h1:xD7t3K6JYwTdAsxmGtTHQMkEkFgKouQ1foLxVW424Dc= github.com/rancher/remotedialer v0.2.0/go.mod h1:tkU8ZvrR5lRgaKWaX71nAy6daeqvPFx/lJEnbW7tXSI= github.com/rancher/wharfie v0.3.4 h1:wVqFW1cyRA20zY90Z56VrjG0lWg3oFmf/4ryr5Dkkis= github.com/rancher/wharfie v0.3.4/go.mod h1:cb8mSczpmw7ItbPF3K1W7crWuJLVdyV49sZZuaY4BS8= -github.com/rancher/wrangler v0.1.4/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE= -github.com/rancher/wrangler v0.6.0/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4= -github.com/rancher/wrangler v0.6.1/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4= -github.com/rancher/wrangler v0.8.3 h1:m3d5ChOQj2Pdozy6nkGiSzAgQxlQlXRis2zSRwaO83k= -github.com/rancher/wrangler v0.8.3/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY= -github.com/rancher/wrangler-api v0.2.0/go.mod h1:zTPdNLZO07KvRaVOx6XQbKBSV55Fnn4s7nqmrMPJqd8= -github.com/rancher/wrangler-api v0.6.0 h1:d/b0AkgZ+x41EYLIcUJiogtU3Y11Mqss2zr9VEKycRk= -github.com/rancher/wrangler-api v0.6.0/go.mod h1:RbuDkPNHhxcXuwAbLVvEAhH+UPAh+MIkpEd2fcGc0MM= +github.com/rancher/wrangler v0.8.5 h1:aHUVvJrOhD6CGrAELWKDpo1MBDC8vKtEQZvjMPnw2cs= +github.com/rancher/wrangler v0.8.5/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= @@ -957,7 +926,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -972,7 +940,6 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs= github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tektoncd/pipeline v0.4.0/go.mod h1:IZzJdiX9EqEMuUcgdnElozdYYRh0/ZRC+NKMLj1K3Yw= github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1122,7 +1089,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= @@ -1145,7 +1111,6 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1167,7 +1132,6 @@ golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1187,7 +1151,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1315,14 +1278,11 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 h1:gmJCKidOfjKDUHF1jjke+I+2iQIyE3HNNxu2OKO/FUI= inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252/go.mod h1:zq+R+tLcdHugi7Jt+FtIQY6m6wtX34lr2CdQVH2fhW0= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -1332,11 +1292,9 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod h1:iU+ZGYsNlvU9XKUSso6SQfKTCCw7lFduMZy26Mgr2Fw= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/system-validators v1.5.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= -k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= @@ -1363,8 +1321,6 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcL sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= sigs.k8s.io/kustomize/kyaml v0.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA= sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= -sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65 h1:xJNnO2qzHtgVCSPoGkkltSpyEX7D7IJw1TmbE3G/7lY= -sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= diff --git a/pkg/apiaddresses/controller.go b/pkg/apiaddresses/controller.go index 79613a243d..b1671761ad 100644 --- a/pkg/apiaddresses/controller.go +++ b/pkg/apiaddresses/controller.go @@ -9,7 +9,7 @@ import ( "github.com/rancher/k3s/pkg/etcd" "github.com/rancher/k3s/pkg/util" "github.com/rancher/k3s/pkg/version" - controllerv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" clientv3 "go.etcd.io/etcd/client/v3" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cluster/https.go b/pkg/cluster/https.go index bc1bad3db6..dc4a55af9b 100644 --- a/pkg/cluster/https.go +++ b/pkg/cluster/https.go @@ -17,7 +17,7 @@ import ( "github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/etcd" "github.com/rancher/k3s/pkg/version" - "github.com/rancher/wrangler-api/pkg/generated/controllers/core" + "github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go index 66af50f908..d3067cd15a 100644 --- a/pkg/codegen/main.go +++ b/pkg/codegen/main.go @@ -75,7 +75,8 @@ func main() { Types: []interface{}{ v1.Addon{}, }, - GenerateTypes: true, + GenerateTypes: true, + GenerateClients: true, }, }, }) diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go index 71db71cc0e..5eab7b27be 100644 --- a/pkg/daemons/config/types.go +++ b/pkg/daemons/config/types.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/k3s-io/kine/pkg/endpoint" - "github.com/rancher/wrangler-api/pkg/generated/controllers/core" + "github.com/rancher/wrangler/pkg/generated/controllers/core" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/authentication/authenticator" ) diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index b7ac28fa30..80838cc39a 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -18,7 +18,7 @@ import ( "github.com/rancher/k3s/pkg/daemons/executor" util2 "github.com/rancher/k3s/pkg/util" "github.com/rancher/k3s/pkg/version" - "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac" + "github.com/rancher/wrangler/pkg/generated/controllers/rbac" "github.com/sirupsen/logrus" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/etcd/controller.go b/pkg/etcd/controller.go index 81f46a69c8..02ac024f37 100644 --- a/pkg/etcd/controller.go +++ b/pkg/etcd/controller.go @@ -5,7 +5,7 @@ import ( "os" "time" - controllerv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/k3s.cattle.io/factory.go b/pkg/generated/controllers/k3s.cattle.io/factory.go index 9191cb0d80..f5c93e2351 100644 --- a/pkg/generated/controllers/k3s.cattle.io/factory.go +++ b/pkg/generated/controllers/k3s.cattle.io/factory.go @@ -19,28 +19,12 @@ limitations under the License. package k3s import ( - "context" - "time" - - clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned" - scheme "github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme" - informers "github.com/rancher/k3s/pkg/generated/informers/externalversions" "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" ) -func init() { - scheme.AddToScheme(schemes.All) -} - type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int + *generic.Factory } func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { @@ -61,66 +45,23 @@ func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (* }) } -type FactoryOptions struct { - Namespace string - Resync time.Duration -} +type FactoryOptions = generic.FactoryOptions func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) + return f } func (c *Factory) K3s() Interface { - return New(c.controllerManager, c.informerFactory.K3s(), c.clientset) + return New(c.ControllerFactory()) } diff --git a/pkg/generated/controllers/k3s.cattle.io/interface.go b/pkg/generated/controllers/k3s.cattle.io/interface.go index 201695983c..d327e83d26 100644 --- a/pkg/generated/controllers/k3s.cattle.io/interface.go +++ b/pkg/generated/controllers/k3s.cattle.io/interface.go @@ -19,10 +19,8 @@ limitations under the License. package k3s import ( - clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned" v1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1" - informers "github.com/rancher/k3s/pkg/generated/informers/externalversions/k3s.cattle.io" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.K3sV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/pkg/generated/controllers/k3s.cattle.io/v1/addon.go b/pkg/generated/controllers/k3s.cattle.io/v1/addon.go index 70821f25b4..bc0250615a 100644 --- a/pkg/generated/controllers/k3s.cattle.io/v1/addon.go +++ b/pkg/generated/controllers/k3s.cattle.io/v1/addon.go @@ -23,9 +23,8 @@ import ( "time" v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1" - informers "github.com/rancher/k3s/pkg/generated/informers/externalversions/k3s.cattle.io/v1" - listers "github.com/rancher/k3s/pkg/generated/listers/k3s.cattle.io/v1" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -78,18 +77,22 @@ type AddonCache interface { type AddonIndexer func(obj *v1.Addon) ([]string, error) type addonController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.AddonsGetter - informer informers.AddonInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewAddonController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.AddonsGetter, informer informers.AddonInformer) AddonController { +func NewAddonController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) AddonController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &addonController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateAddonDeepCopyOnChange(client AddonClient, obj *v1.Addon, handler func } func (c *addonController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *addonController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *addonController) OnChange(ctx context.Context, name string, sync AddonHandler) { @@ -149,20 +151,19 @@ func (c *addonController) OnChange(ctx context.Context, name string, sync AddonH } func (c *addonController) OnRemove(ctx context.Context, name string, sync AddonHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromAddonHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromAddonHandlerToHandler(sync))) } func (c *addonController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *addonController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *addonController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *addonController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *addonController) GroupVersionKind() schema.GroupVersionKind { func (c *addonController) Cache() AddonCache { return &addonCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *addonController) Create(obj *v1.Addon) (*v1.Addon, error) { - return c.clientGetter.Addons(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Addon{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *addonController) Update(obj *v1.Addon) (*v1.Addon, error) { - return c.clientGetter.Addons(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Addon{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *addonController) UpdateStatus(obj *v1.Addon) (*v1.Addon, error) { - return c.clientGetter.Addons(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Addon{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *addonController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Addons(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *addonController) Get(namespace, name string, options metav1.GetOptions) (*v1.Addon, error) { - return c.clientGetter.Addons(namespace).Get(context.TODO(), name, options) + result := &v1.Addon{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *addonController) List(namespace string, opts metav1.ListOptions) (*v1.AddonList, error) { - return c.clientGetter.Addons(namespace).List(context.TODO(), opts) + result := &v1.AddonList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *addonController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Addons(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *addonController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Addon, err error) { - return c.clientGetter.Addons(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *addonController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Addon, error) { + result := &v1.Addon{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type addonCache struct { - lister listers.AddonLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *addonCache) Get(namespace, name string) (*v1.Addon, error) { - return c.lister.Addons(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Addon), nil } -func (c *addonCache) List(namespace string, selector labels.Selector) ([]*v1.Addon, error) { - return c.lister.Addons(namespace).List(selector) +func (c *addonCache) List(namespace string, selector labels.Selector) (ret []*v1.Addon, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Addon)) + }) + + return ret, err } func (c *addonCache) AddIndexer(indexName string, indexer AddonIndexer) { @@ -299,12 +318,20 @@ func (a *addonStatusHandler) sync(key string, obj *v1.Addon) (*v1.Addon, error) } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *addonGeneratingHandler) Remove(key string, obj *v1.Addon) (*v1.Addon, e } func (a *addonGeneratingHandler) Handle(obj *v1.Addon, status v1.AddonStatus) (v1.AddonStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.AddonGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/pkg/generated/controllers/k3s.cattle.io/v1/interface.go b/pkg/generated/controllers/k3s.cattle.io/v1/interface.go index 89a3e7a345..a8b64d3886 100644 --- a/pkg/generated/controllers/k3s.cattle.io/v1/interface.go +++ b/pkg/generated/controllers/k3s.cattle.io/v1/interface.go @@ -20,30 +20,29 @@ package v1 import ( v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1" - informers "github.com/rancher/k3s/pkg/generated/informers/externalversions/k3s.cattle.io/v1" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" + "k8s.io/apimachinery/pkg/runtime/schema" ) +func init() { + schemes.Register(v1.AddToScheme) +} + type Interface interface { Addon() AddonController } -func New(controllerManager *generic.ControllerManager, client clientset.K3sV1Interface, - informers informers.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, + controllerFactory: controllerFactory, } } type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.K3sV1Interface + controllerFactory controller.SharedControllerFactory } func (c *version) Addon() AddonController { - return NewAddonController(v1.SchemeGroupVersion.WithKind("Addon"), c.controllerManager, c.client, c.informers.Addons()) + return NewAddonController(schema.GroupVersionKind{Group: "k3s.cattle.io", Version: "v1", Kind: "Addon"}, "addons", true, c.controllerFactory) } diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go deleted file mode 100644 index 2b1d5c3f9f..0000000000 --- a/pkg/generated/informers/externalversions/factory.go +++ /dev/null @@ -1,180 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package externalversions - -import ( - reflect "reflect" - sync "sync" - time "time" - - versioned "github.com/rancher/k3s/pkg/generated/clientset/versioned" - internalinterfaces "github.com/rancher/k3s/pkg/generated/informers/externalversions/internalinterfaces" - k3scattleio "github.com/rancher/k3s/pkg/generated/informers/externalversions/k3s.cattle.io" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" -) - -// SharedInformerOption defines the functional option type for SharedInformerFactory. -type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory - -type sharedInformerFactory struct { - client versioned.Interface - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc - lock sync.Mutex - defaultResync time.Duration - customResync map[reflect.Type]time.Duration - - informers map[reflect.Type]cache.SharedIndexInformer - // startedInformers is used for tracking which informers have been started. - // This allows Start() to be called multiple times safely. - startedInformers map[reflect.Type]bool -} - -// WithCustomResyncConfig sets a custom resync period for the specified informer types. -func WithCustomResyncConfig(resyncConfig map[v1.Object]time.Duration) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - for k, v := range resyncConfig { - factory.customResync[reflect.TypeOf(k)] = v - } - return factory - } -} - -// WithTweakListOptions sets a custom filter on all listers of the configured SharedInformerFactory. -func WithTweakListOptions(tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.tweakListOptions = tweakListOptions - return factory - } -} - -// WithNamespace limits the SharedInformerFactory to the specified namespace. -func WithNamespace(namespace string) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.namespace = namespace - return factory - } -} - -// NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces. -func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { - return NewSharedInformerFactoryWithOptions(client, defaultResync) -} - -// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. -// Listers obtained via this SharedInformerFactory will be subject to the same filters -// as specified here. -// Deprecated: Please use NewSharedInformerFactoryWithOptions instead -func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { - return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions)) -} - -// NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options. -func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory { - factory := &sharedInformerFactory{ - client: client, - namespace: v1.NamespaceAll, - defaultResync: defaultResync, - informers: make(map[reflect.Type]cache.SharedIndexInformer), - startedInformers: make(map[reflect.Type]bool), - customResync: make(map[reflect.Type]time.Duration), - } - - // Apply all options - for _, opt := range options { - factory = opt(factory) - } - - return factory -} - -// Start initializes all requested informers. -func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) { - f.lock.Lock() - defer f.lock.Unlock() - - for informerType, informer := range f.informers { - if !f.startedInformers[informerType] { - go informer.Run(stopCh) - f.startedInformers[informerType] = true - } - } -} - -// WaitForCacheSync waits for all started informers' cache were synced. -func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool { - informers := func() map[reflect.Type]cache.SharedIndexInformer { - f.lock.Lock() - defer f.lock.Unlock() - - informers := map[reflect.Type]cache.SharedIndexInformer{} - for informerType, informer := range f.informers { - if f.startedInformers[informerType] { - informers[informerType] = informer - } - } - return informers - }() - - res := map[reflect.Type]bool{} - for informType, informer := range informers { - res[informType] = cache.WaitForCacheSync(stopCh, informer.HasSynced) - } - return res -} - -// InternalInformerFor returns the SharedIndexInformer for obj using an internal -// client. -func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { - f.lock.Lock() - defer f.lock.Unlock() - - informerType := reflect.TypeOf(obj) - informer, exists := f.informers[informerType] - if exists { - return informer - } - - resyncPeriod, exists := f.customResync[informerType] - if !exists { - resyncPeriod = f.defaultResync - } - - informer = newFunc(f.client, resyncPeriod) - f.informers[informerType] = informer - - return informer -} - -// SharedInformerFactory provides shared informers for resources in all known -// API group versions. -type SharedInformerFactory interface { - internalinterfaces.SharedInformerFactory - ForResource(resource schema.GroupVersionResource) (GenericInformer, error) - WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - - K3s() k3scattleio.Interface -} - -func (f *sharedInformerFactory) K3s() k3scattleio.Interface { - return k3scattleio.New(f, f.namespace, f.tweakListOptions) -} diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go deleted file mode 100644 index c7c1ef8605..0000000000 --- a/pkg/generated/informers/externalversions/generic.go +++ /dev/null @@ -1,62 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package externalversions - -import ( - "fmt" - - v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" -) - -// GenericInformer is type of SharedIndexInformer which will locate and delegate to other -// sharedInformers based on type -type GenericInformer interface { - Informer() cache.SharedIndexInformer - Lister() cache.GenericLister -} - -type genericInformer struct { - informer cache.SharedIndexInformer - resource schema.GroupResource -} - -// Informer returns the SharedIndexInformer. -func (f *genericInformer) Informer() cache.SharedIndexInformer { - return f.informer -} - -// Lister returns the GenericLister. -func (f *genericInformer) Lister() cache.GenericLister { - return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource) -} - -// ForResource gives generic access to a shared informer of the matching type -// TODO extend this to unknown resources with a client pool -func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { - switch resource { - // Group=k3s.cattle.io, Version=v1 - case v1.SchemeGroupVersion.WithResource("addons"): - return &genericInformer{resource: resource.GroupResource(), informer: f.K3s().V1().Addons().Informer()}, nil - - } - - return nil, fmt.Errorf("no informer found for %v", resource) -} diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go deleted file mode 100644 index 70fe8bf9b4..0000000000 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package internalinterfaces - -import ( - time "time" - - versioned "github.com/rancher/k3s/pkg/generated/clientset/versioned" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - cache "k8s.io/client-go/tools/cache" -) - -// NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. -type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer - -// SharedInformerFactory a small interface to allow for adding an informer without an import cycle -type SharedInformerFactory interface { - Start(stopCh <-chan struct{}) - InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer -} - -// TweakListOptionsFunc is a function that transforms a v1.ListOptions. -type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/generated/informers/externalversions/k3s.cattle.io/interface.go b/pkg/generated/informers/externalversions/k3s.cattle.io/interface.go deleted file mode 100644 index 8bf844775c..0000000000 --- a/pkg/generated/informers/externalversions/k3s.cattle.io/interface.go +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package k3s - -import ( - internalinterfaces "github.com/rancher/k3s/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/rancher/k3s/pkg/generated/informers/externalversions/k3s.cattle.io/v1" -) - -// Interface provides access to each of this group's versions. -type Interface interface { - // V1 provides access to shared informers for resources in V1. - V1() v1.Interface -} - -type group struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// V1 returns a new v1.Interface. -func (g *group) V1() v1.Interface { - return v1.New(g.factory, g.namespace, g.tweakListOptions) -} diff --git a/pkg/generated/informers/externalversions/k3s.cattle.io/v1/addon.go b/pkg/generated/informers/externalversions/k3s.cattle.io/v1/addon.go deleted file mode 100644 index 34fa427674..0000000000 --- a/pkg/generated/informers/externalversions/k3s.cattle.io/v1/addon.go +++ /dev/null @@ -1,90 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "context" - time "time" - - k3scattleiov1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - versioned "github.com/rancher/k3s/pkg/generated/clientset/versioned" - internalinterfaces "github.com/rancher/k3s/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/rancher/k3s/pkg/generated/listers/k3s.cattle.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// AddonInformer provides access to a shared informer and lister for -// Addons. -type AddonInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1.AddonLister -} - -type addonInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewAddonInformer constructs a new informer for Addon type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewAddonInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredAddonInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredAddonInformer constructs a new informer for Addon type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredAddonInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K3sV1().Addons(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K3sV1().Addons(namespace).Watch(context.TODO(), options) - }, - }, - &k3scattleiov1.Addon{}, - resyncPeriod, - indexers, - ) -} - -func (f *addonInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredAddonInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *addonInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&k3scattleiov1.Addon{}, f.defaultInformer) -} - -func (f *addonInformer) Lister() v1.AddonLister { - return v1.NewAddonLister(f.Informer().GetIndexer()) -} diff --git a/pkg/generated/informers/externalversions/k3s.cattle.io/v1/interface.go b/pkg/generated/informers/externalversions/k3s.cattle.io/v1/interface.go deleted file mode 100644 index 855c7c0b37..0000000000 --- a/pkg/generated/informers/externalversions/k3s.cattle.io/v1/interface.go +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - internalinterfaces "github.com/rancher/k3s/pkg/generated/informers/externalversions/internalinterfaces" -) - -// Interface provides access to all the informers in this group version. -type Interface interface { - // Addons returns a AddonInformer. - Addons() AddonInformer -} - -type version struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// Addons returns a AddonInformer. -func (v *version) Addons() AddonInformer { - return &addonInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} diff --git a/pkg/generated/listers/k3s.cattle.io/v1/addon.go b/pkg/generated/listers/k3s.cattle.io/v1/addon.go deleted file mode 100644 index a08fb76429..0000000000 --- a/pkg/generated/listers/k3s.cattle.io/v1/addon.go +++ /dev/null @@ -1,99 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// AddonLister helps list Addons. -// All objects returned here must be treated as read-only. -type AddonLister interface { - // List lists all Addons in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Addon, err error) - // Addons returns an object that can list and get Addons. - Addons(namespace string) AddonNamespaceLister - AddonListerExpansion -} - -// addonLister implements the AddonLister interface. -type addonLister struct { - indexer cache.Indexer -} - -// NewAddonLister returns a new AddonLister. -func NewAddonLister(indexer cache.Indexer) AddonLister { - return &addonLister{indexer: indexer} -} - -// List lists all Addons in the indexer. -func (s *addonLister) List(selector labels.Selector) (ret []*v1.Addon, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1.Addon)) - }) - return ret, err -} - -// Addons returns an object that can list and get Addons. -func (s *addonLister) Addons(namespace string) AddonNamespaceLister { - return addonNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// AddonNamespaceLister helps list and get Addons. -// All objects returned here must be treated as read-only. -type AddonNamespaceLister interface { - // List lists all Addons in the indexer for a given namespace. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Addon, err error) - // Get retrieves the Addon from the indexer for a given namespace and name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1.Addon, error) - AddonNamespaceListerExpansion -} - -// addonNamespaceLister implements the AddonNamespaceLister -// interface. -type addonNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all Addons in the indexer for a given namespace. -func (s addonNamespaceLister) List(selector labels.Selector) (ret []*v1.Addon, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1.Addon)) - }) - return ret, err -} - -// Get retrieves the Addon from the indexer for a given namespace and name. -func (s addonNamespaceLister) Get(name string) (*v1.Addon, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1.Resource("addon"), name) - } - return obj.(*v1.Addon), nil -} diff --git a/pkg/generated/listers/k3s.cattle.io/v1/expansion_generated.go b/pkg/generated/listers/k3s.cattle.io/v1/expansion_generated.go deleted file mode 100644 index b4881de9ef..0000000000 --- a/pkg/generated/listers/k3s.cattle.io/v1/expansion_generated.go +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -// AddonListerExpansion allows custom methods to be added to -// AddonLister. -type AddonListerExpansion interface{} - -// AddonNamespaceListerExpansion allows custom methods to be added to -// AddonNamespaceLister. -type AddonNamespaceListerExpansion interface{} diff --git a/pkg/node/controller.go b/pkg/node/controller.go index c32bdc65bb..0ec5086d94 100644 --- a/pkg/node/controller.go +++ b/pkg/node/controller.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rancher/k3s/pkg/nodepassword" - coreclient "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" core "k8s.io/api/core/v1" ) diff --git a/pkg/nodepassword/nodepassword.go b/pkg/nodepassword/nodepassword.go index 91e0811c50..ddec742d12 100644 --- a/pkg/nodepassword/nodepassword.go +++ b/pkg/nodepassword/nodepassword.go @@ -10,7 +10,7 @@ import ( "github.com/rancher/k3s/pkg/authenticator/hash" "github.com/rancher/k3s/pkg/passwd" "github.com/rancher/k3s/pkg/version" - coreclient "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/rootlessports/controller.go b/pkg/rootlessports/controller.go index 1ca441e92e..7b74740139 100644 --- a/pkg/rootlessports/controller.go +++ b/pkg/rootlessports/controller.go @@ -7,7 +7,7 @@ import ( "time" "github.com/rancher/k3s/pkg/rootless" - coreClients "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + coreClients "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/rootless-containers/rootlesskit/pkg/api/client" "github.com/rootless-containers/rootlesskit/pkg/port" "github.com/sirupsen/logrus" diff --git a/pkg/rootlessports/controller_windows.go b/pkg/rootlessports/controller_windows.go index 7b88d2e1e8..56d9982e58 100644 --- a/pkg/rootlessports/controller_windows.go +++ b/pkg/rootlessports/controller_windows.go @@ -3,7 +3,7 @@ package rootlessports import ( "context" - coreClients "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + coreClients "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" ) func Register(ctx context.Context, serviceController coreClients.ServiceController, enabled bool, httpsPort int) error { diff --git a/pkg/server/context.go b/pkg/server/context.go index 13ab286635..ca776d6a1d 100644 --- a/pkg/server/context.go +++ b/pkg/server/context.go @@ -11,10 +11,10 @@ import ( "github.com/rancher/k3s/pkg/deploy" "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io" "github.com/rancher/k3s/pkg/version" - "github.com/rancher/wrangler-api/pkg/generated/controllers/apps" - "github.com/rancher/wrangler-api/pkg/generated/controllers/batch" - "github.com/rancher/wrangler-api/pkg/generated/controllers/core" - "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac" + "github.com/rancher/wrangler/pkg/generated/controllers/apps" + "github.com/rancher/wrangler/pkg/generated/controllers/batch" + "github.com/rancher/wrangler/pkg/generated/controllers/core" + "github.com/rancher/wrangler/pkg/generated/controllers/rbac" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/crd" "github.com/rancher/wrangler/pkg/start" diff --git a/pkg/server/router.go b/pkg/server/router.go index 15ac798da4..cce0aca25b 100644 --- a/pkg/server/router.go +++ b/pkg/server/router.go @@ -23,7 +23,7 @@ import ( "github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/nodepassword" "github.com/rancher/k3s/pkg/version" - coreclient "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/pkg/server/server.go b/pkg/server/server.go index b565ce59c0..a99aa7407a 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -29,7 +29,7 @@ import ( "github.com/rancher/k3s/pkg/static" "github.com/rancher/k3s/pkg/util" "github.com/rancher/k3s/pkg/version" - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/rancher/wrangler/pkg/leader" "github.com/rancher/wrangler/pkg/resolvehome" "github.com/sirupsen/logrus" diff --git a/pkg/servicelb/controller.go b/pkg/servicelb/controller.go index 983b86aa68..cf9a3e5ac0 100644 --- a/pkg/servicelb/controller.go +++ b/pkg/servicelb/controller.go @@ -7,8 +7,8 @@ import ( "strconv" "github.com/rancher/k3s/pkg/version" - appclient "github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1" - coreclient "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + appclient "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1" + coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/objectset" diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go deleted file mode 100644 index fbc977bb15..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go +++ /dev/null @@ -1,97 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package versioned - -import ( - "fmt" - - helmv1 "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - discovery "k8s.io/client-go/discovery" - rest "k8s.io/client-go/rest" - flowcontrol "k8s.io/client-go/util/flowcontrol" -) - -type Interface interface { - Discovery() discovery.DiscoveryInterface - HelmV1() helmv1.HelmV1Interface -} - -// Clientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. -type Clientset struct { - *discovery.DiscoveryClient - helmV1 *helmv1.HelmV1Client -} - -// HelmV1 retrieves the HelmV1Client -func (c *Clientset) HelmV1() helmv1.HelmV1Interface { - return c.helmV1 -} - -// Discovery retrieves the DiscoveryClient -func (c *Clientset) Discovery() discovery.DiscoveryInterface { - if c == nil { - return nil - } - return c.DiscoveryClient -} - -// NewForConfig creates a new Clientset for the given config. -// If config's RateLimiter is not set and QPS and Burst are acceptable, -// NewForConfig will generate a rate-limiter in configShallowCopy. -func NewForConfig(c *rest.Config) (*Clientset, error) { - configShallowCopy := *c - if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { - if configShallowCopy.Burst <= 0 { - return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0") - } - configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) - } - var cs Clientset - var err error - cs.helmV1, err = helmv1.NewForConfig(&configShallowCopy) - if err != nil { - return nil, err - } - - cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) - if err != nil { - return nil, err - } - return &cs, nil -} - -// NewForConfigOrDie creates a new Clientset for the given config and -// panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *Clientset { - var cs Clientset - cs.helmV1 = helmv1.NewForConfigOrDie(c) - - cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) - return &cs -} - -// New creates a new Clientset for the given RESTClient. -func New(c rest.Interface) *Clientset { - var cs Clientset - cs.helmV1 = helmv1.New(c) - - cs.DiscoveryClient = discovery.NewDiscoveryClient(c) - return &cs -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go deleted file mode 100644 index 78439a3c14..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -// This package has the automatically generated clientset. -package versioned diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go deleted file mode 100644 index 6bd144ec29..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -// This package contains the scheme of the automatically generated clientset. -package scheme diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go deleted file mode 100644 index 0f3e2263b7..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go +++ /dev/null @@ -1,56 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package scheme - -import ( - helmv1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - serializer "k8s.io/apimachinery/pkg/runtime/serializer" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" -) - -var Scheme = runtime.NewScheme() -var Codecs = serializer.NewCodecFactory(Scheme) -var ParameterCodec = runtime.NewParameterCodec(Scheme) -var localSchemeBuilder = runtime.SchemeBuilder{ - helmv1.AddToScheme, -} - -// AddToScheme adds all types of this clientset into the given scheme. This allows composition -// of clientsets, like in: -// -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) -// -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) -// -// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types -// correctly. -var AddToScheme = localSchemeBuilder.AddToScheme - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - utilruntime.Must(AddToScheme(Scheme)) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go deleted file mode 100644 index 761c8c49d4..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -// This package has the automatically generated typed clients. -package v1 diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go deleted file mode 100644 index 81557737a1..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -type HelmChartExpansion interface{} - -type HelmChartConfigExpansion interface{} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go deleted file mode 100644 index a45e3f55a2..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go +++ /dev/null @@ -1,94 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" -) - -type HelmV1Interface interface { - RESTClient() rest.Interface - HelmChartsGetter - HelmChartConfigsGetter -} - -// HelmV1Client is used to interact with features provided by the helm.cattle.io group. -type HelmV1Client struct { - restClient rest.Interface -} - -func (c *HelmV1Client) HelmCharts(namespace string) HelmChartInterface { - return newHelmCharts(c, namespace) -} - -func (c *HelmV1Client) HelmChartConfigs(namespace string) HelmChartConfigInterface { - return newHelmChartConfigs(c, namespace) -} - -// NewForConfig creates a new HelmV1Client for the given config. -func NewForConfig(c *rest.Config) (*HelmV1Client, error) { - config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } - client, err := rest.RESTClientFor(&config) - if err != nil { - return nil, err - } - return &HelmV1Client{client}, nil -} - -// NewForConfigOrDie creates a new HelmV1Client for the given config and -// panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *HelmV1Client { - client, err := NewForConfig(c) - if err != nil { - panic(err) - } - return client -} - -// New creates a new HelmV1Client for the given RESTClient. -func New(c rest.Interface) *HelmV1Client { - return &HelmV1Client{c} -} - -func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion - config.GroupVersion = &gv - config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() - - if config.UserAgent == "" { - config.UserAgent = rest.DefaultKubernetesUserAgent() - } - - return nil -} - -// RESTClient returns a RESTClient that is used to communicate -// with API server by this client implementation. -func (c *HelmV1Client) RESTClient() rest.Interface { - if c == nil { - return nil - } - return c.restClient -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go deleted file mode 100644 index b1e495463d..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go +++ /dev/null @@ -1,195 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "context" - "time" - - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// HelmChartsGetter has a method to return a HelmChartInterface. -// A group's client should implement this interface. -type HelmChartsGetter interface { - HelmCharts(namespace string) HelmChartInterface -} - -// HelmChartInterface has methods to work with HelmChart resources. -type HelmChartInterface interface { - Create(ctx context.Context, helmChart *v1.HelmChart, opts metav1.CreateOptions) (*v1.HelmChart, error) - Update(ctx context.Context, helmChart *v1.HelmChart, opts metav1.UpdateOptions) (*v1.HelmChart, error) - UpdateStatus(ctx context.Context, helmChart *v1.HelmChart, opts metav1.UpdateOptions) (*v1.HelmChart, error) - Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error - DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.HelmChart, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.HelmChartList, error) - Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HelmChart, err error) - HelmChartExpansion -} - -// helmCharts implements HelmChartInterface -type helmCharts struct { - client rest.Interface - ns string -} - -// newHelmCharts returns a HelmCharts -func newHelmCharts(c *HelmV1Client, namespace string) *helmCharts { - return &helmCharts{ - client: c.RESTClient(), - ns: namespace, - } -} - -// Get takes name of the helmChart, and returns the corresponding helmChart object, and an error if there is any. -func (c *helmCharts) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.HelmChart, err error) { - result = &v1.HelmChart{} - err = c.client.Get(). - Namespace(c.ns). - Resource("helmcharts"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(ctx). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of HelmCharts that match those selectors. -func (c *helmCharts) List(ctx context.Context, opts metav1.ListOptions) (result *v1.HelmChartList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1.HelmChartList{} - err = c.client.Get(). - Namespace(c.ns). - Resource("helmcharts"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(ctx). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested helmCharts. -func (c *helmCharts) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Namespace(c.ns). - Resource("helmcharts"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch(ctx) -} - -// Create takes the representation of a helmChart and creates it. Returns the server's representation of the helmChart, and an error, if there is any. -func (c *helmCharts) Create(ctx context.Context, helmChart *v1.HelmChart, opts metav1.CreateOptions) (result *v1.HelmChart, err error) { - result = &v1.HelmChart{} - err = c.client.Post(). - Namespace(c.ns). - Resource("helmcharts"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(helmChart). - Do(ctx). - Into(result) - return -} - -// Update takes the representation of a helmChart and updates it. Returns the server's representation of the helmChart, and an error, if there is any. -func (c *helmCharts) Update(ctx context.Context, helmChart *v1.HelmChart, opts metav1.UpdateOptions) (result *v1.HelmChart, err error) { - result = &v1.HelmChart{} - err = c.client.Put(). - Namespace(c.ns). - Resource("helmcharts"). - Name(helmChart.Name). - VersionedParams(&opts, scheme.ParameterCodec). - Body(helmChart). - Do(ctx). - Into(result) - return -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *helmCharts) UpdateStatus(ctx context.Context, helmChart *v1.HelmChart, opts metav1.UpdateOptions) (result *v1.HelmChart, err error) { - result = &v1.HelmChart{} - err = c.client.Put(). - Namespace(c.ns). - Resource("helmcharts"). - Name(helmChart.Name). - SubResource("status"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(helmChart). - Do(ctx). - Into(result) - return -} - -// Delete takes name of the helmChart and deletes it. Returns an error if one occurs. -func (c *helmCharts) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("helmcharts"). - Name(name). - Body(&opts). - Do(ctx). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *helmCharts) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - var timeout time.Duration - if listOpts.TimeoutSeconds != nil { - timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Namespace(c.ns). - Resource("helmcharts"). - VersionedParams(&listOpts, scheme.ParameterCodec). - Timeout(timeout). - Body(&opts). - Do(ctx). - Error() -} - -// Patch applies the patch and returns the patched helmChart. -func (c *helmCharts) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HelmChart, err error) { - result = &v1.HelmChart{} - err = c.client.Patch(pt). - Namespace(c.ns). - Resource("helmcharts"). - Name(name). - SubResource(subresources...). - VersionedParams(&opts, scheme.ParameterCodec). - Body(data). - Do(ctx). - Into(result) - return -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go deleted file mode 100644 index 4255a562f2..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go +++ /dev/null @@ -1,178 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "context" - "time" - - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// HelmChartConfigsGetter has a method to return a HelmChartConfigInterface. -// A group's client should implement this interface. -type HelmChartConfigsGetter interface { - HelmChartConfigs(namespace string) HelmChartConfigInterface -} - -// HelmChartConfigInterface has methods to work with HelmChartConfig resources. -type HelmChartConfigInterface interface { - Create(ctx context.Context, helmChartConfig *v1.HelmChartConfig, opts metav1.CreateOptions) (*v1.HelmChartConfig, error) - Update(ctx context.Context, helmChartConfig *v1.HelmChartConfig, opts metav1.UpdateOptions) (*v1.HelmChartConfig, error) - Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error - DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.HelmChartConfig, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.HelmChartConfigList, error) - Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HelmChartConfig, err error) - HelmChartConfigExpansion -} - -// helmChartConfigs implements HelmChartConfigInterface -type helmChartConfigs struct { - client rest.Interface - ns string -} - -// newHelmChartConfigs returns a HelmChartConfigs -func newHelmChartConfigs(c *HelmV1Client, namespace string) *helmChartConfigs { - return &helmChartConfigs{ - client: c.RESTClient(), - ns: namespace, - } -} - -// Get takes name of the helmChartConfig, and returns the corresponding helmChartConfig object, and an error if there is any. -func (c *helmChartConfigs) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.HelmChartConfig, err error) { - result = &v1.HelmChartConfig{} - err = c.client.Get(). - Namespace(c.ns). - Resource("helmchartconfigs"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(ctx). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of HelmChartConfigs that match those selectors. -func (c *helmChartConfigs) List(ctx context.Context, opts metav1.ListOptions) (result *v1.HelmChartConfigList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1.HelmChartConfigList{} - err = c.client.Get(). - Namespace(c.ns). - Resource("helmchartconfigs"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(ctx). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested helmChartConfigs. -func (c *helmChartConfigs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Namespace(c.ns). - Resource("helmchartconfigs"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch(ctx) -} - -// Create takes the representation of a helmChartConfig and creates it. Returns the server's representation of the helmChartConfig, and an error, if there is any. -func (c *helmChartConfigs) Create(ctx context.Context, helmChartConfig *v1.HelmChartConfig, opts metav1.CreateOptions) (result *v1.HelmChartConfig, err error) { - result = &v1.HelmChartConfig{} - err = c.client.Post(). - Namespace(c.ns). - Resource("helmchartconfigs"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(helmChartConfig). - Do(ctx). - Into(result) - return -} - -// Update takes the representation of a helmChartConfig and updates it. Returns the server's representation of the helmChartConfig, and an error, if there is any. -func (c *helmChartConfigs) Update(ctx context.Context, helmChartConfig *v1.HelmChartConfig, opts metav1.UpdateOptions) (result *v1.HelmChartConfig, err error) { - result = &v1.HelmChartConfig{} - err = c.client.Put(). - Namespace(c.ns). - Resource("helmchartconfigs"). - Name(helmChartConfig.Name). - VersionedParams(&opts, scheme.ParameterCodec). - Body(helmChartConfig). - Do(ctx). - Into(result) - return -} - -// Delete takes name of the helmChartConfig and deletes it. Returns an error if one occurs. -func (c *helmChartConfigs) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("helmchartconfigs"). - Name(name). - Body(&opts). - Do(ctx). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *helmChartConfigs) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - var timeout time.Duration - if listOpts.TimeoutSeconds != nil { - timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Namespace(c.ns). - Resource("helmchartconfigs"). - VersionedParams(&listOpts, scheme.ParameterCodec). - Timeout(timeout). - Body(&opts). - Do(ctx). - Error() -} - -// Patch applies the patch and returns the patched helmChartConfig. -func (c *helmChartConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HelmChartConfig, err error) { - result = &v1.HelmChartConfig{} - err = c.client.Patch(pt). - Namespace(c.ns). - Resource("helmchartconfigs"). - Name(name). - SubResource(subresources...). - VersionedParams(&opts, scheme.ParameterCodec). - Body(data). - Do(ctx). - Into(result) - return -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go index e3d11f22c0..a5fbac3083 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go @@ -19,28 +19,12 @@ limitations under the License. package helm import ( - "context" - "time" - - clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" - scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" - informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions" "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" ) -func init() { - scheme.AddToScheme(schemes.All) -} - type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int + *generic.Factory } func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { @@ -61,66 +45,23 @@ func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (* }) } -type FactoryOptions struct { - Namespace string - Resync time.Duration -} +type FactoryOptions = generic.FactoryOptions func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) + return f } func (c *Factory) Helm() Interface { - return New(c.controllerManager, c.informerFactory.Helm(), c.clientset) + return New(c.ControllerFactory()) } diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go index 9956ba4653..98b580076d 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go @@ -19,10 +19,8 @@ limitations under the License. package helm import ( - clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" v1 "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" - informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.HelmV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go index a4d266c582..0adc7347dc 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go @@ -23,9 +23,8 @@ import ( "time" v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - listers "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -78,18 +77,22 @@ type HelmChartCache interface { type HelmChartIndexer func(obj *v1.HelmChart) ([]string, error) type helmChartController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.HelmChartsGetter - informer informers.HelmChartInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewHelmChartController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.HelmChartsGetter, informer informers.HelmChartInformer) HelmChartController { +func NewHelmChartController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) HelmChartController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &helmChartController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateHelmChartDeepCopyOnChange(client HelmChartClient, obj *v1.HelmChart, } func (c *helmChartController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *helmChartController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *helmChartController) OnChange(ctx context.Context, name string, sync HelmChartHandler) { @@ -149,20 +151,19 @@ func (c *helmChartController) OnChange(ctx context.Context, name string, sync He } func (c *helmChartController) OnRemove(ctx context.Context, name string, sync HelmChartHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromHelmChartHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromHelmChartHandlerToHandler(sync))) } func (c *helmChartController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *helmChartController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *helmChartController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *helmChartController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *helmChartController) GroupVersionKind() schema.GroupVersionKind { func (c *helmChartController) Cache() HelmChartCache { return &helmChartCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *helmChartController) Create(obj *v1.HelmChart) (*v1.HelmChart, error) { - return c.clientGetter.HelmCharts(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.HelmChart{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *helmChartController) Update(obj *v1.HelmChart) (*v1.HelmChart, error) { - return c.clientGetter.HelmCharts(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.HelmChart{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *helmChartController) UpdateStatus(obj *v1.HelmChart) (*v1.HelmChart, error) { - return c.clientGetter.HelmCharts(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.HelmChart{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *helmChartController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.HelmCharts(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *helmChartController) Get(namespace, name string, options metav1.GetOptions) (*v1.HelmChart, error) { - return c.clientGetter.HelmCharts(namespace).Get(context.TODO(), name, options) + result := &v1.HelmChart{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *helmChartController) List(namespace string, opts metav1.ListOptions) (*v1.HelmChartList, error) { - return c.clientGetter.HelmCharts(namespace).List(context.TODO(), opts) + result := &v1.HelmChartList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *helmChartController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.HelmCharts(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *helmChartController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HelmChart, err error) { - return c.clientGetter.HelmCharts(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *helmChartController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.HelmChart, error) { + result := &v1.HelmChart{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type helmChartCache struct { - lister listers.HelmChartLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *helmChartCache) Get(namespace, name string) (*v1.HelmChart, error) { - return c.lister.HelmCharts(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.HelmChart), nil } -func (c *helmChartCache) List(namespace string, selector labels.Selector) ([]*v1.HelmChart, error) { - return c.lister.HelmCharts(namespace).List(selector) +func (c *helmChartCache) List(namespace string, selector labels.Selector) (ret []*v1.HelmChart, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.HelmChart)) + }) + + return ret, err } func (c *helmChartCache) AddIndexer(indexName string, indexer HelmChartIndexer) { @@ -299,12 +318,20 @@ func (a *helmChartStatusHandler) sync(key string, obj *v1.HelmChart) (*v1.HelmCh } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *helmChartGeneratingHandler) Remove(key string, obj *v1.HelmChart) (*v1. } func (a *helmChartGeneratingHandler) Handle(obj *v1.HelmChart, status v1.HelmChartStatus) (v1.HelmChartStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.HelmChartGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go index 9d120a1399..73f1d97cf0 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go @@ -23,11 +23,11 @@ import ( "time" v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - listers "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -74,18 +74,22 @@ type HelmChartConfigCache interface { type HelmChartConfigIndexer func(obj *v1.HelmChartConfig) ([]string, error) type helmChartConfigController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.HelmChartConfigsGetter - informer informers.HelmChartConfigInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewHelmChartConfigController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.HelmChartConfigsGetter, informer informers.HelmChartConfigInformer) HelmChartConfigController { +func NewHelmChartConfigController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) HelmChartConfigController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &helmChartConfigController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateHelmChartConfigDeepCopyOnChange(client HelmChartConfigClient, obj *v1 } func (c *helmChartConfigController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *helmChartConfigController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *helmChartConfigController) OnChange(ctx context.Context, name string, sync HelmChartConfigHandler) { @@ -145,20 +148,19 @@ func (c *helmChartConfigController) OnChange(ctx context.Context, name string, s } func (c *helmChartConfigController) OnRemove(ctx context.Context, name string, sync HelmChartConfigHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromHelmChartConfigHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromHelmChartConfigHandlerToHandler(sync))) } func (c *helmChartConfigController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *helmChartConfigController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *helmChartConfigController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *helmChartConfigController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *helmChartConfigController) GroupVersionKind() schema.GroupVersionKind { func (c *helmChartConfigController) Cache() HelmChartConfigCache { return &helmChartConfigCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *helmChartConfigController) Create(obj *v1.HelmChartConfig) (*v1.HelmChartConfig, error) { - return c.clientGetter.HelmChartConfigs(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.HelmChartConfig{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *helmChartConfigController) Update(obj *v1.HelmChartConfig) (*v1.HelmChartConfig, error) { - return c.clientGetter.HelmChartConfigs(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.HelmChartConfig{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *helmChartConfigController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.HelmChartConfigs(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *helmChartConfigController) Get(namespace, name string, options metav1.GetOptions) (*v1.HelmChartConfig, error) { - return c.clientGetter.HelmChartConfigs(namespace).Get(context.TODO(), name, options) + result := &v1.HelmChartConfig{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *helmChartConfigController) List(namespace string, opts metav1.ListOptions) (*v1.HelmChartConfigList, error) { - return c.clientGetter.HelmChartConfigs(namespace).List(context.TODO(), opts) + result := &v1.HelmChartConfigList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *helmChartConfigController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.HelmChartConfigs(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *helmChartConfigController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HelmChartConfig, err error) { - return c.clientGetter.HelmChartConfigs(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *helmChartConfigController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.HelmChartConfig, error) { + result := &v1.HelmChartConfig{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type helmChartConfigCache struct { - lister listers.HelmChartConfigLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *helmChartConfigCache) Get(namespace, name string) (*v1.HelmChartConfig, error) { - return c.lister.HelmChartConfigs(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.HelmChartConfig), nil } -func (c *helmChartConfigCache) List(namespace string, selector labels.Selector) ([]*v1.HelmChartConfig, error) { - return c.lister.HelmChartConfigs(namespace).List(selector) +func (c *helmChartConfigCache) List(namespace string, selector labels.Selector) (ret []*v1.HelmChartConfig, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.HelmChartConfig)) + }) + + return ret, err } func (c *helmChartConfigCache) AddIndexer(indexName string, indexer HelmChartConfigIndexer) { diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go index d3decb6cd2..e1783f31c5 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go @@ -20,34 +20,33 @@ package v1 import ( v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" + "k8s.io/apimachinery/pkg/runtime/schema" ) +func init() { + schemes.Register(v1.AddToScheme) +} + type Interface interface { HelmChart() HelmChartController HelmChartConfig() HelmChartConfigController } -func New(controllerManager *generic.ControllerManager, client clientset.HelmV1Interface, - informers informers.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, + controllerFactory: controllerFactory, } } type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.HelmV1Interface + controllerFactory controller.SharedControllerFactory } func (c *version) HelmChart() HelmChartController { - return NewHelmChartController(v1.SchemeGroupVersion.WithKind("HelmChart"), c.controllerManager, c.client, c.informers.HelmCharts()) + return NewHelmChartController(schema.GroupVersionKind{Group: "helm.cattle.io", Version: "v1", Kind: "HelmChart"}, "helmcharts", true, c.controllerFactory) } func (c *version) HelmChartConfig() HelmChartConfigController { - return NewHelmChartConfigController(v1.SchemeGroupVersion.WithKind("HelmChartConfig"), c.controllerManager, c.client, c.informers.HelmChartConfigs()) + return NewHelmChartConfigController(schema.GroupVersionKind{Group: "helm.cattle.io", Version: "v1", Kind: "HelmChartConfig"}, "helmchartconfigs", true, c.controllerFactory) } diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go deleted file mode 100644 index cab6834c71..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go +++ /dev/null @@ -1,180 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package externalversions - -import ( - reflect "reflect" - sync "sync" - time "time" - - versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" - helmcattleio "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" - internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" -) - -// SharedInformerOption defines the functional option type for SharedInformerFactory. -type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory - -type sharedInformerFactory struct { - client versioned.Interface - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc - lock sync.Mutex - defaultResync time.Duration - customResync map[reflect.Type]time.Duration - - informers map[reflect.Type]cache.SharedIndexInformer - // startedInformers is used for tracking which informers have been started. - // This allows Start() to be called multiple times safely. - startedInformers map[reflect.Type]bool -} - -// WithCustomResyncConfig sets a custom resync period for the specified informer types. -func WithCustomResyncConfig(resyncConfig map[v1.Object]time.Duration) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - for k, v := range resyncConfig { - factory.customResync[reflect.TypeOf(k)] = v - } - return factory - } -} - -// WithTweakListOptions sets a custom filter on all listers of the configured SharedInformerFactory. -func WithTweakListOptions(tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.tweakListOptions = tweakListOptions - return factory - } -} - -// WithNamespace limits the SharedInformerFactory to the specified namespace. -func WithNamespace(namespace string) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.namespace = namespace - return factory - } -} - -// NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces. -func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { - return NewSharedInformerFactoryWithOptions(client, defaultResync) -} - -// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. -// Listers obtained via this SharedInformerFactory will be subject to the same filters -// as specified here. -// Deprecated: Please use NewSharedInformerFactoryWithOptions instead -func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { - return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions)) -} - -// NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options. -func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory { - factory := &sharedInformerFactory{ - client: client, - namespace: v1.NamespaceAll, - defaultResync: defaultResync, - informers: make(map[reflect.Type]cache.SharedIndexInformer), - startedInformers: make(map[reflect.Type]bool), - customResync: make(map[reflect.Type]time.Duration), - } - - // Apply all options - for _, opt := range options { - factory = opt(factory) - } - - return factory -} - -// Start initializes all requested informers. -func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) { - f.lock.Lock() - defer f.lock.Unlock() - - for informerType, informer := range f.informers { - if !f.startedInformers[informerType] { - go informer.Run(stopCh) - f.startedInformers[informerType] = true - } - } -} - -// WaitForCacheSync waits for all started informers' cache were synced. -func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool { - informers := func() map[reflect.Type]cache.SharedIndexInformer { - f.lock.Lock() - defer f.lock.Unlock() - - informers := map[reflect.Type]cache.SharedIndexInformer{} - for informerType, informer := range f.informers { - if f.startedInformers[informerType] { - informers[informerType] = informer - } - } - return informers - }() - - res := map[reflect.Type]bool{} - for informType, informer := range informers { - res[informType] = cache.WaitForCacheSync(stopCh, informer.HasSynced) - } - return res -} - -// InternalInformerFor returns the SharedIndexInformer for obj using an internal -// client. -func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { - f.lock.Lock() - defer f.lock.Unlock() - - informerType := reflect.TypeOf(obj) - informer, exists := f.informers[informerType] - if exists { - return informer - } - - resyncPeriod, exists := f.customResync[informerType] - if !exists { - resyncPeriod = f.defaultResync - } - - informer = newFunc(f.client, resyncPeriod) - f.informers[informerType] = informer - - return informer -} - -// SharedInformerFactory provides shared informers for resources in all known -// API group versions. -type SharedInformerFactory interface { - internalinterfaces.SharedInformerFactory - ForResource(resource schema.GroupVersionResource) (GenericInformer, error) - WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - - Helm() helmcattleio.Interface -} - -func (f *sharedInformerFactory) Helm() helmcattleio.Interface { - return helmcattleio.New(f, f.namespace, f.tweakListOptions) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go deleted file mode 100644 index edb7ac4203..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go +++ /dev/null @@ -1,64 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package externalversions - -import ( - "fmt" - - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" -) - -// GenericInformer is type of SharedIndexInformer which will locate and delegate to other -// sharedInformers based on type -type GenericInformer interface { - Informer() cache.SharedIndexInformer - Lister() cache.GenericLister -} - -type genericInformer struct { - informer cache.SharedIndexInformer - resource schema.GroupResource -} - -// Informer returns the SharedIndexInformer. -func (f *genericInformer) Informer() cache.SharedIndexInformer { - return f.informer -} - -// Lister returns the GenericLister. -func (f *genericInformer) Lister() cache.GenericLister { - return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource) -} - -// ForResource gives generic access to a shared informer of the matching type -// TODO extend this to unknown resources with a client pool -func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { - switch resource { - // Group=helm.cattle.io, Version=v1 - case v1.SchemeGroupVersion.WithResource("helmcharts"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Helm().V1().HelmCharts().Informer()}, nil - case v1.SchemeGroupVersion.WithResource("helmchartconfigs"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Helm().V1().HelmChartConfigs().Informer()}, nil - - } - - return nil, fmt.Errorf("no informer found for %v", resource) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go deleted file mode 100644 index 2e2f4cacb0..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package helm - -import ( - v1 "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" -) - -// Interface provides access to each of this group's versions. -type Interface interface { - // V1 provides access to shared informers for resources in V1. - V1() v1.Interface -} - -type group struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// V1 returns a new v1.Interface. -func (g *group) V1() v1.Interface { - return v1.New(g.factory, g.namespace, g.tweakListOptions) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go deleted file mode 100644 index 24952b07e1..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go +++ /dev/null @@ -1,90 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "context" - time "time" - - helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" - internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// HelmChartInformer provides access to a shared informer and lister for -// HelmCharts. -type HelmChartInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1.HelmChartLister -} - -type helmChartInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewHelmChartInformer constructs a new informer for HelmChart type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewHelmChartInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredHelmChartInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredHelmChartInformer constructs a new informer for HelmChart type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredHelmChartInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.HelmV1().HelmCharts(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.HelmV1().HelmCharts(namespace).Watch(context.TODO(), options) - }, - }, - &helmcattleiov1.HelmChart{}, - resyncPeriod, - indexers, - ) -} - -func (f *helmChartInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredHelmChartInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *helmChartInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&helmcattleiov1.HelmChart{}, f.defaultInformer) -} - -func (f *helmChartInformer) Lister() v1.HelmChartLister { - return v1.NewHelmChartLister(f.Informer().GetIndexer()) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go deleted file mode 100644 index 29b0163063..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go +++ /dev/null @@ -1,90 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "context" - time "time" - - helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" - internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// HelmChartConfigInformer provides access to a shared informer and lister for -// HelmChartConfigs. -type HelmChartConfigInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1.HelmChartConfigLister -} - -type helmChartConfigInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewHelmChartConfigInformer constructs a new informer for HelmChartConfig type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewHelmChartConfigInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredHelmChartConfigInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredHelmChartConfigInformer constructs a new informer for HelmChartConfig type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredHelmChartConfigInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.HelmV1().HelmChartConfigs(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.HelmV1().HelmChartConfigs(namespace).Watch(context.TODO(), options) - }, - }, - &helmcattleiov1.HelmChartConfig{}, - resyncPeriod, - indexers, - ) -} - -func (f *helmChartConfigInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredHelmChartConfigInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *helmChartConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&helmcattleiov1.HelmChartConfig{}, f.defaultInformer) -} - -func (f *helmChartConfigInformer) Lister() v1.HelmChartConfigLister { - return v1.NewHelmChartConfigLister(f.Informer().GetIndexer()) -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go deleted file mode 100644 index ca4db2fbad..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" -) - -// Interface provides access to all the informers in this group version. -type Interface interface { - // HelmCharts returns a HelmChartInformer. - HelmCharts() HelmChartInformer - // HelmChartConfigs returns a HelmChartConfigInformer. - HelmChartConfigs() HelmChartConfigInformer -} - -type version struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// HelmCharts returns a HelmChartInformer. -func (v *version) HelmCharts() HelmChartInformer { - return &helmChartInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} - -// HelmChartConfigs returns a HelmChartConfigInformer. -func (v *version) HelmChartConfigs() HelmChartConfigInformer { - return &helmChartConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go deleted file mode 100644 index ceb8abdce6..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package internalinterfaces - -import ( - time "time" - - versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - cache "k8s.io/client-go/tools/cache" -) - -// NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. -type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer - -// SharedInformerFactory a small interface to allow for adding an informer without an import cycle -type SharedInformerFactory interface { - Start(stopCh <-chan struct{}) - InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer -} - -// TweakListOptionsFunc is a function that transforms a v1.ListOptions. -type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go deleted file mode 100644 index 3a70312b2c..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -// HelmChartListerExpansion allows custom methods to be added to -// HelmChartLister. -type HelmChartListerExpansion interface{} - -// HelmChartNamespaceListerExpansion allows custom methods to be added to -// HelmChartNamespaceLister. -type HelmChartNamespaceListerExpansion interface{} - -// HelmChartConfigListerExpansion allows custom methods to be added to -// HelmChartConfigLister. -type HelmChartConfigListerExpansion interface{} - -// HelmChartConfigNamespaceListerExpansion allows custom methods to be added to -// HelmChartConfigNamespaceLister. -type HelmChartConfigNamespaceListerExpansion interface{} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go deleted file mode 100644 index 3a74af99f1..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go +++ /dev/null @@ -1,94 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// HelmChartLister helps list HelmCharts. -type HelmChartLister interface { - // List lists all HelmCharts in the indexer. - List(selector labels.Selector) (ret []*v1.HelmChart, err error) - // HelmCharts returns an object that can list and get HelmCharts. - HelmCharts(namespace string) HelmChartNamespaceLister - HelmChartListerExpansion -} - -// helmChartLister implements the HelmChartLister interface. -type helmChartLister struct { - indexer cache.Indexer -} - -// NewHelmChartLister returns a new HelmChartLister. -func NewHelmChartLister(indexer cache.Indexer) HelmChartLister { - return &helmChartLister{indexer: indexer} -} - -// List lists all HelmCharts in the indexer. -func (s *helmChartLister) List(selector labels.Selector) (ret []*v1.HelmChart, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1.HelmChart)) - }) - return ret, err -} - -// HelmCharts returns an object that can list and get HelmCharts. -func (s *helmChartLister) HelmCharts(namespace string) HelmChartNamespaceLister { - return helmChartNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// HelmChartNamespaceLister helps list and get HelmCharts. -type HelmChartNamespaceLister interface { - // List lists all HelmCharts in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1.HelmChart, err error) - // Get retrieves the HelmChart from the indexer for a given namespace and name. - Get(name string) (*v1.HelmChart, error) - HelmChartNamespaceListerExpansion -} - -// helmChartNamespaceLister implements the HelmChartNamespaceLister -// interface. -type helmChartNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all HelmCharts in the indexer for a given namespace. -func (s helmChartNamespaceLister) List(selector labels.Selector) (ret []*v1.HelmChart, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1.HelmChart)) - }) - return ret, err -} - -// Get retrieves the HelmChart from the indexer for a given namespace and name. -func (s helmChartNamespaceLister) Get(name string) (*v1.HelmChart, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1.Resource("helmchart"), name) - } - return obj.(*v1.HelmChart), nil -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go deleted file mode 100644 index 0dfe286738..0000000000 --- a/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go +++ /dev/null @@ -1,94 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// HelmChartConfigLister helps list HelmChartConfigs. -type HelmChartConfigLister interface { - // List lists all HelmChartConfigs in the indexer. - List(selector labels.Selector) (ret []*v1.HelmChartConfig, err error) - // HelmChartConfigs returns an object that can list and get HelmChartConfigs. - HelmChartConfigs(namespace string) HelmChartConfigNamespaceLister - HelmChartConfigListerExpansion -} - -// helmChartConfigLister implements the HelmChartConfigLister interface. -type helmChartConfigLister struct { - indexer cache.Indexer -} - -// NewHelmChartConfigLister returns a new HelmChartConfigLister. -func NewHelmChartConfigLister(indexer cache.Indexer) HelmChartConfigLister { - return &helmChartConfigLister{indexer: indexer} -} - -// List lists all HelmChartConfigs in the indexer. -func (s *helmChartConfigLister) List(selector labels.Selector) (ret []*v1.HelmChartConfig, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1.HelmChartConfig)) - }) - return ret, err -} - -// HelmChartConfigs returns an object that can list and get HelmChartConfigs. -func (s *helmChartConfigLister) HelmChartConfigs(namespace string) HelmChartConfigNamespaceLister { - return helmChartConfigNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// HelmChartConfigNamespaceLister helps list and get HelmChartConfigs. -type HelmChartConfigNamespaceLister interface { - // List lists all HelmChartConfigs in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1.HelmChartConfig, err error) - // Get retrieves the HelmChartConfig from the indexer for a given namespace and name. - Get(name string) (*v1.HelmChartConfig, error) - HelmChartConfigNamespaceListerExpansion -} - -// helmChartConfigNamespaceLister implements the HelmChartConfigNamespaceLister -// interface. -type helmChartConfigNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all HelmChartConfigs in the indexer for a given namespace. -func (s helmChartConfigNamespaceLister) List(selector labels.Selector) (ret []*v1.HelmChartConfig, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1.HelmChartConfig)) - }) - return ret, err -} - -// Get retrieves the HelmChartConfig from the indexer for a given namespace and name. -func (s helmChartConfigNamespaceLister) Get(name string) (*v1.HelmChartConfig, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1.Resource("helmchartconfig"), name) - } - return obj.(*v1.HelmChartConfig), nil -} diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go index a89655f55b..c4d4b2db63 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go @@ -11,10 +11,10 @@ import ( helmv1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" helmcontroller "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" - batchcontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1" - corecontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" - rbaccontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" "github.com/rancher/wrangler/pkg/apply" + batchcontroller "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1" + corecontroller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + rbaccontroller "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" "github.com/rancher/wrangler/pkg/objectset" "github.com/rancher/wrangler/pkg/relatedresource" batch "k8s.io/api/batch/v1" diff --git a/vendor/github.com/rancher/dynamiclistener/factory/gen.go b/vendor/github.com/rancher/dynamiclistener/factory/gen.go index ff15a932ac..1f43e67429 100644 --- a/vendor/github.com/rancher/dynamiclistener/factory/gen.go +++ b/vendor/github.com/rancher/dynamiclistener/factory/gen.go @@ -26,7 +26,7 @@ const ( ) var ( - cnRegexp = regexp.MustCompile("^([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$") + cnRegexp = regexp.MustCompile("^([A-Za-z0-9:][-A-Za-z0-9_.:]*)?[A-Za-z0-9:]$") ) type TLS struct { diff --git a/vendor/github.com/rancher/dynamiclistener/go.mod b/vendor/github.com/rancher/dynamiclistener/go.mod index 8eb297f0fa..d0420c1d49 100644 --- a/vendor/github.com/rancher/dynamiclistener/go.mod +++ b/vendor/github.com/rancher/dynamiclistener/go.mod @@ -1,12 +1,11 @@ module github.com/rancher/dynamiclistener -go 1.12 +go 1.16 require ( - github.com/rancher/wrangler v0.1.4 - github.com/rancher/wrangler-api v0.2.0 - github.com/sirupsen/logrus v1.4.1 - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 - k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b - k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d + github.com/rancher/wrangler v0.8.3 + github.com/sirupsen/logrus v1.4.2 + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + k8s.io/api v0.18.8 + k8s.io/apimachinery v0.18.8 ) diff --git a/vendor/github.com/rancher/dynamiclistener/go.sum b/vendor/github.com/rancher/dynamiclistener/go.sum index b940275223..9a359c67ae 100644 --- a/vendor/github.com/rancher/dynamiclistener/go.sum +++ b/vendor/github.com/rancher/dynamiclistener/go.sum @@ -1,132 +1,618 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +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= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.15+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 v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod h1:CgNC6SGbT+Xb8wGGvzilttZL1mc5sQ/5KkcxsZttMIk= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= +github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= +github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= +github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= +github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod h1:yZAFP63pRshzrEYLXLGPmUt0Ay+2zdjmMN1loCnRLUk= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= -github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk= +github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/jetstack/cert-manager v0.7.2/go.mod h1:nbddmhjWxYGt04bxvwVGUSeLhZ2PCyNvd7MpXdq+yWY= +github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk= +github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/knative/build v0.6.0/go.mod h1:/sU74ZQkwlYA5FwYDJhYTy61i/Kn+5eWfln2jDbw3Qo= -github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod h1:7Ijfhw7rfB+H9VtosIsDYvZQ+qYTz7auK3fHW/5z4ww= -github.com/knative/serving v0.6.1/go.mod h1:ljvMfwQy2qanaM/8xnBSK4Mz3Vv2NawC2fo5kFRJS1A= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= -github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= +github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/paulmach/orb v0.1.3/go.mod h1:VFlX/8C+IQ1p6FTRRKzKoOPJnvEtA5G0Veuqwbu//Vk= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rancher/wrangler v0.1.4 h1:bdzBw4H9JKQhXPBPNp4eHbmrkA24+VII865VLiVWcw8= -github.com/rancher/wrangler v0.1.4/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE= -github.com/rancher/wrangler-api v0.2.0 h1:VR7hLNnDrKykKLqthtwZ58pDDtUa9ijSNToPaJLEkWc= -github.com/rancher/wrangler-api v0.2.0/go.mod h1:zTPdNLZO07KvRaVOx6XQbKBSV55Fnn4s7nqmrMPJqd8= -github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= +github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 h1:NxR8Fh0eE7/5/5Zvlog9B5NVjWKqBSb1WYMUF7/IE5c= +github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08/go.mod h1:9qZd/S8DqWzfKtjKGgSoHqGEByYmUE3qRaBaaAHwfEM= +github.com/rancher/wrangler v0.8.3 h1:m3d5ChOQj2Pdozy6nkGiSzAgQxlQlXRis2zSRwaO83k= +github.com/rancher/wrangler v0.8.3/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff h1:VARhShG49tiji6mdRNp7JTNDtJ0FhuprF93GBQ37xGU= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/tektoncd/pipeline v0.4.0/go.mod h1:IZzJdiX9EqEMuUcgdnElozdYYRh0/ZRC+NKMLj1K3Yw= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= +github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= +github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +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= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= +go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= +golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.0.0/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b h1:aBGgKJUM9Hk/3AE8WaZIApnTxG35kbuQba2w+SXqezo= -k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= -k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d h1:Jmdtdt1ZnoGfWWIIik61Z7nKYgO3J+swQJtPYsP9wHA= -k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible h1:U5Bt+dab9K8qaUmXINrkXO135kA11/i5Kg1RUydgaMQ= -k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/code-generator v0.0.0-20190311093542-50b561225d70/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= +k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3/go.mod h1:itOjKREfmUTvcjantxOsyYU5mbFsU7qUnyUuRfF5+5M= +k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= +k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= +k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= +k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= +k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= +k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs= +k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= +k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= +k8s.io/apimachinery v0.0.0-20191216025728-0ee8b4573e3a/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= +k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= +k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= +k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= +k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= +k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= +k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= +k8s.io/cli-runtime v0.0.0-20191214191754-e6dc6d5c8724/go.mod h1:wzlq80lvjgHW9if6MlE4OIGC86MDKsy5jtl9nxz/IYY= +k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= +k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk= +k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052/go.mod h1:tAaoc/sYuIL0+njJefSAmE28CIcxyaFV4kbIujBlY2s= +k8s.io/client-go v0.0.0-20191219150334-0b8da7416048/go.mod h1:ZEe8ZASDUAuqVGJ+UN0ka0PfaR+b6a6E1PGsSNZRui8= +k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= +k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= +k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM= +k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= +k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= +k8s.io/code-generator v0.0.0-20191214185510-0b9b3c99f9f2/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao= +k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= +k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= +k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= +k8s.io/component-base v0.0.0-20191214190519-d868452632e2/go.mod h1:wupxkh1T/oUDqyTtcIjiEfpbmIHGm8By/vqpSKC6z8c= +k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= +k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod h1:iU+ZGYsNlvU9XKUSso6SQfKTCCw7lFduMZy26Mgr2Fw= -k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y= -k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kube-aggregator v0.18.0/go.mod h1:ateewQ5QbjMZF/dihEFXwaEwoA4v/mayRvzfmvb6eqI= +k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd/go.mod h1:9ehGcuUGjXVZh0qbYSB0vvofQw2JQe6c6cO0k4wu/Oo= +k8s.io/metrics v0.0.0-20191214191643-6b1944c9f765/go.mod h1:5V7rewilItwK0cz4nomU0b3XCcees2Ka5EBYWS1HBeM= +k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= +k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= +sigs.k8s.io/cli-utils v0.16.0/go.mod h1:9Jqm9K2W6ShhCxsEuaz6HSRKKOXigPUx3ZfypGgxBLY= +sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns= +sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= +sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= +sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= +sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= +sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/ca.go b/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/ca.go index 5d418451b8..d23ac4ff32 100644 --- a/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/ca.go +++ b/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/ca.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "github.com/rancher/dynamiclistener/factory" - v1controller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + v1controller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/controller.go b/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/controller.go index 70d5d7c44b..2e82e96646 100644 --- a/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/controller.go +++ b/vendor/github.com/rancher/dynamiclistener/storage/kubernetes/controller.go @@ -6,8 +6,8 @@ import ( "time" "github.com/rancher/dynamiclistener" - "github.com/rancher/wrangler-api/pkg/generated/controllers/core" - v1controller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/pkg/generated/controllers/core" + v1controller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" "github.com/rancher/wrangler/pkg/start" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" diff --git a/vendor/github.com/rancher/wrangler-api/LICENSE b/vendor/github.com/rancher/wrangler-api/LICENSE deleted file mode 100644 index f433b1a53f..0000000000 --- a/vendor/github.com/rancher/wrangler-api/LICENSE +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/factory.go b/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/factory.go deleted file mode 100644 index 9c7261ec78..0000000000 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/factory.go +++ /dev/null @@ -1,126 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package apps - -import ( - "context" - "time" - - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" - informers "k8s.io/client-go/informers" - clientset "k8s.io/client-go/kubernetes" - scheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" -) - -func init() { - scheme.AddToScheme(schemes.All) -} - -type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int -} - -func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { - f, err := NewFactoryFromConfig(config) - if err != nil { - panic(err) - } - return f -} - -func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, nil) -} - -func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ - Namespace: namespace, - }) -} - -type FactoryOptions struct { - Namespace string - Resync time.Duration -} - -func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { - return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, - } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) -} - -func (c *Factory) Apps() Interface { - return New(c.controllerManager, c.informerFactory.Apps(), c.clientset) -} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/factory.go b/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/factory.go deleted file mode 100644 index c3a8c56498..0000000000 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/factory.go +++ /dev/null @@ -1,126 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package batch - -import ( - "context" - "time" - - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" - informers "k8s.io/client-go/informers" - clientset "k8s.io/client-go/kubernetes" - scheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" -) - -func init() { - scheme.AddToScheme(schemes.All) -} - -type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int -} - -func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { - f, err := NewFactoryFromConfig(config) - if err != nil { - panic(err) - } - return f -} - -func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, nil) -} - -func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ - Namespace: namespace, - }) -} - -type FactoryOptions struct { - Namespace string - Resync time.Duration -} - -func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { - return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, - } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) -} - -func (c *Factory) Batch() Interface { - return New(c.controllerManager, c.informerFactory.Batch(), c.clientset) -} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/factory.go b/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/factory.go deleted file mode 100644 index e4d841ea64..0000000000 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/factory.go +++ /dev/null @@ -1,126 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package core - -import ( - "context" - "time" - - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" - informers "k8s.io/client-go/informers" - clientset "k8s.io/client-go/kubernetes" - scheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" -) - -func init() { - scheme.AddToScheme(schemes.All) -} - -type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int -} - -func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { - f, err := NewFactoryFromConfig(config) - if err != nil { - panic(err) - } - return f -} - -func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, nil) -} - -func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ - Namespace: namespace, - }) -} - -type FactoryOptions struct { - Namespace string - Resync time.Duration -} - -func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { - return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, - } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) -} - -func (c *Factory) Core() Interface { - return New(c.controllerManager, c.informerFactory.Core(), c.clientset) -} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/interface.go b/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/interface.go deleted file mode 100644 index 92fc1c6ec0..0000000000 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/interface.go +++ /dev/null @@ -1,85 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package v1 - -import ( - "github.com/rancher/wrangler/pkg/generic" - v1 "k8s.io/api/core/v1" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" -) - -type Interface interface { - ConfigMap() ConfigMapController - Endpoints() EndpointsController - Event() EventController - Namespace() NamespaceController - Node() NodeController - PersistentVolumeClaim() PersistentVolumeClaimController - Pod() PodController - Secret() SecretController - Service() ServiceController - ServiceAccount() ServiceAccountController -} - -func New(controllerManager *generic.ControllerManager, client clientset.CoreV1Interface, - informers informers.Interface) Interface { - return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, - } -} - -type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.CoreV1Interface -} - -func (c *version) ConfigMap() ConfigMapController { - return NewConfigMapController(v1.SchemeGroupVersion.WithKind("ConfigMap"), c.controllerManager, c.client, c.informers.ConfigMaps()) -} -func (c *version) Endpoints() EndpointsController { - return NewEndpointsController(v1.SchemeGroupVersion.WithKind("Endpoints"), c.controllerManager, c.client, c.informers.Endpoints()) -} -func (c *version) Event() EventController { - return NewEventController(v1.SchemeGroupVersion.WithKind("Event"), c.controllerManager, c.client, c.informers.Events()) -} -func (c *version) Namespace() NamespaceController { - return NewNamespaceController(v1.SchemeGroupVersion.WithKind("Namespace"), c.controllerManager, c.client, c.informers.Namespaces()) -} -func (c *version) Node() NodeController { - return NewNodeController(v1.SchemeGroupVersion.WithKind("Node"), c.controllerManager, c.client, c.informers.Nodes()) -} -func (c *version) PersistentVolumeClaim() PersistentVolumeClaimController { - return NewPersistentVolumeClaimController(v1.SchemeGroupVersion.WithKind("PersistentVolumeClaim"), c.controllerManager, c.client, c.informers.PersistentVolumeClaims()) -} -func (c *version) Pod() PodController { - return NewPodController(v1.SchemeGroupVersion.WithKind("Pod"), c.controllerManager, c.client, c.informers.Pods()) -} -func (c *version) Secret() SecretController { - return NewSecretController(v1.SchemeGroupVersion.WithKind("Secret"), c.controllerManager, c.client, c.informers.Secrets()) -} -func (c *version) Service() ServiceController { - return NewServiceController(v1.SchemeGroupVersion.WithKind("Service"), c.controllerManager, c.client, c.informers.Services()) -} -func (c *version) ServiceAccount() ServiceAccountController { - return NewServiceAccountController(v1.SchemeGroupVersion.WithKind("ServiceAccount"), c.controllerManager, c.client, c.informers.ServiceAccounts()) -} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/factory.go b/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/factory.go deleted file mode 100644 index 1ae7c9f52e..0000000000 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/factory.go +++ /dev/null @@ -1,126 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -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. -*/ - -// Code generated by main. DO NOT EDIT. - -package rbac - -import ( - "context" - "time" - - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime/schema" - informers "k8s.io/client-go/informers" - clientset "k8s.io/client-go/kubernetes" - scheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" -) - -func init() { - scheme.AddToScheme(schemes.All) -} - -type Factory struct { - synced bool - informerFactory informers.SharedInformerFactory - clientset clientset.Interface - controllerManager *generic.ControllerManager - threadiness map[schema.GroupVersionKind]int -} - -func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { - f, err := NewFactoryFromConfig(config) - if err != nil { - panic(err) - } - return f -} - -func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, nil) -} - -func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { - return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ - Namespace: namespace, - }) -} - -type FactoryOptions struct { - Namespace string - Resync time.Duration -} - -func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { - if opts == nil { - opts = &FactoryOptions{} - } - - cs, err := clientset.NewForConfig(config) - if err != nil { - return nil, err - } - - resync := opts.Resync - if resync == 0 { - resync = 2 * time.Hour - } - - if opts.Namespace == "" { - informerFactory := informers.NewSharedInformerFactory(cs, resync) - return NewFactory(cs, informerFactory), nil - } - - informerFactory := informers.NewSharedInformerFactoryWithOptions(cs, resync, informers.WithNamespace(opts.Namespace)) - return NewFactory(cs, informerFactory), nil -} - -func NewFactory(clientset clientset.Interface, informerFactory informers.SharedInformerFactory) *Factory { - return &Factory{ - threadiness: map[schema.GroupVersionKind]int{}, - controllerManager: &generic.ControllerManager{}, - clientset: clientset, - informerFactory: informerFactory, - } -} - -func (c *Factory) Controllers() map[schema.GroupVersionKind]*generic.Controller { - return c.controllerManager.Controllers() -} - -func (c *Factory) SetThreadiness(gvk schema.GroupVersionKind, threadiness int) { - c.threadiness[gvk] = threadiness -} - -func (c *Factory) Sync(ctx context.Context) error { - c.informerFactory.Start(ctx.Done()) - c.informerFactory.WaitForCacheSync(ctx.Done()) - return nil -} - -func (c *Factory) Start(ctx context.Context, defaultThreadiness int) error { - if err := c.Sync(ctx); err != nil { - return err - } - - return c.controllerManager.Start(ctx, defaultThreadiness, c.threadiness) -} - -func (c *Factory) Rbac() Interface { - return New(c.controllerManager, c.informerFactory.Rbac(), c.clientset) -} diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/apply.go b/vendor/github.com/rancher/wrangler/pkg/apply/apply.go index 4e51ab4c84..2f295a704d 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/apply.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/apply.go @@ -77,6 +77,7 @@ type Apply interface { WithListerNamespace(ns string) Apply WithRateLimiting(ratelimitingQps float32) Apply WithNoDelete() Apply + WithNoDeleteGVK(gvks ...schema.GroupVersionKind) Apply WithGVK(gvks ...schema.GroupVersionKind) Apply WithSetOwnerReference(controller, block bool) Apply WithIgnorePreviousApplied() Apply @@ -279,6 +280,10 @@ func (a *apply) WithNoDelete() Apply { return a.newDesiredSet().WithNoDelete() } +func (a *apply) WithNoDeleteGVK(gvks ...schema.GroupVersionKind) Apply { + return a.newDesiredSet().WithNoDeleteGVK(gvks...) +} + func (a *apply) WithSetOwnerReference(controller, block bool) Apply { return a.newDesiredSet().WithSetOwnerReference(controller, block) } diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset.go index 0e68f45e2a..ecdaa9185a 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset.go @@ -36,6 +36,7 @@ type desiredSet struct { informerFactory InformerFactory remove bool noDelete bool + noDeleteGVK map[schema.GroupVersionKind]struct{} setID string objs *objectset.ObjectSet codeVersion string @@ -225,6 +226,16 @@ func (o desiredSet) WithNoDelete() Apply { return o } +func (o desiredSet) WithNoDeleteGVK(gvks ...schema.GroupVersionKind) Apply { + if o.noDeleteGVK == nil { + o.noDeleteGVK = make(map[schema.GroupVersionKind]struct{}) + } + for _, curr := range gvks { + o.noDeleteGVK[curr] = struct{}{} + } + return o +} + func (o desiredSet) WithContext(ctx context.Context) Apply { o.ctx = ctx return o diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go index 155946c852..7f335530b4 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go @@ -177,6 +177,17 @@ func (o *desiredSet) runInjectors(objList []runtime.Object) ([]runtime.Object, e return objList, nil } +// GetSelectorFromOwner returns the label selector for the owner object which is useful +// to list the dependents +func GetSelectorFromOwner(setID string, owner runtime.Object) (labels.Selector, error) { + // Build the labels, we want the hash label for the lister + ownerLabel, _, err := GetLabelsAndAnnotations(setID, owner) + if err != nil { + return nil, err + } + return GetSelector(ownerLabel) +} + func GetSelector(labelSet map[string]string) (labels.Selector, error) { req, err := labels.NewRequirement(LabelHash, selection.Equals, []string{labelSet[LabelHash]}) if err != nil { diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_crud.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_crud.go index 7d74bcc1d4..901650ca69 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_crud.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_crud.go @@ -6,6 +6,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/json" "k8s.io/client-go/dynamic" ) @@ -51,9 +52,14 @@ func (o *desiredSet) get(nsed bool, namespace, name string, client dynamic.Names return client.Get(o.ctx, name, v1.GetOptions{}) } -func (o *desiredSet) delete(nsed bool, namespace, name string, client dynamic.NamespaceableResourceInterface, force bool) error { - if o.noDelete && !force { - return nil +func (o *desiredSet) delete(nsed bool, namespace, name string, client dynamic.NamespaceableResourceInterface, force bool, gvk schema.GroupVersionKind) error { + if !force { + if o.noDelete { + return nil + } + if _, ok := o.noDeleteGVK[gvk]; ok { + return nil + } } opts := v1.DeleteOptions{ PropagationPolicy: &deletePolicy, diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go index 7083264523..d559b710cf 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go @@ -304,7 +304,7 @@ func (o *desiredSet) process(debugID string, set labels.Selector, gvk schema.Gro } deleteF := func(k objectset.ObjectKey, force bool) { - if err := o.delete(nsed, k.Namespace, k.Name, client, force); err != nil { + if err := o.delete(nsed, k.Namespace, k.Name, client, force, gvk); err != nil { o.err(errors.Wrapf(err, "failed to delete %s %s for %s", k, gvk, debugID)) return } diff --git a/vendor/github.com/rancher/wrangler/pkg/crd/init.go b/vendor/github.com/rancher/wrangler/pkg/crd/init.go index 27a6da72b4..d5dfb2912b 100644 --- a/vendor/github.com/rancher/wrangler/pkg/crd/init.go +++ b/vendor/github.com/rancher/wrangler/pkg/crd/init.go @@ -2,6 +2,7 @@ package crd import ( "context" + "fmt" "path/filepath" "reflect" "strconv" @@ -15,8 +16,9 @@ import ( "github.com/rancher/wrangler/pkg/name" "github.com/rancher/wrangler/pkg/schemas/openapi" "github.com/sirupsen/logrus" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -31,6 +33,8 @@ import ( _ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" ) +const CRDKind = "CustomResourceDefinition" + type Factory struct { wg sync.WaitGroup err error @@ -43,9 +47,9 @@ type CRD struct { PluralName string SingularName string NonNamespace bool - Schema *v1.JSONSchemaProps + Schema *apiextv1.JSONSchemaProps SchemaObject interface{} - Columns []v1.CustomResourceColumnDefinition + Columns []apiextv1.CustomResourceColumnDefinition Status bool Scale bool Categories []string @@ -56,7 +60,7 @@ type CRD struct { Override runtime.Object } -func (c CRD) WithSchema(schema *v1.JSONSchemaProps) CRD { +func (c CRD) WithSchema(schema *apiextv1.JSONSchemaProps) CRD { c.Schema = schema return c } @@ -67,7 +71,7 @@ func (c CRD) WithSchemaFromStruct(obj interface{}) CRD { } func (c CRD) WithColumn(name, path string) CRD { - c.Columns = append(c.Columns, v1.CustomResourceColumnDefinition{ + c.Columns = append(c.Columns, apiextv1.CustomResourceColumnDefinition{ Name: name, Type: "string", Priority: 0, @@ -105,8 +109,8 @@ func fieldName(f reflect.StructField) string { return name } -func tagToColumn(f reflect.StructField) (v1.CustomResourceColumnDefinition, bool) { - c := v1.CustomResourceColumnDefinition{ +func tagToColumn(f reflect.StructField) (apiextv1.CustomResourceColumnDefinition, bool) { + c := apiextv1.CustomResourceColumnDefinition{ Name: f.Name, Type: "string", } @@ -137,7 +141,7 @@ func tagToColumn(f reflect.StructField) (v1.CustomResourceColumnDefinition, bool return c, true } -func readCustomColumns(t reflect.Type, path string) (result []v1.CustomResourceColumnDefinition) { +func readCustomColumns(t reflect.Type, path string) (result []apiextv1.CustomResourceColumnDefinition) { for i := 0; i < t.NumField(); i++ { f := t.Field(i) fieldName := fieldName(f) @@ -165,7 +169,7 @@ func readCustomColumns(t reflect.Type, path string) (result []v1.CustomResourceC return result } -func (c CRD) WithCustomColumn(columns ...v1.CustomResourceColumnDefinition) CRD { +func (c CRD) WithCustomColumn(columns ...apiextv1.CustomResourceColumnDefinition) CRD { c.Columns = append(c.Columns, columns...) return c } @@ -227,13 +231,13 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { name := strings.ToLower(plural + "." + c.GVK.Group) - crd := apiext.CustomResourceDefinition{ + crd := apiextv1.CustomResourceDefinition{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, - Spec: apiext.CustomResourceDefinitionSpec{ + Spec: apiextv1.CustomResourceDefinitionSpec{ Group: c.GVK.Group, - Versions: []apiext.CustomResourceDefinitionVersion{ + Versions: []apiextv1.CustomResourceDefinitionVersion{ { Name: c.GVK.Version, Storage: true, @@ -241,7 +245,7 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { AdditionalPrinterColumns: c.Columns, }, }, - Names: apiext.CustomResourceDefinitionNames{ + Names: apiextv1.CustomResourceDefinitionNames{ Plural: plural, Singular: singular, Kind: c.GVK.Kind, @@ -253,7 +257,7 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { } if c.Schema != nil { - crd.Spec.Versions[0].Schema = &apiext.CustomResourceValidation{ + crd.Spec.Versions[0].Schema = &apiextv1.CustomResourceValidation{ OpenAPIV3Schema: c.Schema, } } @@ -263,17 +267,17 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { if err != nil { return nil, err } - crd.Spec.Versions[0].Schema = &apiext.CustomResourceValidation{ + crd.Spec.Versions[0].Schema = &apiextv1.CustomResourceValidation{ OpenAPIV3Schema: schema, } } // add a dummy schema because v1 requires OpenAPIV3Schema to be set if crd.Spec.Versions[0].Schema == nil { - crd.Spec.Versions[0].Schema = &apiext.CustomResourceValidation{ - OpenAPIV3Schema: &apiext.JSONSchemaProps{ + crd.Spec.Versions[0].Schema = &apiextv1.CustomResourceValidation{ + OpenAPIV3Schema: &apiextv1.JSONSchemaProps{ Type: "object", - Properties: map[string]apiext.JSONSchemaProps{ + Properties: map[string]apiextv1.JSONSchemaProps{ "spec": { XPreserveUnknownFields: &[]bool{true}[0], }, @@ -286,12 +290,12 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { } if c.Status { - crd.Spec.Versions[0].Subresources = &apiext.CustomResourceSubresources{ - Status: &apiext.CustomResourceSubresourceStatus{}, + crd.Spec.Versions[0].Subresources = &apiextv1.CustomResourceSubresources{ + Status: &apiextv1.CustomResourceSubresourceStatus{}, } if c.Scale { sel := "Spec.Selector" - crd.Spec.Versions[0].Subresources.Scale = &apiext.CustomResourceSubresourceScale{ + crd.Spec.Versions[0].Subresources.Scale = &apiextv1.CustomResourceSubresourceScale{ SpecReplicasPath: "Spec.Replicas", StatusReplicasPath: "Status.Replicas", LabelSelectorPath: &sel, @@ -300,9 +304,9 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { } if c.NonNamespace { - crd.Spec.Scope = apiext.ClusterScoped + crd.Spec.Scope = apiextv1.ClusterScoped } else { - crd.Spec.Scope = apiext.NamespaceScoped + crd.Spec.Scope = apiextv1.NamespaceScoped } crd.Labels = c.Labels @@ -313,14 +317,50 @@ func (c CRD) ToCustomResourceDefinition() (runtime.Object, error) { if err != nil { return nil, err } - mapData["kind"] = "CustomResourceDefinition" - mapData["apiVersion"] = apiext.SchemeGroupVersion.String() + mapData["kind"] = CRDKind + mapData["apiVersion"] = apiextv1.SchemeGroupVersion.String() return &unstructured.Unstructured{ Object: mapData, }, unstructured.SetNestedField(mapData, false, "spec", "preserveUnknownFields") } +func (c CRD) ToCustomResourceDefinitionV1Beta1() (*apiextv1beta1.CustomResourceDefinition, error) { + toConvertCRD, err := c.ToCustomResourceDefinition() + if err != nil { + return nil, err + } + if toConvertCRD == nil { + return nil, fmt.Errorf("cannot convert empty CRD runtime object to apiextensions v1beta1 CRD object") + } + + unstructuredCRD, ok := toConvertCRD.(*unstructured.Unstructured) + if !ok { + return nil, fmt.Errorf("could not convert CRD runtime object to *unstructured.Unstructured") + } + var v1CRD *apiextv1.CustomResourceDefinition + if err := runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredCRD.UnstructuredContent(), &v1CRD); err != nil { + return nil, err + } + + internalCRD := &apiext.CustomResourceDefinition{} + if err := apiextv1.Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(v1CRD, internalCRD, nil); err != nil { + return nil, err + } + v1beta1CRD := &apiextv1beta1.CustomResourceDefinition{} + if err := apiextv1beta1.Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(internalCRD, v1beta1CRD, nil); err != nil { + return nil, err + } + + // GVK is dropped during conversion, so we must add it. + v1beta1CRD.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{ + Group: apiextv1beta1.SchemeGroupVersion.Group, + Version: apiextv1beta1.SchemeGroupVersion.Version, + Kind: CRDKind, + }) + return v1beta1CRD, nil +} + func NamespacedType(name string) CRD { kindGroup, version := kv.Split(name, "/") kind, group := kv.Split(kindGroup, ".") @@ -410,7 +450,7 @@ func (f *Factory) BatchCreateCRDs(ctx context.Context, crds ...CRD) *Factory { return f } -func (f *Factory) CreateCRDs(ctx context.Context, crds ...CRD) (map[schema.GroupVersionKind]*apiext.CustomResourceDefinition, error) { +func (f *Factory) CreateCRDs(ctx context.Context, crds ...CRD) (map[schema.GroupVersionKind]*apiextv1.CustomResourceDefinition, error) { if len(crds) == 0 { return nil, nil } @@ -422,7 +462,7 @@ func (f *Factory) CreateCRDs(ctx context.Context, crds ...CRD) (map[schema.Group return nil, err } - crdStatus := map[schema.GroupVersionKind]*apiext.CustomResourceDefinition{} + crdStatus := map[schema.GroupVersionKind]*apiextv1.CustomResourceDefinition{} ready, err := f.getReadyCRDs(ctx) if err != nil { @@ -455,7 +495,7 @@ func (f *Factory) CreateCRDs(ctx context.Context, crds ...CRD) (map[schema.Group return crdStatus, nil } -func (f *Factory) waitCRD(ctx context.Context, crdName string, gvk schema.GroupVersionKind, crdStatus map[schema.GroupVersionKind]*apiext.CustomResourceDefinition) error { +func (f *Factory) waitCRD(ctx context.Context, crdName string, gvk schema.GroupVersionKind, crdStatus map[schema.GroupVersionKind]*apiextv1.CustomResourceDefinition) error { logrus.Infof("Waiting for CRD %s to become available", crdName) defer logrus.Infof("Done waiting for CRD %s to become available", crdName) @@ -473,13 +513,13 @@ func (f *Factory) waitCRD(ctx context.Context, crdName string, gvk schema.GroupV for _, cond := range crd.Status.Conditions { switch cond.Type { - case apiext.Established: - if cond.Status == apiext.ConditionTrue { + case apiextv1.Established: + if cond.Status == apiextv1.ConditionTrue { crdStatus[gvk] = crd return true, err } - case apiext.NamesAccepted: - if cond.Status == apiext.ConditionFalse { + case apiextv1.NamesAccepted: + if cond.Status == apiextv1.ConditionFalse { logrus.Infof("Name conflict on %s: %v\n", crdName, cond.Reason) } } @@ -489,7 +529,7 @@ func (f *Factory) waitCRD(ctx context.Context, crdName string, gvk schema.GroupV }) } -func (f *Factory) createCRD(ctx context.Context, crdDef CRD, ready map[string]*apiext.CustomResourceDefinition) (*apiext.CustomResourceDefinition, error) { +func (f *Factory) createCRD(ctx context.Context, crdDef CRD, ready map[string]*apiextv1.CustomResourceDefinition) (*apiextv1.CustomResourceDefinition, error) { crd, err := crdDef.ToCustomResourceDefinition() if err != nil { return nil, err @@ -516,19 +556,19 @@ func (f *Factory) ensureAccess(ctx context.Context) (bool, error) { return true, err } -func (f *Factory) getReadyCRDs(ctx context.Context) (map[string]*apiext.CustomResourceDefinition, error) { +func (f *Factory) getReadyCRDs(ctx context.Context) (map[string]*apiextv1.CustomResourceDefinition, error) { list, err := f.CRDClient.ApiextensionsV1().CustomResourceDefinitions().List(ctx, metav1.ListOptions{}) if err != nil { return nil, err } - result := map[string]*apiext.CustomResourceDefinition{} + result := map[string]*apiextv1.CustomResourceDefinition{} for i, crd := range list.Items { for _, cond := range crd.Status.Conditions { switch cond.Type { - case apiext.Established: - if cond.Status == apiext.ConditionTrue { + case apiextv1.Established: + if cond.Status == apiextv1.ConditionTrue { result[crd.Name] = &list.Items[i] } } diff --git a/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/factory.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/factory.go new file mode 100644 index 0000000000..3679d03175 --- /dev/null +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/factory.go @@ -0,0 +1,67 @@ +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by main. DO NOT EDIT. + +package apps + +import ( + "github.com/rancher/wrangler/pkg/generic" + "k8s.io/client-go/rest" +) + +type Factory struct { + *generic.Factory +} + +func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { + f, err := NewFactoryFromConfig(config) + if err != nil { + panic(err) + } + return f +} + +func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, nil) +} + +func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ + Namespace: namespace, + }) +} + +type FactoryOptions = generic.FactoryOptions + +func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) + return &Factory{ + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) + } + return f +} + +func (c *Factory) Apps() Interface { + return New(c.ControllerFactory()) +} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/interface.go similarity index 56% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/interface.go index 40179e4c76..4f91f157d9 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/interface.go @@ -19,10 +19,8 @@ limitations under the License. package apps import ( - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1" - "github.com/rancher/wrangler/pkg/generic" - informers "k8s.io/client-go/informers/apps" - clientset "k8s.io/client-go/kubernetes" + "github.com/rancher/lasso/pkg/controller" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.AppsV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/daemonset.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/daemonset.go similarity index 76% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/daemonset.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/daemonset.go index c7c5378a6e..039d680dd9 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/daemonset.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/daemonset.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/apps/v1" - clientset "k8s.io/client-go/kubernetes/typed/apps/v1" - listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type DaemonSetCache interface { type DaemonSetIndexer func(obj *v1.DaemonSet) ([]string, error) type daemonSetController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.DaemonSetsGetter - informer informers.DaemonSetInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewDaemonSetController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.DaemonSetsGetter, informer informers.DaemonSetInformer) DaemonSetController { +func NewDaemonSetController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) DaemonSetController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &daemonSetController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateDaemonSetDeepCopyOnChange(client DaemonSetClient, obj *v1.DaemonSet, } func (c *daemonSetController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *daemonSetController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *daemonSetController) OnChange(ctx context.Context, name string, sync DaemonSetHandler) { @@ -149,20 +151,19 @@ func (c *daemonSetController) OnChange(ctx context.Context, name string, sync Da } func (c *daemonSetController) OnRemove(ctx context.Context, name string, sync DaemonSetHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromDaemonSetHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromDaemonSetHandlerToHandler(sync))) } func (c *daemonSetController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *daemonSetController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *daemonSetController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *daemonSetController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *daemonSetController) GroupVersionKind() schema.GroupVersionKind { func (c *daemonSetController) Cache() DaemonSetCache { return &daemonSetCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *daemonSetController) Create(obj *v1.DaemonSet) (*v1.DaemonSet, error) { - return c.clientGetter.DaemonSets(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.DaemonSet{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *daemonSetController) Update(obj *v1.DaemonSet) (*v1.DaemonSet, error) { - return c.clientGetter.DaemonSets(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.DaemonSet{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *daemonSetController) UpdateStatus(obj *v1.DaemonSet) (*v1.DaemonSet, error) { - return c.clientGetter.DaemonSets(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.DaemonSet{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *daemonSetController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.DaemonSets(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *daemonSetController) Get(namespace, name string, options metav1.GetOptions) (*v1.DaemonSet, error) { - return c.clientGetter.DaemonSets(namespace).Get(context.TODO(), name, options) + result := &v1.DaemonSet{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *daemonSetController) List(namespace string, opts metav1.ListOptions) (*v1.DaemonSetList, error) { - return c.clientGetter.DaemonSets(namespace).List(context.TODO(), opts) + result := &v1.DaemonSetList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *daemonSetController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.DaemonSets(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *daemonSetController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DaemonSet, err error) { - return c.clientGetter.DaemonSets(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *daemonSetController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.DaemonSet, error) { + result := &v1.DaemonSet{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type daemonSetCache struct { - lister listers.DaemonSetLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *daemonSetCache) Get(namespace, name string) (*v1.DaemonSet, error) { - return c.lister.DaemonSets(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.DaemonSet), nil } -func (c *daemonSetCache) List(namespace string, selector labels.Selector) ([]*v1.DaemonSet, error) { - return c.lister.DaemonSets(namespace).List(selector) +func (c *daemonSetCache) List(namespace string, selector labels.Selector) (ret []*v1.DaemonSet, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.DaemonSet)) + }) + + return ret, err } func (c *daemonSetCache) AddIndexer(indexName string, indexer DaemonSetIndexer) { @@ -299,12 +318,20 @@ func (a *daemonSetStatusHandler) sync(key string, obj *v1.DaemonSet) (*v1.Daemon } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *daemonSetGeneratingHandler) Remove(key string, obj *v1.DaemonSet) (*v1. } func (a *daemonSetGeneratingHandler) Handle(obj *v1.DaemonSet, status v1.DaemonSetStatus) (v1.DaemonSetStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.DaemonSetGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/deployment.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/deployment.go similarity index 76% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/deployment.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/deployment.go index 4f405391eb..2adb321e99 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/deployment.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/deployment.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/apps/v1" - clientset "k8s.io/client-go/kubernetes/typed/apps/v1" - listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type DeploymentCache interface { type DeploymentIndexer func(obj *v1.Deployment) ([]string, error) type deploymentController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.DeploymentsGetter - informer informers.DeploymentInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewDeploymentController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.DeploymentsGetter, informer informers.DeploymentInformer) DeploymentController { +func NewDeploymentController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) DeploymentController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &deploymentController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateDeploymentDeepCopyOnChange(client DeploymentClient, obj *v1.Deploymen } func (c *deploymentController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *deploymentController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *deploymentController) OnChange(ctx context.Context, name string, sync DeploymentHandler) { @@ -149,20 +151,19 @@ func (c *deploymentController) OnChange(ctx context.Context, name string, sync D } func (c *deploymentController) OnRemove(ctx context.Context, name string, sync DeploymentHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromDeploymentHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromDeploymentHandlerToHandler(sync))) } func (c *deploymentController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *deploymentController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *deploymentController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *deploymentController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *deploymentController) GroupVersionKind() schema.GroupVersionKind { func (c *deploymentController) Cache() DeploymentCache { return &deploymentCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *deploymentController) Create(obj *v1.Deployment) (*v1.Deployment, error) { - return c.clientGetter.Deployments(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Deployment{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *deploymentController) Update(obj *v1.Deployment) (*v1.Deployment, error) { - return c.clientGetter.Deployments(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Deployment{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *deploymentController) UpdateStatus(obj *v1.Deployment) (*v1.Deployment, error) { - return c.clientGetter.Deployments(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Deployment{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *deploymentController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Deployments(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *deploymentController) Get(namespace, name string, options metav1.GetOptions) (*v1.Deployment, error) { - return c.clientGetter.Deployments(namespace).Get(context.TODO(), name, options) + result := &v1.Deployment{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *deploymentController) List(namespace string, opts metav1.ListOptions) (*v1.DeploymentList, error) { - return c.clientGetter.Deployments(namespace).List(context.TODO(), opts) + result := &v1.DeploymentList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *deploymentController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Deployments(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *deploymentController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Deployment, err error) { - return c.clientGetter.Deployments(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *deploymentController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Deployment, error) { + result := &v1.Deployment{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type deploymentCache struct { - lister listers.DeploymentLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *deploymentCache) Get(namespace, name string) (*v1.Deployment, error) { - return c.lister.Deployments(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Deployment), nil } -func (c *deploymentCache) List(namespace string, selector labels.Selector) ([]*v1.Deployment, error) { - return c.lister.Deployments(namespace).List(selector) +func (c *deploymentCache) List(namespace string, selector labels.Selector) (ret []*v1.Deployment, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Deployment)) + }) + + return ret, err } func (c *deploymentCache) AddIndexer(indexName string, indexer DeploymentIndexer) { @@ -299,12 +318,20 @@ func (a *deploymentStatusHandler) sync(key string, obj *v1.Deployment) (*v1.Depl } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *deploymentGeneratingHandler) Remove(key string, obj *v1.Deployment) (*v } func (a *deploymentGeneratingHandler) Handle(obj *v1.Deployment, status v1.DeploymentStatus) (v1.DeploymentStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.DeploymentGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/interface.go similarity index 52% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/interface.go index 1436dddd23..c08a4c7efc 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/interface.go @@ -19,39 +19,38 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" v1 "k8s.io/api/apps/v1" - informers "k8s.io/client-go/informers/apps/v1" - clientset "k8s.io/client-go/kubernetes/typed/apps/v1" + "k8s.io/apimachinery/pkg/runtime/schema" ) +func init() { + schemes.Register(v1.AddToScheme) +} + type Interface interface { DaemonSet() DaemonSetController Deployment() DeploymentController StatefulSet() StatefulSetController } -func New(controllerManager *generic.ControllerManager, client clientset.AppsV1Interface, - informers informers.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, + controllerFactory: controllerFactory, } } type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.AppsV1Interface + controllerFactory controller.SharedControllerFactory } func (c *version) DaemonSet() DaemonSetController { - return NewDaemonSetController(v1.SchemeGroupVersion.WithKind("DaemonSet"), c.controllerManager, c.client, c.informers.DaemonSets()) + return NewDaemonSetController(schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "DaemonSet"}, "daemonsets", true, c.controllerFactory) } func (c *version) Deployment() DeploymentController { - return NewDeploymentController(v1.SchemeGroupVersion.WithKind("Deployment"), c.controllerManager, c.client, c.informers.Deployments()) + return NewDeploymentController(schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}, "deployments", true, c.controllerFactory) } func (c *version) StatefulSet() StatefulSetController { - return NewStatefulSetController(v1.SchemeGroupVersion.WithKind("StatefulSet"), c.controllerManager, c.client, c.informers.StatefulSets()) + return NewStatefulSetController(schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "StatefulSet"}, "statefulsets", true, c.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/statefulset.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/statefulset.go similarity index 76% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/statefulset.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/statefulset.go index 5b1b403635..a573f7c541 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1/statefulset.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/apps/v1/statefulset.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/apps/v1" - clientset "k8s.io/client-go/kubernetes/typed/apps/v1" - listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type StatefulSetCache interface { type StatefulSetIndexer func(obj *v1.StatefulSet) ([]string, error) type statefulSetController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.StatefulSetsGetter - informer informers.StatefulSetInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewStatefulSetController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.StatefulSetsGetter, informer informers.StatefulSetInformer) StatefulSetController { +func NewStatefulSetController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) StatefulSetController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &statefulSetController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateStatefulSetDeepCopyOnChange(client StatefulSetClient, obj *v1.Statefu } func (c *statefulSetController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *statefulSetController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *statefulSetController) OnChange(ctx context.Context, name string, sync StatefulSetHandler) { @@ -149,20 +151,19 @@ func (c *statefulSetController) OnChange(ctx context.Context, name string, sync } func (c *statefulSetController) OnRemove(ctx context.Context, name string, sync StatefulSetHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromStatefulSetHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromStatefulSetHandlerToHandler(sync))) } func (c *statefulSetController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *statefulSetController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *statefulSetController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *statefulSetController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *statefulSetController) GroupVersionKind() schema.GroupVersionKind { func (c *statefulSetController) Cache() StatefulSetCache { return &statefulSetCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *statefulSetController) Create(obj *v1.StatefulSet) (*v1.StatefulSet, error) { - return c.clientGetter.StatefulSets(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.StatefulSet{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *statefulSetController) Update(obj *v1.StatefulSet) (*v1.StatefulSet, error) { - return c.clientGetter.StatefulSets(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.StatefulSet{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *statefulSetController) UpdateStatus(obj *v1.StatefulSet) (*v1.StatefulSet, error) { - return c.clientGetter.StatefulSets(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.StatefulSet{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *statefulSetController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.StatefulSets(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *statefulSetController) Get(namespace, name string, options metav1.GetOptions) (*v1.StatefulSet, error) { - return c.clientGetter.StatefulSets(namespace).Get(context.TODO(), name, options) + result := &v1.StatefulSet{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *statefulSetController) List(namespace string, opts metav1.ListOptions) (*v1.StatefulSetList, error) { - return c.clientGetter.StatefulSets(namespace).List(context.TODO(), opts) + result := &v1.StatefulSetList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *statefulSetController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.StatefulSets(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *statefulSetController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.StatefulSet, err error) { - return c.clientGetter.StatefulSets(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *statefulSetController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.StatefulSet, error) { + result := &v1.StatefulSet{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type statefulSetCache struct { - lister listers.StatefulSetLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *statefulSetCache) Get(namespace, name string) (*v1.StatefulSet, error) { - return c.lister.StatefulSets(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.StatefulSet), nil } -func (c *statefulSetCache) List(namespace string, selector labels.Selector) ([]*v1.StatefulSet, error) { - return c.lister.StatefulSets(namespace).List(selector) +func (c *statefulSetCache) List(namespace string, selector labels.Selector) (ret []*v1.StatefulSet, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.StatefulSet)) + }) + + return ret, err } func (c *statefulSetCache) AddIndexer(indexName string, indexer StatefulSetIndexer) { @@ -299,12 +318,20 @@ func (a *statefulSetStatusHandler) sync(key string, obj *v1.StatefulSet) (*v1.St } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *statefulSetGeneratingHandler) Remove(key string, obj *v1.StatefulSet) ( } func (a *statefulSetGeneratingHandler) Handle(obj *v1.StatefulSet, status v1.StatefulSetStatus) (v1.StatefulSetStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.StatefulSetGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/factory.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/factory.go new file mode 100644 index 0000000000..6558b8d0ae --- /dev/null +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/factory.go @@ -0,0 +1,67 @@ +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by main. DO NOT EDIT. + +package batch + +import ( + "github.com/rancher/wrangler/pkg/generic" + "k8s.io/client-go/rest" +) + +type Factory struct { + *generic.Factory +} + +func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { + f, err := NewFactoryFromConfig(config) + if err != nil { + panic(err) + } + return f +} + +func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, nil) +} + +func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ + Namespace: namespace, + }) +} + +type FactoryOptions = generic.FactoryOptions + +func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) + return &Factory{ + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) + } + return f +} + +func (c *Factory) Batch() Interface { + return New(c.ControllerFactory()) +} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/interface.go similarity index 55% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/interface.go index 77da90250d..a078bf8e5e 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/interface.go @@ -19,10 +19,8 @@ limitations under the License. package batch import ( - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1" - "github.com/rancher/wrangler/pkg/generic" - informers "k8s.io/client-go/informers/batch" - clientset "k8s.io/client-go/kubernetes" + "github.com/rancher/lasso/pkg/controller" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.BatchV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/interface.go similarity index 55% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/interface.go index 27edcfb5de..abaf5ad5c8 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/interface.go @@ -19,31 +19,30 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" v1 "k8s.io/api/batch/v1" - informers "k8s.io/client-go/informers/batch/v1" - clientset "k8s.io/client-go/kubernetes/typed/batch/v1" + "k8s.io/apimachinery/pkg/runtime/schema" ) +func init() { + schemes.Register(v1.AddToScheme) +} + type Interface interface { Job() JobController } -func New(controllerManager *generic.ControllerManager, client clientset.BatchV1Interface, - informers informers.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, + controllerFactory: controllerFactory, } } type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.BatchV1Interface + controllerFactory controller.SharedControllerFactory } func (c *version) Job() JobController { - return NewJobController(v1.SchemeGroupVersion.WithKind("Job"), c.controllerManager, c.client, c.informers.Jobs()) + return NewJobController(schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"}, "jobs", true, c.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/job.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/job.go similarity index 75% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/job.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/job.go index 09b1e3ac75..ca5b9355f7 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1/job.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/batch/v1/job.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/batch/v1" - clientset "k8s.io/client-go/kubernetes/typed/batch/v1" - listers "k8s.io/client-go/listers/batch/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type JobCache interface { type JobIndexer func(obj *v1.Job) ([]string, error) type jobController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.JobsGetter - informer informers.JobInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewJobController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.JobsGetter, informer informers.JobInformer) JobController { +func NewJobController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) JobController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &jobController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateJobDeepCopyOnChange(client JobClient, obj *v1.Job, handler func(obj * } func (c *jobController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *jobController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *jobController) OnChange(ctx context.Context, name string, sync JobHandler) { @@ -149,20 +151,19 @@ func (c *jobController) OnChange(ctx context.Context, name string, sync JobHandl } func (c *jobController) OnRemove(ctx context.Context, name string, sync JobHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromJobHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromJobHandlerToHandler(sync))) } func (c *jobController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *jobController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *jobController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *jobController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *jobController) GroupVersionKind() schema.GroupVersionKind { func (c *jobController) Cache() JobCache { return &jobCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *jobController) Create(obj *v1.Job) (*v1.Job, error) { - return c.clientGetter.Jobs(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Job{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *jobController) Update(obj *v1.Job) (*v1.Job, error) { - return c.clientGetter.Jobs(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Job{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *jobController) UpdateStatus(obj *v1.Job) (*v1.Job, error) { - return c.clientGetter.Jobs(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Job{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *jobController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Jobs(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *jobController) Get(namespace, name string, options metav1.GetOptions) (*v1.Job, error) { - return c.clientGetter.Jobs(namespace).Get(context.TODO(), name, options) + result := &v1.Job{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *jobController) List(namespace string, opts metav1.ListOptions) (*v1.JobList, error) { - return c.clientGetter.Jobs(namespace).List(context.TODO(), opts) + result := &v1.JobList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *jobController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Jobs(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *jobController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) { - return c.clientGetter.Jobs(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *jobController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Job, error) { + result := &v1.Job{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type jobCache struct { - lister listers.JobLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *jobCache) Get(namespace, name string) (*v1.Job, error) { - return c.lister.Jobs(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Job), nil } -func (c *jobCache) List(namespace string, selector labels.Selector) ([]*v1.Job, error) { - return c.lister.Jobs(namespace).List(selector) +func (c *jobCache) List(namespace string, selector labels.Selector) (ret []*v1.Job, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Job)) + }) + + return ret, err } func (c *jobCache) AddIndexer(indexName string, indexer JobIndexer) { @@ -299,12 +318,20 @@ func (a *jobStatusHandler) sync(key string, obj *v1.Job) (*v1.Job, error) { } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *jobGeneratingHandler) Remove(key string, obj *v1.Job) (*v1.Job, error) } func (a *jobGeneratingHandler) Handle(obj *v1.Job, status v1.JobStatus) (v1.JobStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.JobGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/factory.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/factory.go new file mode 100644 index 0000000000..8a8ad7f6f4 --- /dev/null +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/factory.go @@ -0,0 +1,67 @@ +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by main. DO NOT EDIT. + +package core + +import ( + "github.com/rancher/wrangler/pkg/generic" + "k8s.io/client-go/rest" +) + +type Factory struct { + *generic.Factory +} + +func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { + f, err := NewFactoryFromConfig(config) + if err != nil { + panic(err) + } + return f +} + +func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, nil) +} + +func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ + Namespace: namespace, + }) +} + +type FactoryOptions = generic.FactoryOptions + +func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) + return &Factory{ + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) + } + return f +} + +func (c *Factory) Core() Interface { + return New(c.ControllerFactory()) +} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/interface.go similarity index 56% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/interface.go index 51d1216ed9..689915f184 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/interface.go @@ -19,10 +19,8 @@ limitations under the License. package core import ( - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/generic" - informers "k8s.io/client-go/informers/core" - clientset "k8s.io/client-go/kubernetes" + "github.com/rancher/lasso/pkg/controller" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.CoreV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/configmap.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/configmap.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/configmap.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/configmap.go index 334ad0a861..d56e1d87b4 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/configmap.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/configmap.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type ConfigMapCache interface { type ConfigMapIndexer func(obj *v1.ConfigMap) ([]string, error) type configMapController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.ConfigMapsGetter - informer informers.ConfigMapInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewConfigMapController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.ConfigMapsGetter, informer informers.ConfigMapInformer) ConfigMapController { +func NewConfigMapController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) ConfigMapController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &configMapController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateConfigMapDeepCopyOnChange(client ConfigMapClient, obj *v1.ConfigMap, } func (c *configMapController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *configMapController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *configMapController) OnChange(ctx context.Context, name string, sync ConfigMapHandler) { @@ -145,20 +148,19 @@ func (c *configMapController) OnChange(ctx context.Context, name string, sync Co } func (c *configMapController) OnRemove(ctx context.Context, name string, sync ConfigMapHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromConfigMapHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromConfigMapHandlerToHandler(sync))) } func (c *configMapController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *configMapController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *configMapController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *configMapController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *configMapController) GroupVersionKind() schema.GroupVersionKind { func (c *configMapController) Cache() ConfigMapCache { return &configMapCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *configMapController) Create(obj *v1.ConfigMap) (*v1.ConfigMap, error) { - return c.clientGetter.ConfigMaps(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.ConfigMap{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *configMapController) Update(obj *v1.ConfigMap) (*v1.ConfigMap, error) { - return c.clientGetter.ConfigMaps(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.ConfigMap{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *configMapController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.ConfigMaps(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *configMapController) Get(namespace, name string, options metav1.GetOptions) (*v1.ConfigMap, error) { - return c.clientGetter.ConfigMaps(namespace).Get(context.TODO(), name, options) + result := &v1.ConfigMap{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *configMapController) List(namespace string, opts metav1.ListOptions) (*v1.ConfigMapList, error) { - return c.clientGetter.ConfigMaps(namespace).List(context.TODO(), opts) + result := &v1.ConfigMapList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *configMapController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.ConfigMaps(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *configMapController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { - return c.clientGetter.ConfigMaps(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *configMapController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.ConfigMap, error) { + result := &v1.ConfigMap{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type configMapCache struct { - lister listers.ConfigMapLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *configMapCache) Get(namespace, name string) (*v1.ConfigMap, error) { - return c.lister.ConfigMaps(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.ConfigMap), nil } -func (c *configMapCache) List(namespace string, selector labels.Selector) ([]*v1.ConfigMap, error) { - return c.lister.ConfigMaps(namespace).List(selector) +func (c *configMapCache) List(namespace string, selector labels.Selector) (ret []*v1.ConfigMap, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.ConfigMap)) + }) + + return ret, err } func (c *configMapCache) AddIndexer(indexName string, indexer ConfigMapIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/endpoints.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/endpoints.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/endpoints.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/endpoints.go index bbd7cf4b24..742c38be00 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/endpoints.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/endpoints.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type EndpointsCache interface { type EndpointsIndexer func(obj *v1.Endpoints) ([]string, error) type endpointsController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.EndpointsGetter - informer informers.EndpointsInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewEndpointsController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.EndpointsGetter, informer informers.EndpointsInformer) EndpointsController { +func NewEndpointsController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) EndpointsController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &endpointsController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateEndpointsDeepCopyOnChange(client EndpointsClient, obj *v1.Endpoints, } func (c *endpointsController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *endpointsController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *endpointsController) OnChange(ctx context.Context, name string, sync EndpointsHandler) { @@ -145,20 +148,19 @@ func (c *endpointsController) OnChange(ctx context.Context, name string, sync En } func (c *endpointsController) OnRemove(ctx context.Context, name string, sync EndpointsHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromEndpointsHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromEndpointsHandlerToHandler(sync))) } func (c *endpointsController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *endpointsController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *endpointsController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *endpointsController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *endpointsController) GroupVersionKind() schema.GroupVersionKind { func (c *endpointsController) Cache() EndpointsCache { return &endpointsCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *endpointsController) Create(obj *v1.Endpoints) (*v1.Endpoints, error) { - return c.clientGetter.Endpoints(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Endpoints{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *endpointsController) Update(obj *v1.Endpoints) (*v1.Endpoints, error) { - return c.clientGetter.Endpoints(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Endpoints{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *endpointsController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Endpoints(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *endpointsController) Get(namespace, name string, options metav1.GetOptions) (*v1.Endpoints, error) { - return c.clientGetter.Endpoints(namespace).Get(context.TODO(), name, options) + result := &v1.Endpoints{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *endpointsController) List(namespace string, opts metav1.ListOptions) (*v1.EndpointsList, error) { - return c.clientGetter.Endpoints(namespace).List(context.TODO(), opts) + result := &v1.EndpointsList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *endpointsController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Endpoints(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *endpointsController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error) { - return c.clientGetter.Endpoints(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *endpointsController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Endpoints, error) { + result := &v1.Endpoints{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type endpointsCache struct { - lister listers.EndpointsLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *endpointsCache) Get(namespace, name string) (*v1.Endpoints, error) { - return c.lister.Endpoints(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Endpoints), nil } -func (c *endpointsCache) List(namespace string, selector labels.Selector) ([]*v1.Endpoints, error) { - return c.lister.Endpoints(namespace).List(selector) +func (c *endpointsCache) List(namespace string, selector labels.Selector) (ret []*v1.Endpoints, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Endpoints)) + }) + + return ret, err } func (c *endpointsCache) AddIndexer(indexName string, indexer EndpointsIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/event.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/event.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/event.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/event.go index 7f1387661b..b052ef91ac 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/event.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/event.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type EventCache interface { type EventIndexer func(obj *v1.Event) ([]string, error) type eventController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.EventsGetter - informer informers.EventInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewEventController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.EventsGetter, informer informers.EventInformer) EventController { +func NewEventController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) EventController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &eventController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateEventDeepCopyOnChange(client EventClient, obj *v1.Event, handler func } func (c *eventController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *eventController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *eventController) OnChange(ctx context.Context, name string, sync EventHandler) { @@ -145,20 +148,19 @@ func (c *eventController) OnChange(ctx context.Context, name string, sync EventH } func (c *eventController) OnRemove(ctx context.Context, name string, sync EventHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromEventHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromEventHandlerToHandler(sync))) } func (c *eventController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *eventController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *eventController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *eventController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *eventController) GroupVersionKind() schema.GroupVersionKind { func (c *eventController) Cache() EventCache { return &eventCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *eventController) Create(obj *v1.Event) (*v1.Event, error) { - return c.clientGetter.Events(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Event{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *eventController) Update(obj *v1.Event) (*v1.Event, error) { - return c.clientGetter.Events(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Event{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *eventController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Events(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *eventController) Get(namespace, name string, options metav1.GetOptions) (*v1.Event, error) { - return c.clientGetter.Events(namespace).Get(context.TODO(), name, options) + result := &v1.Event{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *eventController) List(namespace string, opts metav1.ListOptions) (*v1.EventList, error) { - return c.clientGetter.Events(namespace).List(context.TODO(), opts) + result := &v1.EventList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *eventController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Events(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *eventController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { - return c.clientGetter.Events(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *eventController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Event, error) { + result := &v1.Event{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type eventCache struct { - lister listers.EventLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *eventCache) Get(namespace, name string) (*v1.Event, error) { - return c.lister.Events(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Event), nil } -func (c *eventCache) List(namespace string, selector labels.Selector) ([]*v1.Event, error) { - return c.lister.Events(namespace).List(selector) +func (c *eventCache) List(namespace string, selector labels.Selector) (ret []*v1.Event, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Event)) + }) + + return ret, err } func (c *eventCache) AddIndexer(indexName string, indexer EventIndexer) { diff --git a/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/interface.go new file mode 100644 index 0000000000..8439e33977 --- /dev/null +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/interface.go @@ -0,0 +1,84 @@ +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by main. DO NOT EDIT. + +package v1 + +import ( + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +func init() { + schemes.Register(v1.AddToScheme) +} + +type Interface interface { + ConfigMap() ConfigMapController + Endpoints() EndpointsController + Event() EventController + Namespace() NamespaceController + Node() NodeController + PersistentVolumeClaim() PersistentVolumeClaimController + Pod() PodController + Secret() SecretController + Service() ServiceController + ServiceAccount() ServiceAccountController +} + +func New(controllerFactory controller.SharedControllerFactory) Interface { + return &version{ + controllerFactory: controllerFactory, + } +} + +type version struct { + controllerFactory controller.SharedControllerFactory +} + +func (c *version) ConfigMap() ConfigMapController { + return NewConfigMapController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "ConfigMap"}, "configmaps", true, c.controllerFactory) +} +func (c *version) Endpoints() EndpointsController { + return NewEndpointsController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Endpoints"}, "endpoints", true, c.controllerFactory) +} +func (c *version) Event() EventController { + return NewEventController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Event"}, "events", true, c.controllerFactory) +} +func (c *version) Namespace() NamespaceController { + return NewNamespaceController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Namespace"}, "namespaces", false, c.controllerFactory) +} +func (c *version) Node() NodeController { + return NewNodeController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Node"}, "nodes", false, c.controllerFactory) +} +func (c *version) PersistentVolumeClaim() PersistentVolumeClaimController { + return NewPersistentVolumeClaimController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "PersistentVolumeClaim"}, "persistentvolumeclaims", true, c.controllerFactory) +} +func (c *version) Pod() PodController { + return NewPodController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"}, "pods", true, c.controllerFactory) +} +func (c *version) Secret() SecretController { + return NewSecretController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Secret"}, "secrets", true, c.controllerFactory) +} +func (c *version) Service() ServiceController { + return NewServiceController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Service"}, "services", true, c.controllerFactory) +} +func (c *version) ServiceAccount() ServiceAccountController { + return NewServiceAccountController(schema.GroupVersionKind{Group: "", Version: "v1", Kind: "ServiceAccount"}, "serviceaccounts", true, c.controllerFactory) +} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/namespace.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/namespace.go similarity index 76% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/namespace.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/namespace.go index 14f4a090dd..83d04ac6b9 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/namespace.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/namespace.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type NamespaceCache interface { type NamespaceIndexer func(obj *v1.Namespace) ([]string, error) type namespaceController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.NamespacesGetter - informer informers.NamespaceInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewNamespaceController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.NamespacesGetter, informer informers.NamespaceInformer) NamespaceController { +func NewNamespaceController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) NamespaceController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &namespaceController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateNamespaceDeepCopyOnChange(client NamespaceClient, obj *v1.Namespace, } func (c *namespaceController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *namespaceController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *namespaceController) OnChange(ctx context.Context, name string, sync NamespaceHandler) { @@ -149,20 +151,19 @@ func (c *namespaceController) OnChange(ctx context.Context, name string, sync Na } func (c *namespaceController) OnRemove(ctx context.Context, name string, sync NamespaceHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromNamespaceHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromNamespaceHandlerToHandler(sync))) } func (c *namespaceController) Enqueue(name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), "", name) + c.controller.Enqueue("", name) } func (c *namespaceController) EnqueueAfter(name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), "", name, duration) + c.controller.EnqueueAfter("", name, duration) } func (c *namespaceController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *namespaceController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *namespaceController) GroupVersionKind() schema.GroupVersionKind { func (c *namespaceController) Cache() NamespaceCache { return &namespaceCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *namespaceController) Create(obj *v1.Namespace) (*v1.Namespace, error) { - return c.clientGetter.Namespaces().Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Namespace{} + return result, c.client.Create(context.TODO(), "", obj, result, metav1.CreateOptions{}) } func (c *namespaceController) Update(obj *v1.Namespace) (*v1.Namespace, error) { - return c.clientGetter.Namespaces().Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Namespace{} + return result, c.client.Update(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *namespaceController) UpdateStatus(obj *v1.Namespace) (*v1.Namespace, error) { - return c.clientGetter.Namespaces().UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Namespace{} + return result, c.client.UpdateStatus(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *namespaceController) Delete(name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Namespaces().Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), "", name, *options) } func (c *namespaceController) Get(name string, options metav1.GetOptions) (*v1.Namespace, error) { - return c.clientGetter.Namespaces().Get(context.TODO(), name, options) + result := &v1.Namespace{} + return result, c.client.Get(context.TODO(), "", name, result, options) } func (c *namespaceController) List(opts metav1.ListOptions) (*v1.NamespaceList, error) { - return c.clientGetter.Namespaces().List(context.TODO(), opts) + result := &v1.NamespaceList{} + return result, c.client.List(context.TODO(), "", result, opts) } func (c *namespaceController) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Namespaces().Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), "", opts) } -func (c *namespaceController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { - return c.clientGetter.Namespaces().Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *namespaceController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Namespace, error) { + result := &v1.Namespace{} + return result, c.client.Patch(context.TODO(), "", name, pt, data, result, metav1.PatchOptions{}, subresources...) } type namespaceCache struct { - lister listers.NamespaceLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *namespaceCache) Get(name string) (*v1.Namespace, error) { - return c.lister.Get(name) + obj, exists, err := c.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Namespace), nil } -func (c *namespaceCache) List(selector labels.Selector) ([]*v1.Namespace, error) { - return c.lister.List(selector) +func (c *namespaceCache) List(selector labels.Selector) (ret []*v1.Namespace, err error) { + + err = cache.ListAll(c.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Namespace)) + }) + + return ret, err } func (c *namespaceCache) AddIndexer(indexName string, indexer NamespaceIndexer) { @@ -299,12 +318,20 @@ func (a *namespaceStatusHandler) sync(key string, obj *v1.Namespace) (*v1.Namesp } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *namespaceGeneratingHandler) Remove(key string, obj *v1.Namespace) (*v1. } func (a *namespaceGeneratingHandler) Handle(obj *v1.Namespace, status v1.NamespaceStatus) (v1.NamespaceStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.NamespaceGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/node.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/node.go similarity index 75% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/node.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/node.go index 1ef583d47d..b444b33c3c 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/node.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/node.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type NodeCache interface { type NodeIndexer func(obj *v1.Node) ([]string, error) type nodeController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.NodesGetter - informer informers.NodeInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewNodeController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.NodesGetter, informer informers.NodeInformer) NodeController { +func NewNodeController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) NodeController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &nodeController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateNodeDeepCopyOnChange(client NodeClient, obj *v1.Node, handler func(ob } func (c *nodeController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *nodeController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *nodeController) OnChange(ctx context.Context, name string, sync NodeHandler) { @@ -149,20 +151,19 @@ func (c *nodeController) OnChange(ctx context.Context, name string, sync NodeHan } func (c *nodeController) OnRemove(ctx context.Context, name string, sync NodeHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromNodeHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromNodeHandlerToHandler(sync))) } func (c *nodeController) Enqueue(name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), "", name) + c.controller.Enqueue("", name) } func (c *nodeController) EnqueueAfter(name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), "", name, duration) + c.controller.EnqueueAfter("", name, duration) } func (c *nodeController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *nodeController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *nodeController) GroupVersionKind() schema.GroupVersionKind { func (c *nodeController) Cache() NodeCache { return &nodeCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *nodeController) Create(obj *v1.Node) (*v1.Node, error) { - return c.clientGetter.Nodes().Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Node{} + return result, c.client.Create(context.TODO(), "", obj, result, metav1.CreateOptions{}) } func (c *nodeController) Update(obj *v1.Node) (*v1.Node, error) { - return c.clientGetter.Nodes().Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Node{} + return result, c.client.Update(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *nodeController) UpdateStatus(obj *v1.Node) (*v1.Node, error) { - return c.clientGetter.Nodes().UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Node{} + return result, c.client.UpdateStatus(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *nodeController) Delete(name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Nodes().Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), "", name, *options) } func (c *nodeController) Get(name string, options metav1.GetOptions) (*v1.Node, error) { - return c.clientGetter.Nodes().Get(context.TODO(), name, options) + result := &v1.Node{} + return result, c.client.Get(context.TODO(), "", name, result, options) } func (c *nodeController) List(opts metav1.ListOptions) (*v1.NodeList, error) { - return c.clientGetter.Nodes().List(context.TODO(), opts) + result := &v1.NodeList{} + return result, c.client.List(context.TODO(), "", result, opts) } func (c *nodeController) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Nodes().Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), "", opts) } -func (c *nodeController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Node, err error) { - return c.clientGetter.Nodes().Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *nodeController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Node, error) { + result := &v1.Node{} + return result, c.client.Patch(context.TODO(), "", name, pt, data, result, metav1.PatchOptions{}, subresources...) } type nodeCache struct { - lister listers.NodeLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *nodeCache) Get(name string) (*v1.Node, error) { - return c.lister.Get(name) + obj, exists, err := c.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Node), nil } -func (c *nodeCache) List(selector labels.Selector) ([]*v1.Node, error) { - return c.lister.List(selector) +func (c *nodeCache) List(selector labels.Selector) (ret []*v1.Node, err error) { + + err = cache.ListAll(c.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Node)) + }) + + return ret, err } func (c *nodeCache) AddIndexer(indexName string, indexer NodeIndexer) { @@ -299,12 +318,20 @@ func (a *nodeStatusHandler) sync(key string, obj *v1.Node) (*v1.Node, error) { } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *nodeGeneratingHandler) Remove(key string, obj *v1.Node) (*v1.Node, erro } func (a *nodeGeneratingHandler) Handle(obj *v1.Node, status v1.NodeStatus) (v1.NodeStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.NodeGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/persistentvolumeclaim.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/persistentvolumeclaim.go similarity index 78% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/persistentvolumeclaim.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/persistentvolumeclaim.go index be41b9acd1..5fbce6d885 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/persistentvolumeclaim.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/persistentvolumeclaim.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type PersistentVolumeClaimCache interface { type PersistentVolumeClaimIndexer func(obj *v1.PersistentVolumeClaim) ([]string, error) type persistentVolumeClaimController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.PersistentVolumeClaimsGetter - informer informers.PersistentVolumeClaimInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewPersistentVolumeClaimController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.PersistentVolumeClaimsGetter, informer informers.PersistentVolumeClaimInformer) PersistentVolumeClaimController { +func NewPersistentVolumeClaimController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) PersistentVolumeClaimController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &persistentVolumeClaimController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdatePersistentVolumeClaimDeepCopyOnChange(client PersistentVolumeClaimCli } func (c *persistentVolumeClaimController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *persistentVolumeClaimController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *persistentVolumeClaimController) OnChange(ctx context.Context, name string, sync PersistentVolumeClaimHandler) { @@ -149,20 +151,19 @@ func (c *persistentVolumeClaimController) OnChange(ctx context.Context, name str } func (c *persistentVolumeClaimController) OnRemove(ctx context.Context, name string, sync PersistentVolumeClaimHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromPersistentVolumeClaimHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromPersistentVolumeClaimHandlerToHandler(sync))) } func (c *persistentVolumeClaimController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *persistentVolumeClaimController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *persistentVolumeClaimController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *persistentVolumeClaimController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *persistentVolumeClaimController) GroupVersionKind() schema.GroupVersion func (c *persistentVolumeClaimController) Cache() PersistentVolumeClaimCache { return &persistentVolumeClaimCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *persistentVolumeClaimController) Create(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { - return c.clientGetter.PersistentVolumeClaims(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.PersistentVolumeClaim{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *persistentVolumeClaimController) Update(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { - return c.clientGetter.PersistentVolumeClaims(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.PersistentVolumeClaim{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *persistentVolumeClaimController) UpdateStatus(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { - return c.clientGetter.PersistentVolumeClaims(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.PersistentVolumeClaim{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *persistentVolumeClaimController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.PersistentVolumeClaims(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *persistentVolumeClaimController) Get(namespace, name string, options metav1.GetOptions) (*v1.PersistentVolumeClaim, error) { - return c.clientGetter.PersistentVolumeClaims(namespace).Get(context.TODO(), name, options) + result := &v1.PersistentVolumeClaim{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *persistentVolumeClaimController) List(namespace string, opts metav1.ListOptions) (*v1.PersistentVolumeClaimList, error) { - return c.clientGetter.PersistentVolumeClaims(namespace).List(context.TODO(), opts) + result := &v1.PersistentVolumeClaimList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *persistentVolumeClaimController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.PersistentVolumeClaims(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *persistentVolumeClaimController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error) { - return c.clientGetter.PersistentVolumeClaims(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *persistentVolumeClaimController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.PersistentVolumeClaim, error) { + result := &v1.PersistentVolumeClaim{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type persistentVolumeClaimCache struct { - lister listers.PersistentVolumeClaimLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *persistentVolumeClaimCache) Get(namespace, name string) (*v1.PersistentVolumeClaim, error) { - return c.lister.PersistentVolumeClaims(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.PersistentVolumeClaim), nil } -func (c *persistentVolumeClaimCache) List(namespace string, selector labels.Selector) ([]*v1.PersistentVolumeClaim, error) { - return c.lister.PersistentVolumeClaims(namespace).List(selector) +func (c *persistentVolumeClaimCache) List(namespace string, selector labels.Selector) (ret []*v1.PersistentVolumeClaim, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.PersistentVolumeClaim)) + }) + + return ret, err } func (c *persistentVolumeClaimCache) AddIndexer(indexName string, indexer PersistentVolumeClaimIndexer) { @@ -299,12 +318,20 @@ func (a *persistentVolumeClaimStatusHandler) sync(key string, obj *v1.Persistent } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *persistentVolumeClaimGeneratingHandler) Remove(key string, obj *v1.Pers } func (a *persistentVolumeClaimGeneratingHandler) Handle(obj *v1.PersistentVolumeClaim, status v1.PersistentVolumeClaimStatus) (v1.PersistentVolumeClaimStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.PersistentVolumeClaimGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/pod.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/pod.go similarity index 75% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/pod.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/pod.go index e808414d49..4286bcf56e 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/pod.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/pod.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type PodCache interface { type PodIndexer func(obj *v1.Pod) ([]string, error) type podController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.PodsGetter - informer informers.PodInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewPodController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.PodsGetter, informer informers.PodInformer) PodController { +func NewPodController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) PodController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &podController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdatePodDeepCopyOnChange(client PodClient, obj *v1.Pod, handler func(obj * } func (c *podController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *podController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *podController) OnChange(ctx context.Context, name string, sync PodHandler) { @@ -149,20 +151,19 @@ func (c *podController) OnChange(ctx context.Context, name string, sync PodHandl } func (c *podController) OnRemove(ctx context.Context, name string, sync PodHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromPodHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromPodHandlerToHandler(sync))) } func (c *podController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *podController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *podController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *podController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *podController) GroupVersionKind() schema.GroupVersionKind { func (c *podController) Cache() PodCache { return &podCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *podController) Create(obj *v1.Pod) (*v1.Pod, error) { - return c.clientGetter.Pods(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Pod{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *podController) Update(obj *v1.Pod) (*v1.Pod, error) { - return c.clientGetter.Pods(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Pod{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *podController) UpdateStatus(obj *v1.Pod) (*v1.Pod, error) { - return c.clientGetter.Pods(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Pod{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *podController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Pods(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *podController) Get(namespace, name string, options metav1.GetOptions) (*v1.Pod, error) { - return c.clientGetter.Pods(namespace).Get(context.TODO(), name, options) + result := &v1.Pod{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *podController) List(namespace string, opts metav1.ListOptions) (*v1.PodList, error) { - return c.clientGetter.Pods(namespace).List(context.TODO(), opts) + result := &v1.PodList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *podController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Pods(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *podController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error) { - return c.clientGetter.Pods(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *podController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Pod, error) { + result := &v1.Pod{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type podCache struct { - lister listers.PodLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *podCache) Get(namespace, name string) (*v1.Pod, error) { - return c.lister.Pods(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Pod), nil } -func (c *podCache) List(namespace string, selector labels.Selector) ([]*v1.Pod, error) { - return c.lister.Pods(namespace).List(selector) +func (c *podCache) List(namespace string, selector labels.Selector) (ret []*v1.Pod, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Pod)) + }) + + return ret, err } func (c *podCache) AddIndexer(indexName string, indexer PodIndexer) { @@ -299,12 +318,20 @@ func (a *podStatusHandler) sync(key string, obj *v1.Pod) (*v1.Pod, error) { } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *podGeneratingHandler) Remove(key string, obj *v1.Pod) (*v1.Pod, error) } func (a *podGeneratingHandler) Handle(obj *v1.Pod, status v1.PodStatus) (v1.PodStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.PodGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/secret.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/secret.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/secret.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/secret.go index c91479a5c8..55cc637076 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/secret.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/secret.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type SecretCache interface { type SecretIndexer func(obj *v1.Secret) ([]string, error) type secretController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.SecretsGetter - informer informers.SecretInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewSecretController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.SecretsGetter, informer informers.SecretInformer) SecretController { +func NewSecretController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) SecretController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &secretController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateSecretDeepCopyOnChange(client SecretClient, obj *v1.Secret, handler f } func (c *secretController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *secretController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *secretController) OnChange(ctx context.Context, name string, sync SecretHandler) { @@ -145,20 +148,19 @@ func (c *secretController) OnChange(ctx context.Context, name string, sync Secre } func (c *secretController) OnRemove(ctx context.Context, name string, sync SecretHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromSecretHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromSecretHandlerToHandler(sync))) } func (c *secretController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *secretController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *secretController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *secretController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *secretController) GroupVersionKind() schema.GroupVersionKind { func (c *secretController) Cache() SecretCache { return &secretCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *secretController) Create(obj *v1.Secret) (*v1.Secret, error) { - return c.clientGetter.Secrets(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Secret{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *secretController) Update(obj *v1.Secret) (*v1.Secret, error) { - return c.clientGetter.Secrets(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Secret{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *secretController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Secrets(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *secretController) Get(namespace, name string, options metav1.GetOptions) (*v1.Secret, error) { - return c.clientGetter.Secrets(namespace).Get(context.TODO(), name, options) + result := &v1.Secret{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *secretController) List(namespace string, opts metav1.ListOptions) (*v1.SecretList, error) { - return c.clientGetter.Secrets(namespace).List(context.TODO(), opts) + result := &v1.SecretList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *secretController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Secrets(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *secretController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { - return c.clientGetter.Secrets(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *secretController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Secret, error) { + result := &v1.Secret{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type secretCache struct { - lister listers.SecretLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *secretCache) Get(namespace, name string) (*v1.Secret, error) { - return c.lister.Secrets(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Secret), nil } -func (c *secretCache) List(namespace string, selector labels.Selector) ([]*v1.Secret, error) { - return c.lister.Secrets(namespace).List(selector) +func (c *secretCache) List(namespace string, selector labels.Selector) (ret []*v1.Secret, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Secret)) + }) + + return ret, err } func (c *secretCache) AddIndexer(indexName string, indexer SecretIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/service.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/service.go similarity index 76% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/service.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/service.go index 28fba8f794..4802feb6ba 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/service.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/service.go @@ -22,6 +22,8 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" @@ -36,9 +38,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -78,18 +77,22 @@ type ServiceCache interface { type ServiceIndexer func(obj *v1.Service) ([]string, error) type serviceController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.ServicesGetter - informer informers.ServiceInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewServiceController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.ServicesGetter, informer informers.ServiceInformer) ServiceController { +func NewServiceController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) ServiceController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &serviceController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -136,12 +139,11 @@ func UpdateServiceDeepCopyOnChange(client ServiceClient, obj *v1.Service, handle } func (c *serviceController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *serviceController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *serviceController) OnChange(ctx context.Context, name string, sync ServiceHandler) { @@ -149,20 +151,19 @@ func (c *serviceController) OnChange(ctx context.Context, name string, sync Serv } func (c *serviceController) OnRemove(ctx context.Context, name string, sync ServiceHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromServiceHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromServiceHandlerToHandler(sync))) } func (c *serviceController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *serviceController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *serviceController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *serviceController) GroupVersionKind() schema.GroupVersionKind { @@ -171,57 +172,75 @@ func (c *serviceController) GroupVersionKind() schema.GroupVersionKind { func (c *serviceController) Cache() ServiceCache { return &serviceCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *serviceController) Create(obj *v1.Service) (*v1.Service, error) { - return c.clientGetter.Services(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Service{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *serviceController) Update(obj *v1.Service) (*v1.Service, error) { - return c.clientGetter.Services(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Service{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *serviceController) UpdateStatus(obj *v1.Service) (*v1.Service, error) { - return c.clientGetter.Services(obj.Namespace).UpdateStatus(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Service{} + return result, c.client.UpdateStatus(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *serviceController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Services(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *serviceController) Get(namespace, name string, options metav1.GetOptions) (*v1.Service, error) { - return c.clientGetter.Services(namespace).Get(context.TODO(), name, options) + result := &v1.Service{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *serviceController) List(namespace string, opts metav1.ListOptions) (*v1.ServiceList, error) { - return c.clientGetter.Services(namespace).List(context.TODO(), opts) + result := &v1.ServiceList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *serviceController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Services(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *serviceController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { - return c.clientGetter.Services(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *serviceController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Service, error) { + result := &v1.Service{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type serviceCache struct { - lister listers.ServiceLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *serviceCache) Get(namespace, name string) (*v1.Service, error) { - return c.lister.Services(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Service), nil } -func (c *serviceCache) List(namespace string, selector labels.Selector) ([]*v1.Service, error) { - return c.lister.Services(namespace).List(selector) +func (c *serviceCache) List(namespace string, selector labels.Selector) (ret []*v1.Service, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Service)) + }) + + return ret, err } func (c *serviceCache) AddIndexer(indexName string, indexer ServiceIndexer) { @@ -299,12 +318,20 @@ func (a *serviceStatusHandler) sync(key string, obj *v1.Service) (*v1.Service, e } } if !equality.Semantic.DeepEqual(origStatus, &newStatus) { + if a.condition != "" { + // Since status has changed, update the lastUpdatedTime + a.condition.LastUpdated(&newStatus, time.Now().UTC().Format(time.RFC3339)) + } + var newErr error obj.Status = newStatus - obj, newErr = a.client.UpdateStatus(obj) + newObj, newErr := a.client.UpdateStatus(obj) if err == nil { err = newErr } + if newErr == nil { + obj = newObj + } } return obj, err } @@ -333,6 +360,10 @@ func (a *serviceGeneratingHandler) Remove(key string, obj *v1.Service) (*v1.Serv } func (a *serviceGeneratingHandler) Handle(obj *v1.Service, status v1.ServiceStatus) (v1.ServiceStatus, error) { + if !obj.DeletionTimestamp.IsZero() { + return status, nil + } + objs, newStatus, err := a.ServiceGeneratingHandler(obj, status) if err != nil { return newStatus, err diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/serviceaccount.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/serviceaccount.go similarity index 71% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/serviceaccount.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/serviceaccount.go index abfb22f450..f9a81cc8fa 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1/serviceaccount.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/core/v1/serviceaccount.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/core/v1" - clientset "k8s.io/client-go/kubernetes/typed/core/v1" - listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type ServiceAccountCache interface { type ServiceAccountIndexer func(obj *v1.ServiceAccount) ([]string, error) type serviceAccountController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.ServiceAccountsGetter - informer informers.ServiceAccountInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewServiceAccountController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.ServiceAccountsGetter, informer informers.ServiceAccountInformer) ServiceAccountController { +func NewServiceAccountController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) ServiceAccountController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &serviceAccountController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateServiceAccountDeepCopyOnChange(client ServiceAccountClient, obj *v1.S } func (c *serviceAccountController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *serviceAccountController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *serviceAccountController) OnChange(ctx context.Context, name string, sync ServiceAccountHandler) { @@ -145,20 +148,19 @@ func (c *serviceAccountController) OnChange(ctx context.Context, name string, sy } func (c *serviceAccountController) OnRemove(ctx context.Context, name string, sync ServiceAccountHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromServiceAccountHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromServiceAccountHandlerToHandler(sync))) } func (c *serviceAccountController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *serviceAccountController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *serviceAccountController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *serviceAccountController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *serviceAccountController) GroupVersionKind() schema.GroupVersionKind { func (c *serviceAccountController) Cache() ServiceAccountCache { return &serviceAccountCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *serviceAccountController) Create(obj *v1.ServiceAccount) (*v1.ServiceAccount, error) { - return c.clientGetter.ServiceAccounts(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.ServiceAccount{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *serviceAccountController) Update(obj *v1.ServiceAccount) (*v1.ServiceAccount, error) { - return c.clientGetter.ServiceAccounts(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.ServiceAccount{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *serviceAccountController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.ServiceAccounts(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *serviceAccountController) Get(namespace, name string, options metav1.GetOptions) (*v1.ServiceAccount, error) { - return c.clientGetter.ServiceAccounts(namespace).Get(context.TODO(), name, options) + result := &v1.ServiceAccount{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *serviceAccountController) List(namespace string, opts metav1.ListOptions) (*v1.ServiceAccountList, error) { - return c.clientGetter.ServiceAccounts(namespace).List(context.TODO(), opts) + result := &v1.ServiceAccountList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *serviceAccountController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.ServiceAccounts(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *serviceAccountController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error) { - return c.clientGetter.ServiceAccounts(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *serviceAccountController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.ServiceAccount, error) { + result := &v1.ServiceAccount{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type serviceAccountCache struct { - lister listers.ServiceAccountLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *serviceAccountCache) Get(namespace, name string) (*v1.ServiceAccount, error) { - return c.lister.ServiceAccounts(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.ServiceAccount), nil } -func (c *serviceAccountCache) List(namespace string, selector labels.Selector) ([]*v1.ServiceAccount, error) { - return c.lister.ServiceAccounts(namespace).List(selector) +func (c *serviceAccountCache) List(namespace string, selector labels.Selector) (ret []*v1.ServiceAccount, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.ServiceAccount)) + }) + + return ret, err } func (c *serviceAccountCache) AddIndexer(indexName string, indexer ServiceAccountIndexer) { diff --git a/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/factory.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/factory.go new file mode 100644 index 0000000000..52a114505c --- /dev/null +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/factory.go @@ -0,0 +1,67 @@ +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by main. DO NOT EDIT. + +package rbac + +import ( + "github.com/rancher/wrangler/pkg/generic" + "k8s.io/client-go/rest" +) + +type Factory struct { + *generic.Factory +} + +func NewFactoryFromConfigOrDie(config *rest.Config) *Factory { + f, err := NewFactoryFromConfig(config) + if err != nil { + panic(err) + } + return f +} + +func NewFactoryFromConfig(config *rest.Config) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, nil) +} + +func NewFactoryFromConfigWithNamespace(config *rest.Config, namespace string) (*Factory, error) { + return NewFactoryFromConfigWithOptions(config, &FactoryOptions{ + Namespace: namespace, + }) +} + +type FactoryOptions = generic.FactoryOptions + +func NewFactoryFromConfigWithOptions(config *rest.Config, opts *FactoryOptions) (*Factory, error) { + f, err := generic.NewFactoryFromConfigWithOptions(config, opts) + return &Factory{ + Factory: f, + }, err +} + +func NewFactoryFromConfigWithOptionsOrDie(config *rest.Config, opts *FactoryOptions) *Factory { + f, err := NewFactoryFromConfigWithOptions(config, opts) + if err != nil { + panic(err) + } + return f +} + +func (c *Factory) Rbac() Interface { + return New(c.ControllerFactory()) +} diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/interface.go similarity index 56% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/interface.go index 572969acfb..f4bb1f982f 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/interface.go @@ -19,10 +19,8 @@ limitations under the License. package rbac import ( - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" - "github.com/rancher/wrangler/pkg/generic" - informers "k8s.io/client-go/informers/rbac" - clientset "k8s.io/client-go/kubernetes" + "github.com/rancher/lasso/pkg/controller" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" ) type Interface interface { @@ -30,21 +28,16 @@ type Interface interface { } type group struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.Interface + controllerFactory controller.SharedControllerFactory } // New returns a new Interface. -func New(controllerManager *generic.ControllerManager, informers informers.Interface, - client clientset.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &group{ - controllerManager: controllerManager, - informers: informers, - client: client, + controllerFactory: controllerFactory, } } func (g *group) V1() v1.Interface { - return v1.New(g.controllerManager, g.client.RbacV1(), g.informers.V1()) + return v1.New(g.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrole.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrole.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrole.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrole.go index 8716a3e693..1c192736d5 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrole.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrole.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/rbac/v1" - clientset "k8s.io/client-go/kubernetes/typed/rbac/v1" - listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type ClusterRoleCache interface { type ClusterRoleIndexer func(obj *v1.ClusterRole) ([]string, error) type clusterRoleController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.ClusterRolesGetter - informer informers.ClusterRoleInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewClusterRoleController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.ClusterRolesGetter, informer informers.ClusterRoleInformer) ClusterRoleController { +func NewClusterRoleController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) ClusterRoleController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &clusterRoleController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateClusterRoleDeepCopyOnChange(client ClusterRoleClient, obj *v1.Cluster } func (c *clusterRoleController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *clusterRoleController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *clusterRoleController) OnChange(ctx context.Context, name string, sync ClusterRoleHandler) { @@ -145,20 +148,19 @@ func (c *clusterRoleController) OnChange(ctx context.Context, name string, sync } func (c *clusterRoleController) OnRemove(ctx context.Context, name string, sync ClusterRoleHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromClusterRoleHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromClusterRoleHandlerToHandler(sync))) } func (c *clusterRoleController) Enqueue(name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), "", name) + c.controller.Enqueue("", name) } func (c *clusterRoleController) EnqueueAfter(name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), "", name, duration) + c.controller.EnqueueAfter("", name, duration) } func (c *clusterRoleController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *clusterRoleController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *clusterRoleController) GroupVersionKind() schema.GroupVersionKind { func (c *clusterRoleController) Cache() ClusterRoleCache { return &clusterRoleCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *clusterRoleController) Create(obj *v1.ClusterRole) (*v1.ClusterRole, error) { - return c.clientGetter.ClusterRoles().Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.ClusterRole{} + return result, c.client.Create(context.TODO(), "", obj, result, metav1.CreateOptions{}) } func (c *clusterRoleController) Update(obj *v1.ClusterRole) (*v1.ClusterRole, error) { - return c.clientGetter.ClusterRoles().Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.ClusterRole{} + return result, c.client.Update(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *clusterRoleController) Delete(name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.ClusterRoles().Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), "", name, *options) } func (c *clusterRoleController) Get(name string, options metav1.GetOptions) (*v1.ClusterRole, error) { - return c.clientGetter.ClusterRoles().Get(context.TODO(), name, options) + result := &v1.ClusterRole{} + return result, c.client.Get(context.TODO(), "", name, result, options) } func (c *clusterRoleController) List(opts metav1.ListOptions) (*v1.ClusterRoleList, error) { - return c.clientGetter.ClusterRoles().List(context.TODO(), opts) + result := &v1.ClusterRoleList{} + return result, c.client.List(context.TODO(), "", result, opts) } func (c *clusterRoleController) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.ClusterRoles().Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), "", opts) } -func (c *clusterRoleController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ClusterRole, err error) { - return c.clientGetter.ClusterRoles().Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *clusterRoleController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1.ClusterRole, error) { + result := &v1.ClusterRole{} + return result, c.client.Patch(context.TODO(), "", name, pt, data, result, metav1.PatchOptions{}, subresources...) } type clusterRoleCache struct { - lister listers.ClusterRoleLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *clusterRoleCache) Get(name string) (*v1.ClusterRole, error) { - return c.lister.Get(name) + obj, exists, err := c.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.ClusterRole), nil } -func (c *clusterRoleCache) List(selector labels.Selector) ([]*v1.ClusterRole, error) { - return c.lister.List(selector) +func (c *clusterRoleCache) List(selector labels.Selector) (ret []*v1.ClusterRole, err error) { + + err = cache.ListAll(c.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.ClusterRole)) + }) + + return ret, err } func (c *clusterRoleCache) AddIndexer(indexName string, indexer ClusterRoleIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrolebinding.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrolebinding.go similarity index 73% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrolebinding.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrolebinding.go index ceb7047651..8673b6a201 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/clusterrolebinding.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/clusterrolebinding.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/rbac/v1" - clientset "k8s.io/client-go/kubernetes/typed/rbac/v1" - listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type ClusterRoleBindingCache interface { type ClusterRoleBindingIndexer func(obj *v1.ClusterRoleBinding) ([]string, error) type clusterRoleBindingController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.ClusterRoleBindingsGetter - informer informers.ClusterRoleBindingInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewClusterRoleBindingController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.ClusterRoleBindingsGetter, informer informers.ClusterRoleBindingInformer) ClusterRoleBindingController { +func NewClusterRoleBindingController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) ClusterRoleBindingController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &clusterRoleBindingController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateClusterRoleBindingDeepCopyOnChange(client ClusterRoleBindingClient, o } func (c *clusterRoleBindingController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *clusterRoleBindingController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *clusterRoleBindingController) OnChange(ctx context.Context, name string, sync ClusterRoleBindingHandler) { @@ -145,20 +148,19 @@ func (c *clusterRoleBindingController) OnChange(ctx context.Context, name string } func (c *clusterRoleBindingController) OnRemove(ctx context.Context, name string, sync ClusterRoleBindingHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromClusterRoleBindingHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromClusterRoleBindingHandlerToHandler(sync))) } func (c *clusterRoleBindingController) Enqueue(name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), "", name) + c.controller.Enqueue("", name) } func (c *clusterRoleBindingController) EnqueueAfter(name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), "", name, duration) + c.controller.EnqueueAfter("", name, duration) } func (c *clusterRoleBindingController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *clusterRoleBindingController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *clusterRoleBindingController) GroupVersionKind() schema.GroupVersionKin func (c *clusterRoleBindingController) Cache() ClusterRoleBindingCache { return &clusterRoleBindingCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *clusterRoleBindingController) Create(obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) { - return c.clientGetter.ClusterRoleBindings().Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.ClusterRoleBinding{} + return result, c.client.Create(context.TODO(), "", obj, result, metav1.CreateOptions{}) } func (c *clusterRoleBindingController) Update(obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) { - return c.clientGetter.ClusterRoleBindings().Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.ClusterRoleBinding{} + return result, c.client.Update(context.TODO(), "", obj, result, metav1.UpdateOptions{}) } func (c *clusterRoleBindingController) Delete(name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.ClusterRoleBindings().Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), "", name, *options) } func (c *clusterRoleBindingController) Get(name string, options metav1.GetOptions) (*v1.ClusterRoleBinding, error) { - return c.clientGetter.ClusterRoleBindings().Get(context.TODO(), name, options) + result := &v1.ClusterRoleBinding{} + return result, c.client.Get(context.TODO(), "", name, result, options) } func (c *clusterRoleBindingController) List(opts metav1.ListOptions) (*v1.ClusterRoleBindingList, error) { - return c.clientGetter.ClusterRoleBindings().List(context.TODO(), opts) + result := &v1.ClusterRoleBindingList{} + return result, c.client.List(context.TODO(), "", result, opts) } func (c *clusterRoleBindingController) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.ClusterRoleBindings().Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), "", opts) } -func (c *clusterRoleBindingController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ClusterRoleBinding, err error) { - return c.clientGetter.ClusterRoleBindings().Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *clusterRoleBindingController) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1.ClusterRoleBinding, error) { + result := &v1.ClusterRoleBinding{} + return result, c.client.Patch(context.TODO(), "", name, pt, data, result, metav1.PatchOptions{}, subresources...) } type clusterRoleBindingCache struct { - lister listers.ClusterRoleBindingLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *clusterRoleBindingCache) Get(name string) (*v1.ClusterRoleBinding, error) { - return c.lister.Get(name) + obj, exists, err := c.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.ClusterRoleBinding), nil } -func (c *clusterRoleBindingCache) List(selector labels.Selector) ([]*v1.ClusterRoleBinding, error) { - return c.lister.List(selector) +func (c *clusterRoleBindingCache) List(selector labels.Selector) (ret []*v1.ClusterRoleBinding, err error) { + + err = cache.ListAll(c.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.ClusterRoleBinding)) + }) + + return ret, err } func (c *clusterRoleBindingCache) AddIndexer(indexName string, indexer ClusterRoleBindingIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/interface.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/interface.go similarity index 51% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/interface.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/interface.go index 8c62786369..1dbb1045a0 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/interface.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/interface.go @@ -19,12 +19,16 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/lasso/pkg/controller" + "github.com/rancher/wrangler/pkg/schemes" v1 "k8s.io/api/rbac/v1" - informers "k8s.io/client-go/informers/rbac/v1" - clientset "k8s.io/client-go/kubernetes/typed/rbac/v1" + "k8s.io/apimachinery/pkg/runtime/schema" ) +func init() { + schemes.Register(v1.AddToScheme) +} + type Interface interface { ClusterRole() ClusterRoleController ClusterRoleBinding() ClusterRoleBindingController @@ -32,30 +36,25 @@ type Interface interface { RoleBinding() RoleBindingController } -func New(controllerManager *generic.ControllerManager, client clientset.RbacV1Interface, - informers informers.Interface) Interface { +func New(controllerFactory controller.SharedControllerFactory) Interface { return &version{ - controllerManager: controllerManager, - client: client, - informers: informers, + controllerFactory: controllerFactory, } } type version struct { - controllerManager *generic.ControllerManager - informers informers.Interface - client clientset.RbacV1Interface + controllerFactory controller.SharedControllerFactory } func (c *version) ClusterRole() ClusterRoleController { - return NewClusterRoleController(v1.SchemeGroupVersion.WithKind("ClusterRole"), c.controllerManager, c.client, c.informers.ClusterRoles()) + return NewClusterRoleController(schema.GroupVersionKind{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}, "clusterroles", false, c.controllerFactory) } func (c *version) ClusterRoleBinding() ClusterRoleBindingController { - return NewClusterRoleBindingController(v1.SchemeGroupVersion.WithKind("ClusterRoleBinding"), c.controllerManager, c.client, c.informers.ClusterRoleBindings()) + return NewClusterRoleBindingController(schema.GroupVersionKind{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}, "clusterrolebindings", false, c.controllerFactory) } func (c *version) Role() RoleController { - return NewRoleController(v1.SchemeGroupVersion.WithKind("Role"), c.controllerManager, c.client, c.informers.Roles()) + return NewRoleController(schema.GroupVersionKind{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "Role"}, "roles", true, c.controllerFactory) } func (c *version) RoleBinding() RoleBindingController { - return NewRoleBindingController(v1.SchemeGroupVersion.WithKind("RoleBinding"), c.controllerManager, c.client, c.informers.RoleBindings()) + return NewRoleBindingController(schema.GroupVersionKind{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "RoleBinding"}, "rolebindings", true, c.controllerFactory) } diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/role.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/role.go similarity index 70% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/role.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/role.go index 8229c45924..a3b113eae6 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/role.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/role.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/rbac/v1" - clientset "k8s.io/client-go/kubernetes/typed/rbac/v1" - listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type RoleCache interface { type RoleIndexer func(obj *v1.Role) ([]string, error) type roleController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.RolesGetter - informer informers.RoleInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewRoleController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.RolesGetter, informer informers.RoleInformer) RoleController { +func NewRoleController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) RoleController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &roleController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateRoleDeepCopyOnChange(client RoleClient, obj *v1.Role, handler func(ob } func (c *roleController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *roleController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *roleController) OnChange(ctx context.Context, name string, sync RoleHandler) { @@ -145,20 +148,19 @@ func (c *roleController) OnChange(ctx context.Context, name string, sync RoleHan } func (c *roleController) OnRemove(ctx context.Context, name string, sync RoleHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromRoleHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromRoleHandlerToHandler(sync))) } func (c *roleController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *roleController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *roleController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *roleController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *roleController) GroupVersionKind() schema.GroupVersionKind { func (c *roleController) Cache() RoleCache { return &roleCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *roleController) Create(obj *v1.Role) (*v1.Role, error) { - return c.clientGetter.Roles(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.Role{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *roleController) Update(obj *v1.Role) (*v1.Role, error) { - return c.clientGetter.Roles(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.Role{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *roleController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.Roles(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *roleController) Get(namespace, name string, options metav1.GetOptions) (*v1.Role, error) { - return c.clientGetter.Roles(namespace).Get(context.TODO(), name, options) + result := &v1.Role{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *roleController) List(namespace string, opts metav1.ListOptions) (*v1.RoleList, error) { - return c.clientGetter.Roles(namespace).List(context.TODO(), opts) + result := &v1.RoleList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *roleController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.Roles(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *roleController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Role, err error) { - return c.clientGetter.Roles(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *roleController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.Role, error) { + result := &v1.Role{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type roleCache struct { - lister listers.RoleLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *roleCache) Get(namespace, name string) (*v1.Role, error) { - return c.lister.Roles(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.Role), nil } -func (c *roleCache) List(namespace string, selector labels.Selector) ([]*v1.Role, error) { - return c.lister.Roles(namespace).List(selector) +func (c *roleCache) List(namespace string, selector labels.Selector) (ret []*v1.Role, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.Role)) + }) + + return ret, err } func (c *roleCache) AddIndexer(indexName string, indexer RoleIndexer) { diff --git a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/rolebinding.go b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/rolebinding.go similarity index 71% rename from vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/rolebinding.go rename to vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/rolebinding.go index 0ef3f1077a..383ffa15d8 100644 --- a/vendor/github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1/rolebinding.go +++ b/vendor/github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1/rolebinding.go @@ -22,9 +22,12 @@ import ( "context" "time" + "github.com/rancher/lasso/pkg/client" + "github.com/rancher/lasso/pkg/controller" "github.com/rancher/wrangler/pkg/generic" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -32,9 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - informers "k8s.io/client-go/informers/rbac/v1" - clientset "k8s.io/client-go/kubernetes/typed/rbac/v1" - listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) @@ -74,18 +74,22 @@ type RoleBindingCache interface { type RoleBindingIndexer func(obj *v1.RoleBinding) ([]string, error) type roleBindingController struct { - controllerManager *generic.ControllerManager - clientGetter clientset.RoleBindingsGetter - informer informers.RoleBindingInformer - gvk schema.GroupVersionKind + controller controller.SharedController + client *client.Client + gvk schema.GroupVersionKind + groupResource schema.GroupResource } -func NewRoleBindingController(gvk schema.GroupVersionKind, controllerManager *generic.ControllerManager, clientGetter clientset.RoleBindingsGetter, informer informers.RoleBindingInformer) RoleBindingController { +func NewRoleBindingController(gvk schema.GroupVersionKind, resource string, namespaced bool, controller controller.SharedControllerFactory) RoleBindingController { + c := controller.ForResourceKind(gvk.GroupVersion().WithResource(resource), gvk.Kind, namespaced) return &roleBindingController{ - controllerManager: controllerManager, - clientGetter: clientGetter, - informer: informer, - gvk: gvk, + controller: c, + client: c.Client(), + gvk: gvk, + groupResource: schema.GroupResource{ + Group: gvk.Group, + Resource: resource, + }, } } @@ -132,12 +136,11 @@ func UpdateRoleBindingDeepCopyOnChange(client RoleBindingClient, obj *v1.RoleBin } func (c *roleBindingController) AddGenericHandler(ctx context.Context, name string, handler generic.Handler) { - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, handler) + c.controller.RegisterHandler(ctx, name, controller.SharedControllerHandlerFunc(handler)) } func (c *roleBindingController) AddGenericRemoveHandler(ctx context.Context, name string, handler generic.Handler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), handler) - c.controllerManager.AddHandler(ctx, c.gvk, c.informer.Informer(), name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), handler)) } func (c *roleBindingController) OnChange(ctx context.Context, name string, sync RoleBindingHandler) { @@ -145,20 +148,19 @@ func (c *roleBindingController) OnChange(ctx context.Context, name string, sync } func (c *roleBindingController) OnRemove(ctx context.Context, name string, sync RoleBindingHandler) { - removeHandler := generic.NewRemoveHandler(name, c.Updater(), FromRoleBindingHandlerToHandler(sync)) - c.AddGenericHandler(ctx, name, removeHandler) + c.AddGenericHandler(ctx, name, generic.NewRemoveHandler(name, c.Updater(), FromRoleBindingHandlerToHandler(sync))) } func (c *roleBindingController) Enqueue(namespace, name string) { - c.controllerManager.Enqueue(c.gvk, c.informer.Informer(), namespace, name) + c.controller.Enqueue(namespace, name) } func (c *roleBindingController) EnqueueAfter(namespace, name string, duration time.Duration) { - c.controllerManager.EnqueueAfter(c.gvk, c.informer.Informer(), namespace, name, duration) + c.controller.EnqueueAfter(namespace, name, duration) } func (c *roleBindingController) Informer() cache.SharedIndexInformer { - return c.informer.Informer() + return c.controller.Informer() } func (c *roleBindingController) GroupVersionKind() schema.GroupVersionKind { @@ -167,53 +169,70 @@ func (c *roleBindingController) GroupVersionKind() schema.GroupVersionKind { func (c *roleBindingController) Cache() RoleBindingCache { return &roleBindingCache{ - lister: c.informer.Lister(), - indexer: c.informer.Informer().GetIndexer(), + indexer: c.Informer().GetIndexer(), + resource: c.groupResource, } } func (c *roleBindingController) Create(obj *v1.RoleBinding) (*v1.RoleBinding, error) { - return c.clientGetter.RoleBindings(obj.Namespace).Create(context.TODO(), obj, metav1.CreateOptions{}) + result := &v1.RoleBinding{} + return result, c.client.Create(context.TODO(), obj.Namespace, obj, result, metav1.CreateOptions{}) } func (c *roleBindingController) Update(obj *v1.RoleBinding) (*v1.RoleBinding, error) { - return c.clientGetter.RoleBindings(obj.Namespace).Update(context.TODO(), obj, metav1.UpdateOptions{}) + result := &v1.RoleBinding{} + return result, c.client.Update(context.TODO(), obj.Namespace, obj, result, metav1.UpdateOptions{}) } func (c *roleBindingController) Delete(namespace, name string, options *metav1.DeleteOptions) error { if options == nil { options = &metav1.DeleteOptions{} } - return c.clientGetter.RoleBindings(namespace).Delete(context.TODO(), name, *options) + return c.client.Delete(context.TODO(), namespace, name, *options) } func (c *roleBindingController) Get(namespace, name string, options metav1.GetOptions) (*v1.RoleBinding, error) { - return c.clientGetter.RoleBindings(namespace).Get(context.TODO(), name, options) + result := &v1.RoleBinding{} + return result, c.client.Get(context.TODO(), namespace, name, result, options) } func (c *roleBindingController) List(namespace string, opts metav1.ListOptions) (*v1.RoleBindingList, error) { - return c.clientGetter.RoleBindings(namespace).List(context.TODO(), opts) + result := &v1.RoleBindingList{} + return result, c.client.List(context.TODO(), namespace, result, opts) } func (c *roleBindingController) Watch(namespace string, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientGetter.RoleBindings(namespace).Watch(context.TODO(), opts) + return c.client.Watch(context.TODO(), namespace, opts) } -func (c *roleBindingController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.RoleBinding, err error) { - return c.clientGetter.RoleBindings(namespace).Patch(context.TODO(), name, pt, data, metav1.PatchOptions{}, subresources...) +func (c *roleBindingController) Patch(namespace, name string, pt types.PatchType, data []byte, subresources ...string) (*v1.RoleBinding, error) { + result := &v1.RoleBinding{} + return result, c.client.Patch(context.TODO(), namespace, name, pt, data, result, metav1.PatchOptions{}, subresources...) } type roleBindingCache struct { - lister listers.RoleBindingLister - indexer cache.Indexer + indexer cache.Indexer + resource schema.GroupResource } func (c *roleBindingCache) Get(namespace, name string) (*v1.RoleBinding, error) { - return c.lister.RoleBindings(namespace).Get(name) + obj, exists, err := c.indexer.GetByKey(namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(c.resource, name) + } + return obj.(*v1.RoleBinding), nil } -func (c *roleBindingCache) List(namespace string, selector labels.Selector) ([]*v1.RoleBinding, error) { - return c.lister.RoleBindings(namespace).List(selector) +func (c *roleBindingCache) List(namespace string, selector labels.Selector) (ret []*v1.RoleBinding, err error) { + + err = cache.ListAllByNamespace(c.indexer, namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1.RoleBinding)) + }) + + return ret, err } func (c *roleBindingCache) AddIndexer(indexName string, indexer RoleBindingIndexer) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a4445609d..43a4ed0ded 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -706,20 +706,12 @@ github.com/jonboulle/clockwork github.com/josharian/intern # github.com/json-iterator/go v1.1.11 github.com/json-iterator/go -# github.com/k3s-io/helm-controller v0.10.5 +# github.com/k3s-io/helm-controller v0.11.3 ## explicit github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1 -github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned -github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme -github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1 github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1 -github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions -github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io -github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1 -github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces -github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1 github.com/k3s-io/helm-controller/pkg/helm # github.com/k3s-io/kine v0.7.3 ## explicit @@ -947,7 +939,7 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/rancher/dynamiclistener v0.2.3 +# github.com/rancher/dynamiclistener v0.2.6 ## explicit github.com/rancher/dynamiclistener github.com/rancher/dynamiclistener/cert @@ -956,6 +948,7 @@ github.com/rancher/dynamiclistener/storage/file github.com/rancher/dynamiclistener/storage/kubernetes github.com/rancher/dynamiclistener/storage/memory # github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 +## explicit github.com/rancher/lasso/pkg/cache github.com/rancher/lasso/pkg/client github.com/rancher/lasso/pkg/controller @@ -968,7 +961,7 @@ github.com/rancher/remotedialer # github.com/rancher/wharfie v0.3.4 ## explicit github.com/rancher/wharfie/pkg/registries -# github.com/rancher/wrangler v0.8.3 +# github.com/rancher/wrangler v0.8.3 => github.com/rancher/wrangler v0.8.5 ## explicit github.com/rancher/wrangler/pkg/apply github.com/rancher/wrangler/pkg/apply/injectors @@ -981,6 +974,14 @@ github.com/rancher/wrangler/pkg/crd github.com/rancher/wrangler/pkg/data github.com/rancher/wrangler/pkg/data/convert github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1 +github.com/rancher/wrangler/pkg/generated/controllers/apps +github.com/rancher/wrangler/pkg/generated/controllers/apps/v1 +github.com/rancher/wrangler/pkg/generated/controllers/batch +github.com/rancher/wrangler/pkg/generated/controllers/batch/v1 +github.com/rancher/wrangler/pkg/generated/controllers/core +github.com/rancher/wrangler/pkg/generated/controllers/core/v1 +github.com/rancher/wrangler/pkg/generated/controllers/rbac +github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1 github.com/rancher/wrangler/pkg/generic github.com/rancher/wrangler/pkg/gvk github.com/rancher/wrangler/pkg/kv @@ -999,16 +1000,6 @@ github.com/rancher/wrangler/pkg/signals github.com/rancher/wrangler/pkg/slice github.com/rancher/wrangler/pkg/start github.com/rancher/wrangler/pkg/yaml -# github.com/rancher/wrangler-api v0.6.0 -## explicit -github.com/rancher/wrangler-api/pkg/generated/controllers/apps -github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1 -github.com/rancher/wrangler-api/pkg/generated/controllers/batch -github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1 -github.com/rancher/wrangler-api/pkg/generated/controllers/core -github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1 -github.com/rancher/wrangler-api/pkg/generated/controllers/rbac -github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1 # github.com/robfig/cron/v3 v3.0.1 ## explicit github.com/robfig/cron/v3 @@ -3385,6 +3376,7 @@ sigs.k8s.io/yaml # github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.1 # github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b # github.com/rancher/k3s/pkg/data => ./pkg/data +# github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.5 # go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.0-k3s1 # go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.0-k3s1 # go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s1