Merge pull request #16280 from hakuna-matatah/master

Add support to configure Job Controller concurrent syncs flag in Job…
kubernetes · Jan 25, 2024 · 862fe05 · 862fe05
2 parents 8ae3a6e + e4e2847
commit 862fe05
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 1 deletion.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -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.

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -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

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -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

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go
@@ -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

diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -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
 

diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
@@ -136,6 +136,7 @@ spec:
     clusterCIDR: 100.96.0.0/11
     clusterName: complex.example.com
     concurrentHorizontalPodAustoscalerSyncs: 10
+    concurrentJobSyncs: 10
     configureCloudRoutes: false
     featureGates:
       CSIMigrationAWS: "true"

diff --git a/...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -242,6 +242,7 @@ ControlPlaneConfig:
     clusterCIDR: 100.96.0.0/11
     clusterName: complex.example.com
     concurrentHorizontalPodAustoscalerSyncs: 10
+    concurrentJobSyncs: 10
     configureCloudRoutes: false
     featureGates:
       CSIMigrationAWS: "true"

diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
@@ -52,6 +52,7 @@ spec:
     memoryLimit: 1000Mi
   kubeControllerManager:
     concurrentHorizontalPodAustoscalerSyncs: 10
+    concurrentJobSyncs: 10
   kubelet:
     anonymousAuth: false
   kubernetesVersion: v1.24.0

diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml
@@ -29,6 +29,7 @@ spec:
     concurrentNodeSyncs: 5
   kubeControllerManager:
     concurrentHorizontalPodAustoscalerSyncs: 10
+    concurrentJobSyncs: 10
   cloudProvider: aws
   cloudLabels:
     Owner: John Doe