Skip to content

Commit

Permalink
fix incorrect use of fsnotify in configtls
Browse files Browse the repository at this point in the history
  • Loading branch information
haoqixu committed Sep 14, 2023
1 parent 767b95e commit a190065
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .chloggen/fix-incorrect-use-of-fsnotify.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: configtls

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: fix incorrect use of fsnotify

# One or more tracking issues or pull requests related to the change
issues: [8438]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
4 changes: 2 additions & 2 deletions config/configtls/clientcasfilereloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (r *clientCAsFileReloader) handleWatcherEvents() {
// NOTE: k8s configmaps uses symlinks, we need this workaround.
// original configmap file is removed.
// SEE: https://martensson.io/go-fsnotify-and-kubernetes-configmaps/
if event.Op == fsnotify.Remove || event.Op == fsnotify.Chmod {
if event.Has(fsnotify.Remove) || event.Has(fsnotify.Chmod) {
// remove the watcher since the file is removed
if err := r.watcher.Remove(event.Name); err != nil {
r.lastReloadError = err
Expand All @@ -123,7 +123,7 @@ func (r *clientCAsFileReloader) handleWatcherEvents() {
}
r.reload()
}
if event.Op == fsnotify.Write {
if event.Has(fsnotify.Write) {
r.reload()
}
}
Expand Down

0 comments on commit a190065

Please sign in to comment.