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

Merge pull request #16280 from hakuna-matatah/master 

Add support to configure Job Controller concurrent syncs flag in Job…
This commit is contained in:
Kubernetes Prow Robot 2024-01-25 21:09:57 +01:00 committed by GitHub
parent 8ae3a6e963 e4e2847403
commit 862fe05197
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2152,6 +2152,11 @@ spec:
are allowed to sync concurrently (default 5).
format: int32
type: integer
concurrentJobSyncs:
description: The number of job objects that are allowed to sync
concurrently (default 5).
format: int32
type: integer
concurrentNamespaceSyncs:
description: The number of namespace objects that are allowed
to sync concurrently.

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

@ -655,6 +655,8 @@ type KubeControllerManagerConfig struct {
ConcurrentRCSyncs *int32 `json:"concurrentRCSyncs,omitempty" flag:"concurrent-rc-syncs"`
// The number of horizontal pod autoscaler objects that are allowed to sync concurrently (default 5).
ConcurrentHorizontalPodAustoscalerSyncs *int32 `json:"concurrentHorizontalPodAustoscalerSyncs,omitempty" flag:"concurrent-horizontal-pod-autoscaler-syncs"`
// The number of job objects that are allowed to sync concurrently (default 5).
ConcurrentJobSyncs *int32 `json:"concurrentJobSyncs,omitempty" flag:"concurrent-job-syncs"`
// AuthenticationKubeconfig is the path to an Authentication Kubeconfig
AuthenticationKubeconfig string `json:"authenticationKubeconfig,omitempty" flag:"authentication-kubeconfig"`
// AuthorizationKubeconfig is the path to an Authorization Kubeconfig

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

@ -663,6 +663,8 @@ type KubeControllerManagerConfig struct {
ConcurrentRCSyncs *int32 `json:"concurrentRcSyncs,omitempty" flag:"concurrent-rc-syncs"`
// The number of horizontal pod autoscaler objects that are allowed to sync concurrently (default 5).
ConcurrentHorizontalPodAustoscalerSyncs *int32 `json:"concurrentHorizontalPodAustoscalerSyncs,omitempty" flag:"concurrent-horizontal-pod-autoscaler-syncs"`
// The number of job objects that are allowed to sync concurrently (default 5).
ConcurrentJobSyncs *int32 `json:"concurrentJobSyncs,omitempty" flag:"concurrent-job-syncs"`
// AuthenticationKubeconfig is the path to an Authentication Kubeconfig
AuthenticationKubeconfig string `json:"authenticationKubeconfig,omitempty" flag:"authentication-kubeconfig"`
// AuthorizationKubeconfig is the path to an Authorization Kubeconfig

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

@ -5140,6 +5140,7 @@ func autoConvert_v1alpha2_KubeControllerManagerConfig_To_kops_KubeControllerMana
out.ConcurrentServiceaccountTokenSyncs = in.ConcurrentServiceaccountTokenSyncs
out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
out.ConcurrentHorizontalPodAustoscalerSyncs = in.ConcurrentHorizontalPodAustoscalerSyncs
out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
out.AuthenticationKubeconfig = in.AuthenticationKubeconfig
out.AuthorizationKubeconfig = in.AuthorizationKubeconfig
out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths
@ -5215,6 +5216,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha2_KubeControllerMana
out.ConcurrentServiceaccountTokenSyncs = in.ConcurrentServiceaccountTokenSyncs
out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
out.ConcurrentHorizontalPodAustoscalerSyncs = in.ConcurrentHorizontalPodAustoscalerSyncs
out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
out.AuthenticationKubeconfig = in.AuthenticationKubeconfig
out.AuthorizationKubeconfig = in.AuthorizationKubeconfig
out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths

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

@ -3596,6 +3596,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo
*out = new(int32)
**out = **in
}
if in.ConcurrentJobSyncs != nil {
in, out := &in.ConcurrentJobSyncs, &out.ConcurrentJobSyncs
*out = new(int32)
**out = **in
}
if in.AuthorizationAlwaysAllowPaths != nil {
in, out := &in.AuthorizationAlwaysAllowPaths, &out.AuthorizationAlwaysAllowPaths
*out = make([]string, len(*in))

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

@ -654,6 +654,8 @@ type KubeControllerManagerConfig struct {
ConcurrentRCSyncs *int32 `json:"concurrentRCSyncs,omitempty" flag:"concurrent-rc-syncs"`
// The number of horizontal pod autoscaler objects that are allowed to sync concurrently (default 5).
ConcurrentHorizontalPodAustoscalerSyncs *int32 `json:"concurrentHorizontalPodAustoscalerSyncs,omitempty" flag:"concurrent-horizontal-pod-autoscaler-syncs"`
// The number of job objects that are allowed to sync concurrently (default 5).
ConcurrentJobSyncs *int32 `json:"concurrentJobSyncs,omitempty" flag:"concurrent-job-syncs"`
// AuthenticationKubeconfig is the path to an Authentication Kubeconfig
AuthenticationKubeconfig string `json:"authenticationKubeconfig,omitempty" flag:"authentication-kubeconfig"`
// AuthorizationKubeconfig is the path to an Authorization Kubeconfig

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

@ -5535,6 +5535,7 @@ func autoConvert_v1alpha3_KubeControllerManagerConfig_To_kops_KubeControllerMana
out.ConcurrentServiceaccountTokenSyncs = in.ConcurrentServiceaccountTokenSyncs
out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
out.ConcurrentHorizontalPodAustoscalerSyncs = in.ConcurrentHorizontalPodAustoscalerSyncs
out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
out.AuthenticationKubeconfig = in.AuthenticationKubeconfig
out.AuthorizationKubeconfig = in.AuthorizationKubeconfig
out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths
@ -5610,6 +5611,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha3_KubeControllerMana
out.ConcurrentServiceaccountTokenSyncs = in.ConcurrentServiceaccountTokenSyncs
out.ConcurrentRCSyncs = in.ConcurrentRCSyncs
out.ConcurrentHorizontalPodAustoscalerSyncs = in.ConcurrentHorizontalPodAustoscalerSyncs
out.ConcurrentJobSyncs = in.ConcurrentJobSyncs
out.AuthenticationKubeconfig = in.AuthenticationKubeconfig
out.AuthorizationKubeconfig = in.AuthorizationKubeconfig
out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths

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

@ -3570,6 +3570,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo
*out = new(int32)
**out = **in
}
if in.ConcurrentJobSyncs != nil {
in, out := &in.ConcurrentJobSyncs, &out.ConcurrentJobSyncs
*out = new(int32)
**out = **in
}
if in.AuthorizationAlwaysAllowPaths != nil {
in, out := &in.AuthorizationAlwaysAllowPaths, &out.AuthorizationAlwaysAllowPaths
*out = make([]string, len(*in))

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

@ -3673,6 +3673,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo
*out = new(int32)
**out = **in
}
if in.ConcurrentJobSyncs != nil {
in, out := &in.ConcurrentJobSyncs, &out.ConcurrentJobSyncs
*out = new(int32)
**out = **in
}
if in.AuthorizationAlwaysAllowPaths != nil {
in, out := &in.AuthorizationAlwaysAllowPaths, &out.AuthorizationAlwaysAllowPaths
*out = make([]string, len(*in))

2
tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View File

@ -137,7 +137,7 @@ ClusterName: complex.example.com
ConfigBase: memfs://clusters.example.com/complex.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: oS9f/2989IOxnyiWmx1lnkIQsogeQAhSZLPP6TSUsKo=
NodeupConfigHash: ZeUk/d08NY4je+aTu+UhnnDUGxSeI42OPRdC0Z2skRw=
__EOF_KUBE_ENV

1
tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
View File

@ -136,6 +136,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: complex.example.com
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
configureCloudRoutes: false
featureGates:
CSIMigrationAWS: "true"

1
tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -242,6 +242,7 @@ ControlPlaneConfig:
clusterCIDR: 100.96.0.0/11
clusterName: complex.example.com
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
configureCloudRoutes: false
featureGates:
CSIMigrationAWS: "true"

1
tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
View File

@ -52,6 +52,7 @@ spec:
memoryLimit: 1000Mi
kubeControllerManager:
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
kubelet:
anonymousAuth: false
kubernetesVersion: v1.24.0

1
tests/integration/update_cluster/complex/in-v1alpha2.yaml
View File

@ -29,6 +29,7 @@ spec:
concurrentNodeSyncs: 5
kubeControllerManager:
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
cloudProvider: aws
cloudLabels:
Owner: John Doe