Vendor in lots of kubernetes stuff to shrink image size

cmd/podman/parse.go

@@ -18,7 +18,7 @@ import (
 
 	units "github.com/docker/go-units"
 	"github.com/pkg/errors"
-	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 
 // Note: for flags that are in the form <number><unit>, use the RAMInBytes function

contrib/spec/podman.spec.in

@@ -83,7 +83,6 @@ Requires:       atomic-registries
 # [thanks to Carl George <carl@george.computer> for containerd.spec]
 Provides: bundled(golang(github.com/asaskevich/govalidator)) = v6
 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 19f72df4d05d31cbe1c56bfc8045c96babff6c7e
-Provides: bundled(golang(github.com/beorn7/perks)) = 3ac7bf7a47d159a033b107610db8a1b6575507a4
 Provides: bundled(golang(github.com/blang/semver)) = v3.5.0
 Provides: bundled(golang(github.com/buger/goterm)) = 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3
 Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.2.0
@@ -174,7 +173,6 @@ Provides: bundled(golang(golang.org/x/crypto)) = 3fbbcd23f1cb824e69491a5930cfeff
 Provides: bundled(golang(golang.org/x/net)) = c427ad74c6d7a814201695e9ffde0c5d400a7674
 Provides: bundled(golang(golang.org/x/sys)) = 9aade4d3a3b7e6d876cd3823ad20ec45fc035402
 Provides: bundled(golang(golang.org/x/text)) = f72d8390a633d5dfb0cc84043294db9f6c935756
-Provides: bundled(golang(google.golang.org/grpc)) = v1.0.4
 Provides: bundled(golang(gopkg.in/cheggaaa/pb.v1)) = v1.0.7
 Provides: bundled(golang(gopkg.in/fsnotify.v1)) = v1.4.2
 Provides: bundled(golang(gopkg.in/inf.v0)) = v0.9.0
@@ -227,7 +225,6 @@ BuildRequires: golang(github.com/docker/docker/pkg/term)
 BuildRequires: golang(github.com/docker/docker/pkg/truncindex)
 BuildRequires: golang(github.com/ghodss/yaml)
 BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/mattn/go-sqlite3)
 BuildRequires: golang(github.com/mrunalp/fileutils)
 BuildRequires: golang(github.com/opencontainers/go-digest)
 BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1)
@@ -280,7 +277,6 @@ Requires:      golang(github.com/docker/docker/pkg/term)
 Requires:      golang(github.com/docker/docker/pkg/truncindex)
 Requires:      golang(github.com/ghodss/yaml)
 Requires:      golang(github.com/godbus/dbus)
-Requires:      golang(github.com/mattn/go-sqlite3)
 Requires:      golang(github.com/mrunalp/fileutils)
 Requires:      golang(github.com/opencontainers/go-digest)
 Requires:      golang(github.com/opencontainers/image-spec/specs-go/v1)

vendor.conf

@@ -1,98 +1,89 @@
 #
-github.com/sirupsen/logrus v1.0.0
+github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e
+github.com/BurntSushi/toml v0.2.0
+github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a
+github.com/Microsoft/hcsshim 43f9725307998e09f2e3816c2c0c36dc98f0c982
+github.com/blang/semver v3.5.0
+github.com/boltdb/bolt master
+github.com/buger/goterm 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3
+github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
+github.com/containerd/continuity master
+github.com/containernetworking/cni v0.4.0
+github.com/containernetworking/plugins master
 github.com/containers/image b327f751c16e4a189fdcde4ea36be67cc964c605
-github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
-github.com/ostreedev/ostree-go master
 github.com/containers/storage ff8a6d2bf496daf46ab1a153f783a0f6b8762a54
