Skip to content

Commit bc6ad7c

Browse files
authored
Merge pull request #18085 from ronaldngounou/align-kops-scalability-with-kube-up-kubelet-kubeAPIQPS
scaletest: Align kops scalability configuration with kube-up for kubelet kubeAPIQPS
2 parents 4b46253 + 08d7664 commit bc6ad7c

11 files changed

Lines changed: 41 additions & 0 deletions

k8s/crds/kops.k8s.io_clusters.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4364,6 +4364,11 @@ spec:
43644364
description: Integrate with the kernel memcg notification to determine
43654365
if memory eviction thresholds are crossed rather than polling.
43664366
type: boolean
4367+
kubeAPIQPS:
4368+
description: KubeAPIQPS Burst to use while talking with kubernetes
4369+
apiserver. (default 50)
4370+
format: int32
4371+
type: integer
43674372
kubeReserved:
43684373
additionalProperties:
43694374
type: string
@@ -4833,6 +4838,11 @@ spec:
48334838
description: Integrate with the kernel memcg notification to determine
48344839
if memory eviction thresholds are crossed rather than polling.
48354840
type: boolean
4841+
kubeAPIQPS:
4842+
description: KubeAPIQPS Burst to use while talking with kubernetes
4843+
apiserver. (default 50)
4844+
format: int32
4845+
type: integer
48364846
kubeReserved:
48374847
additionalProperties:
48384848
type: string

k8s/crds/kops.k8s.io_instancegroups.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,11 @@ spec:
660660
description: Integrate with the kernel memcg notification to determine
661661
if memory eviction thresholds are crossed rather than polling.
662662
type: boolean
663+
kubeAPIQPS:
664+
description: KubeAPIQPS Burst to use while talking with kubernetes
665+
apiserver. (default 50)
666+
format: int32
667+
type: integer
663668
kubeReserved:
664669
additionalProperties:
665670
type: string

pkg/apis/kops/componentconfig.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ type KubeletConfigSpec struct {
252252
MemorySwapBehavior string `json:"memorySwapBehavior,omitempty"`
253253
// CrashLoopBackOffMaxContainerRestartPeriod is the maximum duration the backoff delay can accrue to for container restarts, minimum 1 second, maximum 300 seconds. If not set, defaults to the internal crashloopbackoff maximum (300s).
254254
CrashLoopBackOffMaxContainerRestartPeriod *metav1.Duration `json:"crashLoopBackOffMaxContainerRestartPeriod,omitempty"`
255+
// KubeAPIQPS Burst to use while talking with kubernetes apiserver. (default 50)
256+
KubeAPIQPS *int32 `json:"kubeAPIQPS,omitempty" flag:"kube-api-qps"`
255257
}
256258

257259
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha2/componentconfig.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ type KubeletConfigSpec struct {
252252
MemorySwapBehavior string `json:"memorySwapBehavior,omitempty"`
253253
// CrashLoopBackOffMaxContainerRestartPeriod is the maximum duration the backoff delay can accrue to for container restarts, minimum 1 second, maximum 300 seconds. If not set, defaults to the internal crashloopbackoff maximum (300s).
254254
CrashLoopBackOffMaxContainerRestartPeriod *metav1.Duration `json:"crashLoopBackOffMaxContainerRestartPeriod,omitempty"`
255+
// KubeAPIQPS Burst to use while talking with kubernetes apiserver. (default 50)
256+
KubeAPIQPS *int32 `json:"kubeAPIQPS,omitempty" flag:"kube-api-qps"`
255257
}
256258

257259
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/componentconfig.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ type KubeletConfigSpec struct {
250250
MemorySwapBehavior string `json:"memorySwapBehavior,omitempty"`
251251
// CrashLoopBackOffMaxContainerRestartPeriod is the maximum duration the backoff delay can accrue to for container restarts, minimum 1 second, maximum 300 seconds. If not set, defaults to the internal crashloopbackoff maximum (300s).
252252
CrashLoopBackOffMaxContainerRestartPeriod *metav1.Duration `json:"crashLoopBackOffMaxContainerRestartPeriod,omitempty"`
253+
// KubeAPIQPS Burst to use while talking with kubernetes apiserver. (default 50)
254+
KubeAPIQPS *int32 `json:"kubeAPIQPS,omitempty" flag:"kube-api-qps"`
253255
}
254256

255257
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha3/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)