Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support to configure Job Controller concurrent syncs flag in Job… #16280

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Add support to configure Job Controller concurrent syncs flag in Job… #16280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: complex.example.com
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
configureCloudRoutes: false
featureGates:
CSIMigrationAWS: "true"
Expand Down
1 change: 1 addition & 0 deletions ...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ ControlPlaneConfig:
clusterCIDR: 100.96.0.0/11
clusterName: complex.example.com
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
configureCloudRoutes: false
featureGates:
CSIMigrationAWS: "true"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ spec:
memoryLimit: 1000Mi
kubeControllerManager:
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
kubelet:
anonymousAuth: false
kubernetesVersion: v1.24.0
Expand Down
1 change: 1 addition & 0 deletions tests/integration/update_cluster/complex/in-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ spec:
concurrentNodeSyncs: 5
kubeControllerManager:
concurrentHorizontalPodAustoscalerSyncs: 10
concurrentJobSyncs: 10
cloudProvider: aws
cloudLabels:
Owner: John Doe
Expand Down
Loading