Skip to content

Commit

Permalink
update EDS dependency (#112)
Browse files Browse the repository at this point in the history
Signed-off-by: cedric lamoriniere <cedric.lamoriniere@datadoghq.com>
  • Loading branch information
clamoriniere committed Jun 26, 2020
1 parent f321296 commit 8497690
Show file tree
Hide file tree
Showing 13 changed files with 335 additions and 117 deletions.
1 change: 1 addition & 0 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ core,"github.com/PuerkitoBio/urlesc",NewBSD
core,"github.com/beorn7/perks/quantile",MIT
core,"github.com/cenkalti/backoff",MIT
core,"github.com/cespare/xxhash/v2",MIT
core,"github.com/datadog/extendeddaemonset/pkg/apis/datadoghq/v1alpha1",Apache-2.0
core,"github.com/davecgh/go-spew/spew",ISC
core,"github.com/dgrijalva/jwt-go",MIT
core,"github.com/docker/spdystream",Apache-2.0
Expand Down
2 changes: 2 additions & 0 deletions deploy/crds/datadoghq.com_datadogagents_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,8 @@ spec:
properties:
duration:
type: string
paused:
type: boolean
replicas:
anyOf:
- type: integer
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-operator
go 1.13

require (
github.com/datadog/extendeddaemonset v0.1.1-0.20200514082145-c99b8a156378
github.com/datadog/extendeddaemonset v0.1.1-0.20200618074032-94ec1f3a5192
github.com/dsnet/compress v0.0.1 // indirect
github.com/frankban/quicktest v1.9.0 // indirect
github.com/go-logr/logr v0.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ github.com/cznic/ql v1.2.0/go.mod h1:FbpzhyZrqr0PVlK6ury+PoW3T0ODUV22OeWIxcaOrSE
github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ=
github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc/go.mod h1:Y1SNZ4dRUOKXshKUbwUapqNncRrho4mkjQebgEHZLj8=
github.com/datadog/extendeddaemonset v0.1.1-0.20200514082145-c99b8a156378 h1:PbkvpnZU/FEq6ESqEetjuQzsb4+swqPG9UYFzqBrnBQ=
github.com/datadog/extendeddaemonset v0.1.1-0.20200514082145-c99b8a156378/go.mod h1:9YSrkg/JGqlxjoLglDXi19N7GWv7bjGOhd2bg6fQ8Pg=
github.com/datadog/extendeddaemonset v0.1.1-0.20200618074032-94ec1f3a5192 h1:LV8XmqPReeTODGyphvQKAmzCYy72RdfqzHk+olFcj5E=
github.com/datadog/extendeddaemonset v0.1.1-0.20200618074032-94ec1f3a5192/go.mod h1:9YSrkg/JGqlxjoLglDXi19N7GWv7bjGOhd2bg6fQ8Pg=
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=
Expand Down
6 changes: 6 additions & 0 deletions pkg/controller/datadogagent/datadogagent_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,16 @@ func init() {
// Add creates a new DatadogAgent Controller and adds it to the Manager. The Manager will set fields on the Controller
// and Start it when the Manager is Started.
func Add(mgr manager.Manager) error {
//Add Extendeddaemonset scheme
if err := edsdatadoghqv1alpha1.AddToScheme(mgr.GetScheme()); err != nil {
return err
}

reconciler, forwarders, err := newReconciler(mgr)
if err != nil {
return err
}

return add(mgr, reconciler, forwarders.Register)
}

Expand Down
204 changes: 200 additions & 4 deletions vendor/github.com/datadog/extendeddaemonset/LICENSE

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/datadog/extendeddaemonset/NOTICE

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.

0 comments on commit 8497690

Please sign in to comment.