Skip to content

Commit

Permalink
Merge pull request #633 from ibuildthecloud/wrangler
Browse files Browse the repository at this point in the history
 Update wrangler
  • Loading branch information
erikwilson authored Jul 12, 2019
2 parents aab7045 + 37a60b1 commit 403e73a
Show file tree
Hide file tree
Showing 22 changed files with 141 additions and 82 deletions.
6 changes: 6 additions & 0 deletions pkg/generated/controllers/k3s.cattle.io/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions trash.lock
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ import:
- package: github.com/rancher/dynamiclistener
version: 4716ac2362986f28bede3f3caf5d1ce347da55b0
- package: github.com/rancher/helm-controller
version: d5f5c830231110722f14d446d3b2038e5cdf1532
version: v0.2.1
- package: github.com/rancher/remotedialer
version: 66218bc42b4fa27c34523c0d19a41a0e2b74983d
- package: github.com/rancher/wrangler
version: 4202dbfa88013c19238bb004d82e013f0593493d
version: 7737c167e16514a38229bc64c839cee8cd14e6d3
- package: github.com/rancher/wrangler-api
version: efe26ac6a9d720e1bfa5a8cc5f8dce5ad598ce26
version: v0.1.4
- package: github.com/robfig/cron
version: v1-53-gdf38d32658d878
- package: github.com/rootless-containers/rootlesskit
Expand Down
6 changes: 3 additions & 3 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ package=github.com/opencontainers/runc/contrib/cmd/recvtty

k8s.io/kubernetes v1.14.3-k3s.2 https://github.com/rancher/k3s.git transitive=true,staging=true

github.com/rancher/wrangler 4202dbfa88013c19238bb004d82e013f0593493d
github.com/rancher/wrangler-api efe26ac6a9d720e1bfa5a8cc5f8dce5ad598ce26
github.com/rancher/wrangler 7737c167e16514a38229bc64c839cee8cd14e6d3
github.com/rancher/wrangler-api v0.1.4
github.com/rancher/dynamiclistener 4716ac2362986f28bede3f3caf5d1ce347da55b0
github.com/rancher/remotedialer 66218bc42b4fa27c34523c0d19a41a0e2b74983d
github.com/rancher/helm-controller d5f5c830231110722f14d446d3b2038e5cdf1532
github.com/rancher/helm-controller v0.2.1
github.com/matryer/moq ee5226d43009 https://github.com/rancher/moq.git
github.com/coreos/flannel 823afe66b2266bf71f5bec24e6e28b26d70cfc7c https://github.com/ibuildthecloud/flannel.git
github.com/natefinch/lumberjack aee4629129445bbdfb69aa565537dcfa16544311
Expand Down
4 changes: 2 additions & 2 deletions vendor/github.com/rancher/helm-controller/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/rancher/helm-controller/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/rancher/wrangler-api/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/rancher/wrangler-api/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions vendor/github.com/rancher/wrangler/pkg/controller-gen/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions vendor/github.com/rancher/wrangler/pkg/gvk/get.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 403e73a

Please sign in to comment.