Skip to content

Commit

Permalink
Fix restart on config watch
Browse files Browse the repository at this point in the history
  • Loading branch information
@charith-elastic
charith-elastic committed Jan 25, 2021
1 parent 598c8d5 commit d8f633a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 36 deletions.
46 changes: 23 additions & 23 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,11 +715,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : github.com/google/uuid
Version : v1.1.5
Time : 2021-01-15T00:27:13Z
Version : v1.2.0
Time : 2021-01-22T18:20:15Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/github.com/google/uuid@v1.1.5/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/google/uuid@v1.2.0/LICENSE:

Copyright (c) 2009,2014 Google Inc. All rights reserved.

Expand Down Expand Up @@ -4194,11 +4194,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/utils@v0.0.0-20210111153108

--------------------------------------------------------------------------------
Module : sigs.k8s.io/controller-runtime
Version : v0.8.0
Time : 2021-01-14T17:57:04Z
Version : v0.8.1
Time : 2021-01-22T14:07:27Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.8.0/LICENSE:
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.8.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -37577,11 +37577,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : golang.org/x/net
Version : v0.0.0-20201224014010-6772e930b67b
Time : 2020-12-24T01:40:10Z
Version : v0.0.0-20210119194325-5f4716e94777
Time : 2021-01-19T19:43:25Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20201224014010-6772e930b67b/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20210119194325-5f4716e94777/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -37688,11 +37688,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : golang.org/x/sys
Version : v0.0.0-20210113181707-4bcb84eeeb78
Time : 2021-01-13T18:17:07Z
Version : v0.0.0-20210124154548-22da62e12c0c
Time : 2021-01-24T15:45:48Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210113181707-4bcb84eeeb78/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210124154548-22da62e12c0c/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -39854,11 +39854,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : k8s.io/apiextensions-apiserver
Version : v0.20.1
Time : 2020-12-18T18:00:16Z
Version : v0.20.2
Time : 2021-01-13T21:59:55Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/apiextensions-apiserver@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/apiextensions-apiserver@v0.20.2/LICENSE:


Apache License
Expand Down Expand Up @@ -40066,11 +40066,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apiextensions-apiserver@v0.

--------------------------------------------------------------------------------
Module : k8s.io/apiserver
Version : v0.20.1
Time : 2020-12-18T17:38:02Z
Version : v0.20.2
Time : 2021-01-13T21:37:55Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/apiserver@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/apiserver@v0.20.2/LICENSE:


Apache License
Expand Down Expand Up @@ -40278,11 +40278,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apiserver@v0.20.1/LICENSE:

--------------------------------------------------------------------------------
Module : k8s.io/code-generator
Version : v0.20.1
Version : v0.20.2
Time : 2020-11-14T09:55:26Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/code-generator@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/code-generator@v0.20.2/LICENSE:


Apache License
Expand Down Expand Up @@ -40490,11 +40490,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/code-generator@v0.20.1/LICE

--------------------------------------------------------------------------------
Module : k8s.io/component-base
Version : v0.20.1
Time : 2020-12-18T17:24:48Z
Version : v0.20.2
Time : 2021-01-13T21:24:56Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/component-base@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/component-base@v0.20.2/LICENSE:


