github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128444 from tosi3k/ds-syncs

Browse Source 
Add --concurrent-daemonset-syncs argument to kube-controller-manager
This commit is contained in:
Kubernetes Prow Robot 2024-10-31 19:21:34 +00:00 committed by GitHub
commit d34c181465
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kube-controller-manager/app/options/daemonsetcontroller.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package options package options
import ( import (
"fmt"
"github.com/spf13/pflag" "github.com/spf13/pflag"
daemonconfig "k8s.io/kubernetes/pkg/controller/daemon/config" daemonconfig "k8s.io/kubernetes/pkg/controller/daemon/config"
@ -32,6 +34,8 @@ func (o *DaemonSetControllerOptions) AddFlags(fs *pflag.FlagSet) {
if o == nil { if o == nil {
return return
} }
fs.Int32Var(&o.ConcurrentDaemonSetSyncs, "concurrent-daemonset-syncs", o.ConcurrentDaemonSetSyncs, "The number of daemonset objects that are allowed to sync concurrently. Larger number = more responsive daemonsets, but more CPU (and network) load")
} }
// ApplyTo fills up DaemonSetController config with options. // ApplyTo fills up DaemonSetController config with options.
@ -52,5 +56,8 @@ func (o *DaemonSetControllerOptions) Validate() []error {
} }
errs := []error{} errs := []error{}
if o.ConcurrentDaemonSetSyncs < 1 {
errs = append(errs, fmt.Errorf("concurrent-daemonset-syncs must be greater than 0, but got %d", o.ConcurrentDaemonSetSyncs))
}
return errs return errs
} }

12
cmd/kube-controller-manager/app/options/options_test.go
View File

@ -98,6 +98,7 @@ var args = []string{
"--cluster-signing-legacy-unknown-cert-file=/cluster-signing-legacy-unknown/cert-file", "--cluster-signing-legacy-unknown-cert-file=/cluster-signing-legacy-unknown/cert-file",
"--cluster-signing-legacy-unknown-key-file=/cluster-signing-legacy-unknown/key-file", "--cluster-signing-legacy-unknown-key-file=/cluster-signing-legacy-unknown/key-file",
"--concurrent-deployment-syncs=10", "--concurrent-deployment-syncs=10",
"--concurrent-daemonset-syncs=10",
"--concurrent-horizontal-pod-autoscaler-syncs=10", "--concurrent-horizontal-pod-autoscaler-syncs=10",
"--concurrent-statefulset-syncs=15", "--concurrent-statefulset-syncs=15",
"--concurrent-endpoint-syncs=10", "--concurrent-endpoint-syncs=10",
@ -264,7 +265,7 @@ func TestAddFlags(t *testing.T) {
}, },
DaemonSetController: &DaemonSetControllerOptions{ DaemonSetController: &DaemonSetControllerOptions{
&daemonconfig.DaemonSetControllerConfiguration{ &daemonconfig.DaemonSetControllerConfiguration{
ConcurrentDaemonSetSyncs: 2, ConcurrentDaemonSetSyncs: 10,
}, },
}, },
DeploymentController: &DeploymentControllerOptions{ DeploymentController: &DeploymentControllerOptions{
@ -514,6 +515,13 @@ func TestValidateFlags(t *testing.T) {
}, },
wantErr: true, wantErr: true,
}, },
{
name: "concurrent daemonset syncs set to 0",
flags: []string{
"--concurrent-daemonset-syncs=0",
},
wantErr: true,
},
} }
for _, tc := range testcases { for _, tc := range testcases {
@ -609,7 +617,7 @@ func TestApplyTo(t *testing.T) {
}, },
}, },
DaemonSetController: daemonconfig.DaemonSetControllerConfiguration{ DaemonSetController: daemonconfig.DaemonSetControllerConfiguration{
ConcurrentDaemonSetSyncs: 2, ConcurrentDaemonSetSyncs: 10,
}, },
DeploymentController: deploymentconfig.DeploymentControllerConfiguration{ DeploymentController: deploymentconfig.DeploymentControllerConfiguration{
ConcurrentDeploymentSyncs: 10, ConcurrentDeploymentSyncs: 10,