Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions cyclops-ctrl/cmd/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ func main() {
templatesRepo,
k8sClient,
renderer,
getMaxConcurrentReconciles(),
telemetryClient,
monitor,
)).SetupWithManager(mgr); err != nil {
Expand Down Expand Up @@ -199,6 +200,20 @@ func getHelmWatchNamespace() string {
return value
}

func getMaxConcurrentReconciles() int {
strValue := os.Getenv("MAX_CONCURRENT_RECONCILES")
if strValue == "" {
return 1
}

value, err := strconv.Atoi(strValue)
if err != nil {
return 1
}

return value
}

func getCommitMessageTemplate() string {
return os.Getenv("COMMIT_MESSAGE_TEMPLATE")
}
25 changes: 16 additions & 9 deletions cyclops-ctrl/internal/modulecontroller/module_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ type ModuleReconciler struct {
kubernetesClient k8sclient.IKubernetesClient
renderer *render.Renderer

maxConcurrentReconciles int

telemetryClient telemetry.Client
monitor prometheus.Monitor
logger logr.Logger
Expand All @@ -66,18 +68,20 @@ func NewModuleReconciler(
templatesRepo templaterepo.ITemplateRepo,
kubernetesClient k8sclient.IKubernetesClient,
renderer *render.Renderer,
maxConcurrentReconciles int,
telemetryClient telemetry.Client,
monitor prometheus.Monitor,
) *ModuleReconciler {
return &ModuleReconciler{
Client: client,
Scheme: scheme,
templatesRepo: templatesRepo,
kubernetesClient: kubernetesClient,
renderer: renderer,
telemetryClient: telemetryClient,
monitor: monitor,
logger: ctrl.Log.WithName("reconciler"),
Client: client,
Scheme: scheme,
templatesRepo: templatesRepo,
kubernetesClient: kubernetesClient,
renderer: renderer,
telemetryClient: telemetryClient,
maxConcurrentReconciles: maxConcurrentReconciles,
monitor: monitor,
logger: ctrl.Log.WithName("reconciler"),
}
}

Expand Down Expand Up @@ -226,7 +230,10 @@ func (r *ModuleReconciler) SetupWithManager(mgr ctrl.Manager) error {

return ctrl.NewControllerManagedBy(mgr).
For(&cyclopsv1alpha1.Module{}).
WithOptions(controller.Options{RateLimiter: rateLimiter}).
WithOptions(controller.Options{
RateLimiter: rateLimiter,
MaxConcurrentReconciles: r.maxConcurrentReconciles,
}).
Complete(r)
}

Expand Down