Skip to content

Commit c36dbe2

Browse files
azrshazrsh
committed
Revert "gha: make MaxConcurrentReconciles for each reconciler configurable (#1)"
This reverts commit 057a1e7.
1 parent a03c1ed commit c36dbe2

11 files changed

Lines changed: 62 additions & 121 deletions

‎charts/gha-runner-scale-set-controller/templates/deployment.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,6 @@ spec:
8585
{{- range .Values.flags.excludeLabelPropagationPrefixes }}
8686
- "--exclude-label-propagation-prefix={{ . }}"
8787
{{- end }}
88-
{{- with .Values.flags.maxConcurrentReconcilesForAutoscalingRunnerSet }}
89-
- "--max-concurrent-reconciles-for-autoscaling-runner-set={{ . }}"
90-
{{- end }}
91-
{{- with .Values.flags.maxConcurrentReconcilesForEphemeralRunnerSet }}
92-
- "--max-concurrent-reconciles-for-ephemeral-runner-set={{ . }}"
93-
{{- end }}
94-
{{- with .Values.flags.maxConcurrentReconcilesForEphemeralRunner }}
95-
- "--max-concurrent-reconciles-for-ephemeral-runner={{ . }}"
96-
{{- end }}
97-
{{- with .Values.flags.maxConcurrentReconcilesForAutoscalingListener }}
98-
- "--max-concurrent-reconciles-for-autoscaling-listener={{ . }}"
99-
{{- end }}
10088
{{- with .Values.flags.disableWorkqueueBucketRateLimiter }}
10189
- "--disable-workqueue-bucket-rate-limiter={{ . }}"
10290
{{- end }}

‎charts/gha-runner-scale-set-controller/values.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,5 @@ flags:
135135
# excludeLabelPropagationPrefixes:
136136
# - "argocd.argoproj.io/instance"
137137

138-
## Defines the maximum number of concurrent reconciles for each reconciler.
139-
# maxConcurrentReconcilesForAutoscalingRunnerSet: 1
140-
# maxConcurrentReconcilesForEphemeralRunnerSet: 1
141-
# maxConcurrentReconcilesForEphemeralRunner: 1
142-
# maxConcurrentReconcilesForAutoscalingListener: 1
143-
144138
## Defines the client-go rate limiter parameters.
145139
# disableWorkqueueBucketRateLimiter: false

‎controllers/actions.github.com/autoscalinglistener_controller.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ type AutoscalingListenerReconciler struct {
5757
ListenerMetricsAddr string
5858
ListenerMetricsEndpoint string
5959

60-
MaxConcurrentReconciles int
61-
WorkqueueRateLimiter workqueue.RateLimiter
60+
WorkqueueRateLimiter workqueue.RateLimiter
6261

6362
ResourceBuilder
6463
}
@@ -736,8 +735,7 @@ func (r *AutoscalingListenerReconciler) SetupWithManager(mgr ctrl.Manager) error
736735
Watches(&rbacv1.RoleBinding{}, handler.EnqueueRequestsFromMapFunc(labelBasedWatchFunc)).
737736
WithEventFilter(predicate.ResourceVersionChangedPredicate{}).
738737
WithOptions(controller.Options{
739-
MaxConcurrentReconciles: r.MaxConcurrentReconciles,
740-
RateLimiter: r.WorkqueueRateLimiter,
738+
RateLimiter: r.WorkqueueRateLimiter,
741739
}).
742740
Complete(r)
743741
}