-github.com/containernetworking/cni v0.4.0
-google.golang.org/grpc v1.0.4 https://github.com/grpc/grpc-go
-github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd
-github.com/opencontainers/go-digest v1.0.0-rc0
-github.com/opencontainers/runtime-tools 625e2322645b151a7cbb93a8b42920933e72167f
-github.com/opencontainers/runc 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920
-github.com/vishvananda/netlink master
-github.com/vishvananda/netns master
-github.com/opencontainers/image-spec v1.0.0
-github.com/opencontainers/runtime-spec v1.0.0
-github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342
-github.com/tchap/go-patricia v2.2.6
-gopkg.in/cheggaaa/pb.v1 v1.0.7
-gopkg.in/inf.v0 v0.9.0
-gopkg.in/yaml.v2 v2
-github.com/docker/docker ce452fb72ffcdb7605ce98bde9302238f47c63c5
-github.com/docker/spdystream ed496381df8283605c435b86d4fdd6f4f20b8c6e
+github.com/coreos/go-systemd v14
+github.com/cri-o/ocicni master
+github.com/cyphar/filepath-securejoin v0.2.1
+github.com/davecgh/go-spew v1.1.0
 github.com/docker/distribution 7a8efe719e55bbfaff7bc5718cdf0ed51ca821df
-github.com/docker/go-units v0.3.2
+github.com/docker/docker d4f6db83c21cfc6af54fffb1f13e8acb7199f96a
+github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
 github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
+github.com/docker/go-units v0.3.2
 github.com/docker/libtrust aabc10ec26b754e797f9028f4589c5b7bd90dc20
-github.com/mistifyio/go-zfs v2.1.1
+github.com/docker/spdystream ed496381df8283605c435b86d4fdd6f4f20b8c6e
+github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540
+github.com/fsnotify/fsnotify 7d7316ed6e1ed2de075aab8dfc76de5d158d66e1
 github.com/ghodss/yaml 04f313413ffd65ce25f2541bfd2b2ceec5c0908c
-github.com/imdario/mergo 0.2.2
-github.com/gorilla/mux v1.3.0
+github.com/godbus/dbus a389bdde4dd695d414e47b755e95e72b7826432c
+github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7
+github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
+github.com/golang/groupcache b710c8433bd175204919eb38776e944233235d03
+github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7
+github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
+github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba
 github.com/gorilla/context v1.1
-github.com/mtrmac/gpgme b2432428689ca58c2b8e8dea9449d3295cf96fc9
+github.com/gorilla/mux v1.3.0
+github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
+github.com/hashicorp/go-multierror 83588e72410abfbe4df460eeb6f30841ae47d4c4
+github.com/hashicorp/golang-lru 0a025b7e63adc15a622f29b0b2c4c3848243bbf6
+github.com/imdario/mergo 0.2.2
+github.com/json-iterator/go 1.0.0
+github.com/kr/pty v1.0.0
 github.com/mattn/go-runewidth v0.0.1
+github.com/mistifyio/go-zfs v2.1.1
+github.com/mtrmac/gpgme b2432428689ca58c2b8e8dea9449d3295cf96fc9
+github.com/opencontainers/go-digest v1.0.0-rc0
+github.com/opencontainers/image-spec v1.0.0
+github.com/opencontainers/runc 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920
+github.com/opencontainers/runtime-spec v1.0.0
+github.com/opencontainers/runtime-tools 625e2322645b151a7cbb93a8b42920933e72167f
+github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd
+github.com/ostreedev/ostree-go master
+github.com/pkg/errors v0.8.0
+github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
+github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
 github.com/seccomp/libseccomp-golang v0.9.0
-github.com/syndtr/gocapability e7cb7fa329f456b3855136a2642b197bad7366ba
-github.com/blang/semver v3.5.0
-github.com/BurntSushi/toml v0.2.0
-github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
-github.com/davecgh/go-spew v1.1.0
-github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff
-github.com/go-openapi/jsonpointer 779f45308c19820f1a69e9a4cd965f496e0da10f
-github.com/go-openapi/jsonreference 36d33bfe519efae5632669801b180bf1a245da3b
-github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72
-github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
-github.com/mailru/easyjson 99e922cf9de1bc0ab38310c277cff32c2147e747
-github.com/PuerkitoBio/purell v1.1.0
-github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e
-github.com/ugorji/go d23841a297e5489e787e72fceffabf9d2994b52a
+github.com/sirupsen/logrus v1.0.0
 github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7
