diff --git a/go.mod b/go.mod
index 5cb616d71..f73069529 100644
--- a/go.mod
+++ b/go.mod
@@ -53,7 +53,7 @@ require (
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
mvdan.cc/sh/v3 v3.8.0
- sigs.k8s.io/controller-runtime v0.18.4
+ sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/controller-tools v0.15.0
sigs.k8s.io/yaml v1.4.0
)
diff --git a/go.sum b/go.sum
index 731ba923a..f7fd13189 100644
--- a/go.sum
+++ b/go.sum
@@ -1885,8 +1885,8 @@ mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14/go.mod h1:ZzZjEpJDOmx8TdVU6u
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
-sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
+sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
+sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/controller-tools v0.15.0 h1:4dxdABXGDhIa68Fiwaif0vcu32xfwmgQ+w8p+5CxoAI=
sigs.k8s.io/controller-tools v0.15.0/go.mod h1:8zUSS2T8Hx0APCNRhJWbS3CAQEbIxLa07khzh7pZmXM=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4eca7b939..4f4fb73d4 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -2236,7 +2236,7 @@ mvdan.cc/sh/v3/syntax/typedjson
# mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14
## explicit; go 1.20
mvdan.cc/unparam/check
-# sigs.k8s.io/controller-runtime v0.18.4
+# sigs.k8s.io/controller-runtime v0.18.5
## explicit; go 1.22.0
sigs.k8s.io/controller-runtime
sigs.k8s.io/controller-runtime/pkg/builder
diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go b/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go
index 2b9b60d8d..fe15fc0dd 100644
--- a/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go
+++ b/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go
@@ -173,14 +173,14 @@ func (cw *CertWatcher) ReadCertificate() error {
func (cw *CertWatcher) handleEvent(event fsnotify.Event) {
// Only care about events which may modify the contents of the file.
- if !(isWrite(event) || isRemove(event) || isCreate(event)) {
+ if !(isWrite(event) || isRemove(event) || isCreate(event) || isChmod(event)) {
return
}
log.V(1).Info("certificate event", "event", event)
- // If the file was removed, re-add the watch.
- if isRemove(event) {
+ // If the file was removed or renamed, re-add the watch to the previous name
+ if isRemove(event) || isChmod(event) {
if err := cw.watcher.Add(event.Name); err != nil {
log.Error(err, "error re-watching file")
}
@@ -202,3 +202,7 @@ func isCreate(event fsnotify.Event) bool {
func isRemove(event fsnotify.Event) bool {
return event.Op.Has(fsnotify.Remove)
}
+
+func isChmod(event fsnotify.Event) bool {
+ return event.Op.Has(fsnotify.Chmod)
+}
diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go b/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go
index e6c075eb0..451f7b2a1 100644
--- a/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go
+++ b/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go
@@ -124,19 +124,15 @@ func newClient(config *rest.Config, options Options) (*client, error) {
config.UserAgent = rest.DefaultKubernetesUserAgent()
}
- if !options.WarningHandler.SuppressWarnings {
- // surface warnings
- logger := log.Log.WithName("KubeAPIWarningLogger")
- // Set a WarningHandler, the default WarningHandler
- // is log.KubeAPIWarningLogger with deduplication enabled.
- // See log.KubeAPIWarningLoggerOptions for considerations
- // regarding deduplication.
- config.WarningHandler = log.NewKubeAPIWarningLogger(
- logger,
- log.KubeAPIWarningLoggerOptions{
- Deduplicate: !options.WarningHandler.AllowDuplicateLogs,
- },
- )
+ // By default, we de-duplicate and surface warnings.
+ config.WarningHandler = log.NewKubeAPIWarningLogger(
+ log.Log.WithName("KubeAPIWarningLogger"),
+ log.KubeAPIWarningLoggerOptions{
+ Deduplicate: !options.WarningHandler.AllowDuplicateLogs,
+ },
+ )
+ if options.WarningHandler.SuppressWarnings {
+ config.WarningHandler = rest.NoWarnings{}
}
// Use the rest HTTP client for the provided config if unset
diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go b/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
index 2ce02b105..66a2d277f 100644
--- a/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
+++ b/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
@@ -187,7 +187,7 @@ func (cm *controllerManager) AddMetricsServerExtraHandler(path string, handler h
return fmt.Errorf("unable to add new metrics handler because metrics endpoint has already been created")
}
if cm.metricsServer == nil {
- cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler %q will be ignored", path)
+ cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler will be ignored", "path", path)
return nil
}
if err := cm.metricsServer.AddExtraHandler(path, handler); err != nil {