Skip to content

Commit dbfba2f

Browse files
authored
Fix kubelet start error on 1.28.0-rc.0 (#4108)
Kubelet exited with logging configuration was already applied earlier, changing it is not allowed
1 parent c684817 commit dbfba2f

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 55f4864d816c8e7ca0ebb39571dc88dbdf05eff2 Mon Sep 17 00:00:00 2001
2+
From: Angelos Kolaitis <angelos.kolaitis@canonical.com>
3+
Date: Thu, 27 Jul 2023 18:08:00 +0300
4+
Subject: [PATCH] Set log reapply handling to ignore unchanged
5+
6+
---
7+
staging/src/k8s.io/component-base/logs/api/v1/options.go | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/staging/src/k8s.io/component-base/logs/api/v1/options.go b/staging/src/k8s.io/component-base/logs/api/v1/options.go
11+
index 2db9b1f5382..e0824dcdc4e 100644
12+
--- a/staging/src/k8s.io/component-base/logs/api/v1/options.go
13+
+++ b/staging/src/k8s.io/component-base/logs/api/v1/options.go
14+
@@ -64,7 +64,7 @@ func NewLoggingConfiguration() *LoggingConfiguration {
15+
// are no goroutines which might call logging functions. The default for ValidateAndApply
16+
// and ValidateAndApplyWithOptions is to return an error when called more than once.
17+
// Binaries and unit tests can override that behavior.
18+
-var ReapplyHandling = ReapplyHandlingError
19+
+var ReapplyHandling = ReapplyHandlingIgnoreUnchanged
20+
21+
type ReapplyHandlingType int
22+
23+
--
24+
2.34.1

0 commit comments

Comments
 (0)