Merge pull request #359 from luxas/switch_to_toolkit

Switch to using weaveworks/gitops-toolkit

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/vishvananda/netlink v1.0.0
 	github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect
 	github.com/weaveworks/flux v0.0.0-20190704153721-8292179855e1
-	github.com/weaveworks/gitops-toolkit v0.0.0-00010101000000-000000000000
+	github.com/weaveworks/gitops-toolkit v0.0.0-20190819143013-52823007f89f
 	go.etcd.io/bbolt v1.3.3 // indirect
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
 	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
@@ -65,5 +65,4 @@ replace (
 	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190711223531-1fb7fffdb266
 	github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f
 	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v0.1.2-0.20190812154431-4f2ab155bbdd
-	github.com/weaveworks/gitops-toolkit => github.com/luxas/gitops-toolkit v0.0.0-20190819143013-52823007f89f
 )

go.sum

@@ -292,8 +292,6 @@ github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8c
 github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
 github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
-github.com/luxas/gitops-toolkit v0.0.0-20190819143013-52823007f89f h1:zsgFi7yUUr8KtbLJoYbuzVaPB5yxy0I+HPBT397dIpg=
-github.com/luxas/gitops-toolkit v0.0.0-20190819143013-52823007f89f/go.mod h1:IrJqBfBfyVVjsY6cnjBfMH9/muxg/AkgJgRe4xK9n2o=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 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=
@@ -441,6 +439,8 @@ github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f/go.mod h1:ZjcWmF
 github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e/go.mod h1:pSm+0KR57BG3pvGoJWFXJSAC7+sEPewcvdt5StevL3A=
 github.com/weaveworks/flux v0.0.0-20190704153721-8292179855e1 h1:nI0jk6Ryurv3jgPkIk7Nx/AIOpHpEB2nAFavf4NRy/Y=
 github.com/weaveworks/flux v0.0.0-20190704153721-8292179855e1/go.mod h1:G62yRB4dAGDBHgi/tP/a6E8YkwqUbeBX7bo+XIWjj+w=
+github.com/weaveworks/gitops-toolkit v0.0.0-20190819143013-52823007f89f h1:pQ4nZBkxiBYIpRPaDD9Q9674yqbztUVRbrvRf3KnkDk=
+github.com/weaveworks/gitops-toolkit v0.0.0-20190819143013-52823007f89f/go.mod h1:IrJqBfBfyVVjsY6cnjBfMH9/muxg/AkgJgRe4xK9n2o=
 github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab/go.mod h1:qkbvw5GPibQ/Nf7IZJL0UoLwmJ6858b4S/hUWRd+cH4=
 github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
 github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa h1:rW+Lu6281ed/4XGuVIa4/YebTRNvoUJlfJ44ktEVwZk=
@@ -489,6 +489,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2eP
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b h1:lkjdUzSyJ5P1+eal9fxXX9Xg2BTfswsonKUse48C0uE=
 golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

vendor/modules.txt

@@ -278,7 +278,7 @@ github.com/vishvananda/netns
 # github.com/weaveworks/flux v0.0.0-20190704153721-8292179855e1
 github.com/weaveworks/flux/git
 github.com/weaveworks/flux/errors
-# github.com/weaveworks/gitops-toolkit v0.0.0-00010101000000-000000000000 => github.com/luxas/gitops-toolkit v0.0.0-20190819143013-52823007f89f
+# github.com/weaveworks/gitops-toolkit v0.0.0-20190819143013-52823007f89f
 github.com/weaveworks/gitops-toolkit/pkg/filter
 github.com/weaveworks/gitops-toolkit/pkg/runtime
 github.com/weaveworks/gitops-toolkit/pkg/util/patch