kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove targetRamMb option, which was removed in kubernetes 1.24. Add watchCache and watchCacheSizes apiserver flags

This commit is contained in:
Rafael da Fonseca 2024-10-25 09:16:12 +01:00
parent daea619a59
commit 7d673c0f7c
11 changed files with 97 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/cluster_spec.md
View File

@ -586,14 +586,27 @@ spec:
disableBasicAuth: true
```
### targetRamMb
Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
### watchCache
Used to disable watch caching in the apiserver, defaults to enabling caching by omission
```yaml
spec:
kubeAPIServer:
targetRamMb: 4096
watchCache: false
```
### watchCacheSizes
Set the watch-cache-sizes parameter for the apiserver
The only currently useful value is setting to 0, which disable caches for specific object types.
Setting any values other than 0 for a resource will yield no effect since the caches are dynamic
```yaml
spec:
kubeAPIServer:
watchCacheSizes:
- secrets#0
- pods#0
```
### eventTTL
@ -1585,7 +1598,6 @@ the removal of fields no longer in use.
| kubeAPIServer.oidcRequiredClaim (list) | authentication.oidc.oidcRequiredClaims (map) |
| kubeAPIServer.oidcUsernameClaim | authentication.oidc.usernameClaim |
| kubeAPIServer.oidcUsernamePrefix | authentication.oidc.usernamePrefix |
| kubeAPIServer.targetRamMb | kubeAPIServer.targetRamMB |
| kubeControllerManager.concurrentRcSyncs | kubeControllerManager.concurrentRCSyncs |
| kubelet.authenticationTokenWebhookCacheTtl | kubelet.authenticationTokenWebhookCacheTTL |
| kubelet.clientCaFile | kubelet.clientCAFile |

17
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -2132,11 +2132,6 @@ spec:
storageBackend:
description: StorageBackend is the backend storage
type: string
targetRamMb:
description: Memory limit for apiserver in MB (used to configure
sizes of caches, etc.)
format: int32
type: integer
tlsCertFile:
type: string
tlsCipherSuites:
@ -2152,6 +2147,18 @@ spec:
type: string
tokenAuthFile:
type: string
watchCache:
description: Used to disable watch caching in the apiserver, defaults
to enabling caching by omission
type: boolean
watchCacheSizes:
description: |-
Set the watch-cache-sizes parameter for the apiserver
The only meaningful value is setting to 0, which disable caches for specific object types.
Setting any values other than 0 for a resource will yield no effect since the caches are dynamic
items:
type: string
type: array
type: object
kubeControllerManager:
description: KubeControllerManagerConfig is the configuration for

11
nodeup/pkg/model/kube_apiserver_test.go
View File

@ -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,9 +93,15 @@ func Test_KubeAPIServer_BuildFlags(t *testing.T) {
},
{
kops.KubeAPIServerConfig{
TargetRamMB: 320,
WatchCache: pointer.Bool(false),
},
"--secure-port=0 --target-ram-mb=320",
"--secure-port=0 --watch-cache=false",
},
{
kops.KubeAPIServerConfig{
WatchCacheSizes: []string{"secrets#0", "pods#0"},
},
"--secure-port=0 --watch-cache-sizes=secrets#0,pods#0",
},
{
kops.KubeAPIServerConfig{

9
pkg/apis/kops/componentconfig.go
View File

@ -487,8 +487,13 @@ type KubeAPIServerConfig struct {
// Currently only honored by the watch request handler
MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
// Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
TargetRamMB int32 `json:"targetRamMB,omitempty" flag:"target-ram-mb" flag-empty:"0"`
// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
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.
// Setting any values other than 0 for a resource will yield no effect since the caches are dynamic
WatchCacheSizes []string `json:"watchCacheSizes,omitempty" flag:"watch-cache-sizes" flag-empty:"0"`
// File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens.
// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.

9
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -494,8 +494,13 @@ type KubeAPIServerConfig struct {
// Currently only honored by the watch request handler
MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
// Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
TargetRamMB int32 `json:"targetRamMb,omitempty" flag:"target-ram-mb" flag-empty:"0"`
// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
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.
// Setting any values other than 0 for a resource will yield no effect since the caches are dynamic
WatchCacheSizes []string `json:"watchCacheSizes,omitempty" flag:"watch-cache-sizes" flag-empty:"0"`
// File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens.
// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.

6
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -4954,7 +4954,8 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.EtcdQuorumRead = in.EtcdQuorumRead
out.RequestTimeout = in.RequestTimeout
out.MinRequestTimeout = in.MinRequestTimeout
out.TargetRamMB = in.TargetRamMB
out.WatchCache = in.WatchCache
out.WatchCacheSizes = in.WatchCacheSizes
out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
out.ServiceAccountSigningKeyFile = in.ServiceAccountSigningKeyFile
out.ServiceAccountIssuer = in.ServiceAccountIssuer
@ -5069,7 +5070,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.EtcdQuorumRead = in.EtcdQuorumRead
out.RequestTimeout = in.RequestTimeout
out.MinRequestTimeout = in.MinRequestTimeout
out.TargetRamMB = in.TargetRamMB
out.WatchCache = in.WatchCache
out.WatchCacheSizes = in.WatchCacheSizes
out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
out.ServiceAccountSigningKeyFile = in.ServiceAccountSigningKeyFile
out.ServiceAccountIssuer = in.ServiceAccountIssuer

10
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -3330,6 +3330,16 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
*out = new(int32)
**out = **in
}
if in.WatchCache != nil {
in, out := &in.WatchCache, &out.WatchCache
*out = new(bool)
**out = **in
}
if in.WatchCacheSizes != nil {
in, out := &in.WatchCacheSizes, &out.WatchCacheSizes
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ServiceAccountKeyFile != nil {
in, out := &in.ServiceAccountKeyFile, &out.ServiceAccountKeyFile
*out = make([]string, len(*in))

9
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -485,8 +485,13 @@ type KubeAPIServerConfig struct {
// Currently only honored by the watch request handler
MinRequestTimeout *int32 `json:"minRequestTimeout,omitempty" flag:"min-request-timeout"`
// Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
TargetRamMB int32 `json:"targetRamMB,omitempty" flag:"target-ram-mb" flag-empty:"0"`
// Used to disable watch caching in the apiserver, defaults to enabling caching by omission
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.
// Setting any values other than 0 for a resource will yield no effect since the caches are dynamic
WatchCacheSizes []string `json:"watchCacheSizes,omitempty" flag:"watch-cache-sizes" flag-empty:"0"`
// File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens.
// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.

6
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -5350,7 +5350,8 @@ func autoConvert_v1alpha3_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.EtcdQuorumRead = in.EtcdQuorumRead
out.RequestTimeout = in.RequestTimeout
out.MinRequestTimeout = in.MinRequestTimeout
out.TargetRamMB = in.TargetRamMB
out.WatchCache = in.WatchCache
out.WatchCacheSizes = in.WatchCacheSizes
out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
out.ServiceAccountSigningKeyFile = in.ServiceAccountSigningKeyFile
out.ServiceAccountIssuer = in.ServiceAccountIssuer
@ -5465,7 +5466,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha3_KubeAPIServerConfig(in *ko
out.EtcdQuorumRead = in.EtcdQuorumRead
out.RequestTimeout = in.RequestTimeout
out.MinRequestTimeout = in.MinRequestTimeout
out.TargetRamMB = in.TargetRamMB
out.WatchCache = in.WatchCache
out.WatchCacheSizes = in.WatchCacheSizes
out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
out.ServiceAccountSigningKeyFile = in.ServiceAccountSigningKeyFile
out.ServiceAccountIssuer = in.ServiceAccountIssuer

10
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -3304,6 +3304,16 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
*out = new(int32)
**out = **in
}
if in.WatchCache != nil {
in, out := &in.WatchCache, &out.WatchCache
*out = new(bool)
**out = **in
}
if in.WatchCacheSizes != nil {
in, out := &in.WatchCacheSizes, &out.WatchCacheSizes
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ServiceAccountKeyFile != nil {
in, out := &in.ServiceAccountKeyFile, &out.ServiceAccountKeyFile
*out = make([]string, len(*in))

10
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -3407,6 +3407,16 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
*out = new(int32)
**out = **in
}
if in.WatchCache != nil {
in, out := &in.WatchCache, &out.WatchCache
*out = new(bool)
**out = **in
}
if in.WatchCacheSizes != nil {
in, out := &in.WatchCacheSizes, &out.WatchCacheSizes
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.ServiceAccountKeyFile != nil {
in, out := &in.ServiceAccountKeyFile, &out.ServiceAccountKeyFile
*out = make([]string, len(*in))