Apache License
Expand Down
8 changes: 3 additions & 5 deletions cmd/manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ func doRun(_ *cobra.Command, _ []string) error {

go func() {
err := startOperator(ctx)
if err != nil {
log.Error(err, "Operator stopped with error")
}
errChan <- err
}()

Expand All @@ -339,11 +342,6 @@ func doRun(_ *cobra.Command, _ []string) error {
case <-confUpdateChan: // config file updated
log.Info("Shutting down to apply updated configuration")

if err := <-errChan; err != nil {
log.Error(err, "Encountered error from previous operator run")
return err
}

return nil
}
}
Expand Down
16 changes: 8 additions & 8 deletions docs/reference/dependencies.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This page lists the third-party dependencies used to build {n}.
| link:https://github.com/go-test/deep[$$github.com/go-test/deep$$] | v1.0.7 | MIT
| link:https://github.com/gobuffalo/flect[$$github.com/gobuffalo/flect$$] | v0.2.2 | MIT
| link:https://github.com/google/go-cmp[$$github.com/google/go-cmp$$] | v0.5.4 | BSD-3-Clause
| link:https://github.com/google/uuid[$$github.com/google/uuid$$] | v1.1.5 | BSD-3-Clause
| link:https://github.com/google/uuid[$$github.com/google/uuid$$] | v1.2.0 | BSD-3-Clause
| link:https://github.com/hashicorp/go-multierror[$$github.com/hashicorp/go-multierror$$] | v1.1.0 | MPL-2.0
| link:https://github.com/hashicorp/vault[$$github.com/hashicorp/vault/api$$] | v1.0.4 | MPL-2.0
| link:https://github.com/imdario/mergo[$$github.com/imdario/mergo$$] | v0.3.11 | BSD-3-Clause
Expand All @@ -55,7 +55,7 @@ This page lists the third-party dependencies used to build {n}.
| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.20.2 | Apache-2.0
| link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.4.0 | Apache-2.0
| link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20210111153108-fddb29f9d009 | Apache-2.0
| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.8.0 | Apache-2.0
| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.8.1 | Apache-2.0
| link:https://sigs.k8s.io/controller-tools[$$sigs.k8s.io/controller-tools$$] | v0.4.1 | Apache-2.0
|===

Expand Down Expand Up @@ -361,10 +361,10 @@ This page lists the third-party dependencies used to build {n}.
| link:https://golang.org/x/lint[$$golang.org/x/lint$$] | v0.0.0-20200302205851-738671d3881b | BSD-3-Clause
| link:https://golang.org/x/mobile[$$golang.org/x/mobile$$] | v0.0.0-20190719004257-d2bd2a29d028 | BSD-3-Clause
| link:https://golang.org/x/mod[$$golang.org/x/mod$$] | v0.3.0 | BSD-3-Clause
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.0.0-20201224014010-6772e930b67b | BSD-3-Clause
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.0.0-20210119194325-5f4716e94777 | BSD-3-Clause
| link:https://golang.org/x/oauth2[$$golang.org/x/oauth2$$] | v0.0.0-20210113205817-d3ed898aa8a3 | BSD-3-Clause
| link:https://golang.org/x/sync[$$golang.org/x/sync$$] | v0.0.0-20201020160332-67f06af15bc9 | BSD-3-Clause
| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.0.0-20210113181707-4bcb84eeeb78 | BSD-3-Clause
| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.0.0-20210124154548-22da62e12c0c | BSD-3-Clause
| link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.0.0-20201210144234-2321bbc49cbf | BSD-3-Clause
| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.3.5 | BSD-3-Clause
| link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.0.0-20201208040808-7e3f01d25324 | BSD-3-Clause
Expand Down Expand Up @@ -396,10 +396,10 @@ This page lists the third-party dependencies used to build {n}.
| link:https://gotest.tools/v3[$$gotest.tools/v3$$] | v3.0.2 | Apache-2.0
| link:https://honnef.co/go/tools[$$honnef.co/go/tools$$] | v0.0.1-2020.1.4 | MIT
| link:https://gitlab.howett.net/go/plist[$$howett.net/plist$$] | v0.0.0-20181124034731-591f970eefbb | BSD-2-Clause
| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.20.1 | Apache-2.0
| link:https://github.com/kubernetes/apiserver[$$k8s.io/apiserver$$] | v0.20.1 | Apache-2.0
| link:https://github.com/kubernetes/code-generator[$$k8s.io/code-generator$$] | v0.20.1 | Apache-2.0
| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.20.1 | Apache-2.0
| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.20.2 | Apache-2.0
| link:https://github.com/kubernetes/apiserver[$$k8s.io/apiserver$$] | v0.20.2 | Apache-2.0
| link:https://github.com/kubernetes/code-generator[$$k8s.io/code-generator$$] | v0.20.2 | Apache-2.0
| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.20.2 | Apache-2.0
| link:https://github.com/kubernetes/gengo[$$k8s.io/gengo$$] | v0.0.0-20201113003025-83324d819ded | Apache-2.0
| link:https://github.com/kubernetes/klog[$$k8s.io/klog$$] | v1.0.0 | Apache-2.0
| link:https://github.com/kubernetes/kube-openapi[$$k8s.io/kube-openapi$$] | v0.0.0-20210113233702-8566a335510f | Apache-2.0
Expand Down

0 comments on commit d8f633a

Please sign in to comment.