‎controllers/actions.github.com/autoscalinglistener_controller_test.go‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ var _ = Describe("Test AutoScalingListener controller", func() {
4444
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
4545

4646
controller := &AutoscalingListenerReconciler{
47-
Client: mgr.GetClient(),
48-
Scheme: mgr.GetScheme(),
49-
Log: logf.Log,
50-
MaxConcurrentReconciles: 1,
47+
Client: mgr.GetClient(),
48+
Scheme: mgr.GetScheme(),
49+
Log: logf.Log,
5150
}
5251
err := controller.SetupWithManager(mgr)
5352
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -509,10 +508,9 @@ var _ = Describe("Test AutoScalingListener customization", func() {
509508
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
510509

511510
controller := &AutoscalingListenerReconciler{
512-
Client: mgr.GetClient(),
513-
Scheme: mgr.GetScheme(),
514-
Log: logf.Log,
515-
MaxConcurrentReconciles: 1,
511+
Client: mgr.GetClient(),
512+
Scheme: mgr.GetScheme(),
513+
Log: logf.Log,
516514
}
517515
err := controller.SetupWithManager(mgr)
518516
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -784,10 +782,9 @@ var _ = Describe("Test AutoScalingListener controller with proxy", func() {
784782
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
785783

786784
controller := &AutoscalingListenerReconciler{
787-
Client: mgr.GetClient(),
788-
Scheme: mgr.GetScheme(),
789-
Log: logf.Log,
790-
MaxConcurrentReconciles: 1,
785+
Client: mgr.GetClient(),
786+
Scheme: mgr.GetScheme(),
787+
Log: logf.Log,
791788
}
792789
err := controller.SetupWithManager(mgr)
793790
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -981,10 +978,9 @@ var _ = Describe("Test AutoScalingListener controller with template modification
981978
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
982979

983980
controller := &AutoscalingListenerReconciler{
984-
Client: mgr.GetClient(),
985-
Scheme: mgr.GetScheme(),
986-
Log: logf.Log,
987-
MaxConcurrentReconciles: 1,
981+
Client: mgr.GetClient(),
982+
Scheme: mgr.GetScheme(),
983+
Log: logf.Log,
988984
}
989985
err := controller.SetupWithManager(mgr)
990986
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1098,10 +1094,9 @@ var _ = Describe("Test GitHub Server TLS configuration", func() {
10981094
Expect(err).NotTo(HaveOccurred(), "failed to create configmap with root CAs")
10991095

11001096
controller := &AutoscalingListenerReconciler{
1101-
Client: mgr.GetClient(),
1102-
Scheme: mgr.GetScheme(),
1103-
Log: logf.Log,
1104-
MaxConcurrentReconciles: 1,
1097+
Client: mgr.GetClient(),
1098+
Scheme: mgr.GetScheme(),
1099+
Log: logf.Log,
11051100
}
11061101
err = controller.SetupWithManager(mgr)
11071102
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")

‎controllers/actions.github.com/autoscalingrunnerset_controller.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ type AutoscalingRunnerSetReconciler struct {
8181
DefaultRunnerScaleSetListenerImagePullSecrets []string
8282
UpdateStrategy UpdateStrategy
8383
ActionsClient actions.MultiClient
84-
MaxConcurrentReconciles int
8584
WorkqueueRateLimiter workqueue.RateLimiter
8685
ResourceBuilder
8786
}
@@ -768,8 +767,7 @@ func (r *AutoscalingRunnerSetReconciler) SetupWithManager(mgr ctrl.Manager) erro
768767
)).
769768
WithEventFilter(predicate.ResourceVersionChangedPredicate{}).
770769
WithOptions(controller.Options{
771-
MaxConcurrentReconciles: r.MaxConcurrentReconciles,
772-
RateLimiter: r.WorkqueueRateLimiter,
770+
RateLimiter: r.WorkqueueRateLimiter,
773771
}).
774772
Complete(r)
775773
}

‎controllers/actions.github.com/autoscalingrunnerset_controller_test.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ var _ = Describe("Test AutoScalingRunnerSet controller", Ordered, func() {
7171
ControllerNamespace: autoscalingNS.Name,
7272
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
7373
ActionsClient: fake.NewMultiClient(),
74-
MaxConcurrentReconciles: 1,
7574
}
7675
err := controller.SetupWithManager(mgr)
7776
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -705,7 +704,6 @@ var _ = Describe("Test AutoScalingController updates", Ordered, func() {
705704
nil,
706705
),
707706
),
708-
MaxConcurrentReconciles: 1,
709707
}
710708
err := controller.SetupWithManager(mgr)
711709
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -821,7 +819,6 @@ var _ = Describe("Test AutoscalingController creation failures", Ordered, func()
821819
ControllerNamespace: autoscalingNS.Name,
822820
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
823821
ActionsClient: fake.NewMultiClient(),
824-
MaxConcurrentReconciles: 1,
825822
}
826823
err := controller.SetupWithManager(mgr)
827824
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -948,7 +945,6 @@ var _ = Describe("Test client optional configuration", Ordered, func() {
948945
ControllerNamespace: autoscalingNS.Name,
949946
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
950947
ActionsClient: actions.NewMultiClient(logr.Discard()),
951-
MaxConcurrentReconciles: 1,
952948
}
953949

954950
err := controller.SetupWithManager(mgr)
@@ -1132,7 +1128,6 @@ var _ = Describe("Test client optional configuration", Ordered, func() {
11321128
ControllerNamespace: autoscalingNS.Name,
11331129
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
11341130
ActionsClient: fake.NewMultiClient(),
1135-
MaxConcurrentReconciles: 1,
11361131
}
11371132
err = controller.SetupWithManager(mgr)
11381133
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1367,7 +1362,6 @@ var _ = Describe("Test external permissions cleanup", Ordered, func() {
13671362
ControllerNamespace: autoscalingNS.Name,
13681363
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
13691364
ActionsClient: fake.NewMultiClient(),
1370-
MaxConcurrentReconciles: 1,
13711365
}
13721366
err := controller.SetupWithManager(mgr)
13731367
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1526,7 +1520,6 @@ var _ = Describe("Test external permissions cleanup", Ordered, func() {
15261520
ControllerNamespace: autoscalingNS.Name,
15271521
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
15281522
ActionsClient: fake.NewMultiClient(),
1529-
MaxConcurrentReconciles: 1,
15301523
}
15311524
err := controller.SetupWithManager(mgr)
15321525
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1735,7 +1728,6 @@ var _ = Describe("Test resource version and build version mismatch", func() {
17351728
ControllerNamespace: autoscalingNS.Name,
17361729
DefaultRunnerScaleSetListenerImage: "ghcr.io/actions/arc",
17371730
ActionsClient: fake.NewMultiClient(),
1738-
MaxConcurrentReconciles: 1,
17391731
}
17401732
err := controller.SetupWithManager(mgr)
17411733
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")

‎controllers/actions.github.com/ephemeralrunner_controller.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ const (
5151
// EphemeralRunnerReconciler reconciles a EphemeralRunner object
5252
type EphemeralRunnerReconciler struct {
5353
client.Client
54-
Log logr.Logger
55-
Scheme *runtime.Scheme
56-
ActionsClient actions.MultiClient
57-
MaxConcurrentReconciles int
58-
WorkqueueRateLimiter workqueue.RateLimiter
54+
Log logr.Logger
55+
Scheme *runtime.Scheme
56+
ActionsClient actions.MultiClient
57+
WorkqueueRateLimiter workqueue.RateLimiter
5958
ResourceBuilder
6059
}
6160

@@ -840,8 +839,7 @@ func (r *EphemeralRunnerReconciler) SetupWithManager(mgr ctrl.Manager) error {
840839
Owns(&corev1.Pod{}).
841840
WithEventFilter(predicate.ResourceVersionChangedPredicate{}).
842841
WithOptions(controller.Options{
843-
MaxConcurrentReconciles: r.MaxConcurrentReconciles,
844-
RateLimiter: r.WorkqueueRateLimiter,
842+
RateLimiter: r.WorkqueueRateLimiter,
845843
}).
846844
Complete(r)
847845
}

‎controllers/actions.github.com/ephemeralrunner_controller_test.go‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@ var _ = Describe("EphemeralRunner", func() {
101101
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
102102

103103
controller = &EphemeralRunnerReconciler{
104-
Client: mgr.GetClient(),
105-
Scheme: mgr.GetScheme(),
106-
Log: logf.Log,
107-
ActionsClient: fake.NewMultiClient(),
108-
MaxConcurrentReconciles: 1,
104+
Client: mgr.GetClient(),
105+
Scheme: mgr.GetScheme(),
106+
Log: logf.Log,
107+
ActionsClient: fake.NewMultiClient(),
109108
}
110109

111110
err := controller.SetupWithManager(mgr)
@@ -682,7 +681,6 @@ var _ = Describe("EphemeralRunner", func() {
682681
nil,
683682
),
684683
),
685-
MaxConcurrentReconciles: 1,
686684
}
687685
err := controller.SetupWithManager(mgr)
688686
Expect(err).To(BeNil(), "failed to setup controller")
@@ -739,11 +737,10 @@ var _ = Describe("EphemeralRunner", func() {
739737
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoScalingNS.Name)
740738

741739
controller = &EphemeralRunnerReconciler{
742-
Client: mgr.GetClient(),
743-
Scheme: mgr.GetScheme(),
744-
Log: logf.Log,
745-
ActionsClient: fake.NewMultiClient(),
746-
MaxConcurrentReconciles: 1,
740+
Client: mgr.GetClient(),
741+
Scheme: mgr.GetScheme(),
742+
Log: logf.Log,
743+
ActionsClient: fake.NewMultiClient(),
747744
}
748745
err := controller.SetupWithManager(mgr)
749746
Expect(err).To(BeNil(), "failed to setup controller")
@@ -904,11 +901,10 @@ var _ = Describe("EphemeralRunner", func() {
904901
Expect(err).NotTo(HaveOccurred(), "failed to create configmap with root CAs")
905902

906903
controller = &EphemeralRunnerReconciler{
907-
Client: mgr.GetClient(),
908-
Scheme: mgr.GetScheme(),
909-
Log: logf.Log,
910-
ActionsClient: fake.NewMultiClient(),
911-
MaxConcurrentReconciles: 1,
904+
Client: mgr.GetClient(),
905+
Scheme: mgr.GetScheme(),
906+
Log: logf.Log,
907+
ActionsClient: fake.NewMultiClient(),
912908
}
913909

914910
err = controller.SetupWithManager(mgr)

‎controllers/actions.github.com/ephemeralrunnerset_controller.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ type EphemeralRunnerSetReconciler struct {
5555

5656
PublishMetrics bool
5757

58-
MaxConcurrentReconciles int
59-
WorkqueueRateLimiter workqueue.RateLimiter
58+
WorkqueueRateLimiter workqueue.RateLimiter
6059

6160
ResourceBuilder
6261
}
@@ -581,8 +580,7 @@ func (r *EphemeralRunnerSetReconciler) SetupWithManager(mgr ctrl.Manager) error
581580
Owns(&v1alpha1.EphemeralRunner{}).
582581
WithEventFilter(predicate.ResourceVersionChangedPredicate{}).
583582
WithOptions(controller.Options{
584-
MaxConcurrentReconciles: r.MaxConcurrentReconciles,
585-
RateLimiter: r.WorkqueueRateLimiter,
583+
RateLimiter: r.WorkqueueRateLimiter,
586584
}).
587585
Complete(r)
588586
}

‎controllers/actions.github.com/ephemeralrunnerset_controller_test.go‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ var _ = Describe("Test EphemeralRunnerSet controller", func() {
4848
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
4949

5050
controller := &EphemeralRunnerSetReconciler{
51-
Client: mgr.GetClient(),
52-
Scheme: mgr.GetScheme(),
53-
Log: logf.Log,
54-
ActionsClient: fake.NewMultiClient(),
55-
MaxConcurrentReconciles: 1,
51+
Client: mgr.GetClient(),
52+
Scheme: mgr.GetScheme(),
53+
Log: logf.Log,
54+
ActionsClient: fake.NewMultiClient(),
5655
}
5756
err := controller.SetupWithManager(mgr)
5857
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1099,11 +1098,10 @@ var _ = Describe("Test EphemeralRunnerSet controller with proxy settings", func(
10991098
configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
11001099

11011100
controller := &EphemeralRunnerSetReconciler{
1102-
Client: mgr.GetClient(),
1103-
Scheme: mgr.GetScheme(),
1104-
Log: logf.Log,
1105-
ActionsClient: actions.NewMultiClient(logr.Discard()),
1106-
MaxConcurrentReconciles: 1,
1101+
Client: mgr.GetClient(),
1102+
Scheme: mgr.GetScheme(),
1103+
Log: logf.Log,
1104+
ActionsClient: actions.NewMultiClient(logr.Discard()),
11071105
}
11081106
err := controller.SetupWithManager(mgr)
11091107
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
@@ -1399,11 +1397,10 @@ var _ = Describe("Test EphemeralRunnerSet controller with custom root CA", func(
13991397
Expect(err).NotTo(HaveOccurred(), "failed to create configmap with root CAs")
14001398

14011399
controller := &EphemeralRunnerSetReconciler{
1402-
Client: mgr.GetClient(),
1403-
Scheme: mgr.GetScheme(),
1404-
Log: logf.Log,
1405-
ActionsClient: actions.NewMultiClient(logr.Discard()),
1406-
MaxConcurrentReconciles: 1,
1400+
Client: mgr.GetClient(),
1401+
Scheme: mgr.GetScheme(),
1402+
Log: logf.Log,
1403+
ActionsClient: actions.NewMultiClient(logr.Discard()),
14071404
}
14081405
err = controller.SetupWithManager(mgr)
14091406
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")

0 commit comments

Comments
 (0)