-golang.org/x/crypto 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2
+github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
+github.com/syndtr/gocapability e7cb7fa329f456b3855136a2642b197bad7366ba
+github.com/tchap/go-patricia v2.2.6
+github.com/ulule/deepcopier master
+github.com/urfave/cli 39908eb08fee7c10d842622a114a5c133fb0a3c6
+github.com/vbatts/tar-split v0.10.2
+github.com/vishvananda/netlink master
+github.com/vishvananda/netns master
+github.com/xeipuuv/gojsonpointer master
+github.com/xeipuuv/gojsonreference master
+github.com/xeipuuv/gojsonschema  master
+golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30
 golang.org/x/net c427ad74c6d7a814201695e9ffde0c5d400a7674
 golang.org/x/sys 9aade4d3a3b7e6d876cd3823ad20ec45fc035402
 golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756
-github.com/kr/pty v1.0.0
-github.com/gogo/protobuf v0.3
-github.com/golang/protobuf 748d386b5c1ea99658fd69fe9f03991ce86a90c1
-github.com/coreos/go-systemd v14
-github.com/golang/groupcache b710c8433bd175204919eb38776e944233235d03
-github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e
-github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a
-github.com/Microsoft/hcsshim 43f9725307998e09f2e3816c2c0c36dc98f0c982
-github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46
-github.com/emicklei/go-restful-swagger12 1.0.1
-github.com/pkg/errors v0.8.0
-github.com/godbus/dbus a389bdde4dd695d414e47b755e95e72b7826432c
-github.com/urfave/cli 39908eb08fee7c10d842622a114a5c133fb0a3c6
-github.com/vbatts/tar-split v0.10.2
-github.com/renstrom/dedent v1.0.0
-github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540
-github.com/buger/goterm 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3
-github.com/dgrijalva/jwt-go v3.0.0
-github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5
-github.com/hashicorp/golang-lru 0a025b7e63adc15a622f29b0b2c4c3848243bbf6
-github.com/go-openapi/loads 18441dfa706d924a39a030ee2c3b1d8d81917b38
-github.com/go-openapi/analysis b44dc874b601d9e4e2f6e19140e794ba24bead3b
-github.com/go-openapi/strfmt 93a31ef21ac23f317792fff78f9539219dd74619
-github.com/asaskevich/govalidator v6
-github.com/go-openapi/errors d24ebc2075bad502fac3a8ae27aa6dd58e1952dc
-github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4
+golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
+google.golang.org/grpc v1.0.4 https://github.com/grpc/grpc-go
+gopkg.in/cheggaaa/pb.v1 v1.0.7
+gopkg.in/inf.v0 v0.9.0
 gopkg.in/mgo.v2 v2
-github.com/prometheus/client_golang e7e903064f5e9eb5da98208bae10b475d4db0f8c
-github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207
-github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259
-github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
-github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4
-github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
-github.com/hashicorp/go-multierror 83588e72410abfbe4df460eeb6f30841ae47d4c4
-github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
-github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
-github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
-github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
-github.com/containerd/continuity master
-github.com/xeipuuv/gojsonschema  master
-github.com/xeipuuv/gojsonreference master
-github.com/xeipuuv/gojsonpointer master
-github.com/cyphar/filepath-securejoin v0.2.1
+gopkg.in/square/go-jose.v2 v2.1.3
+gopkg.in/yaml.v2 v2
+k8s.io/api 5ce4aa0bf2f097f6021127b3d879eeda82026be8 https://github.com/kubernetes/api
+k8s.io/apiextensions-apiserver 1b31e26d82f1ec2e945c560790e98f34bb5f2e63 https://github.com/kubernetes/apiextensions-apiserver
+k8s.io/apimachinery 616b23029fa3dc3e0ccefd47963f5651a6543d94 https://github.com/kubernetes/apimachinery
+k8s.io/apiserver 4d1163080139f1f9094baf8a3a6099e85e1867f6 https://github.com/kubernetes/apiserver
+k8s.io/client-go 7cd1d3291b7d9b1e2d54d4b69eb65995eaf8888e https://github.com/kubernetes/client-go
+k8s.io/kube-openapi 275e2ce91dec4c05a4094a7b1daee5560b555ac9 https://github.com/kubernetes/kube-openapi
+k8s.io/kubernetes 305052d6d2c1fa976c7a841350396061a2c26ac0 https://github.com/kubernetes/kubernetes
+k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils