fix watch-cache flag

kubernetes · Oct 24, 2024 · be75191 · be75191
1 parent 6773431
commit be75191
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/nodeup/pkg/model/kube_apiserver_test.go b/nodeup/pkg/model/kube_apiserver_test.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kops/pkg/flagbuilder"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/architectures"
+	"k8s.io/utils/pointer"
 )
 
 func Test_KubeAPIServer_BuildFlags(t *testing.T) {
@@ -92,7 +93,7 @@ func Test_KubeAPIServer_BuildFlags(t *testing.T) {
 		},
 		{
 			kops.KubeAPIServerConfig{
-				WatchCache: false,
+				WatchCache: pointer.Bool(false),
 			},
 			"--secure-port=0 --watch-cache=false",
 		},

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -488,7 +488,7 @@ type KubeAPIServerConfig struct {
 	MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
 
 	// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
-	WatchCache bool `json:"watchCache,omitempty" flag:"watch-cache"`
+	WatchCache *bool `json:"watchCache,omitempty" flag:"watch-cache"`
 
 	// Set the watch-cache-sizes parameter for the apiserver
 	// The only meaningful value is setting to 0, which disable caches for specific object types.

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -495,7 +495,7 @@ type KubeAPIServerConfig struct {
 	MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
 
 	// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
-	WatchCache bool `json:"watchCache,omitempty" flag:"watch-cache"`
+	WatchCache *bool `json:"watchCache,omitempty" flag:"watch-cache"`
 
 	// Set the watch-cache-sizes parameter for the apiserver
 	// The only meaningful value is setting to 0, which disable caches for specific object types.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go
@@ -486,7 +486,7 @@ type KubeAPIServerConfig struct {
 	MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
 
 	// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
-	WatchCache bool `json:"watchCache,omitempty" flag:"watch-cache"`
+	WatchCache *bool `json:"watchCache,omitempty" flag:"watch-cache"`
 
 	// Set the watch-cache-sizes parameter for the apiserver
 	// The only meaningful value is setting to 0, which disable caches for specific object types.

diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go