Skip to content

Commit af4ef6d

Browse files
authored
add config flag to disable child admission controller (#114)
1 parent 234ab0e commit af4ef6d

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

internal/controller/appwrapper/resource_management.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *workload
8080
if err != nil {
8181
return nil, err, true
8282
}
83-
if r.Config.EnableKueueIntegrations {
83+
if r.Config.EnableKueueIntegrations && !r.Config.DisableChildAdmissionCtrl {
8484
obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), map[string]string{AppWrapperLabel: aw.Name, constants.QueueLabel: childJobQueueName}))
8585
} else {
8686
obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), map[string]string{AppWrapperLabel: aw.Name}))

pkg/config/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type OperatorConfig struct {
3131
type AppWrapperConfig struct {
3232
ManageJobsWithoutQueueName bool `json:"manageJobsWithoutQueueName,omitempty"`
3333
EnableKueueIntegrations bool `json:"enableKueueIntegrations,omitempty"`
34+
DisableChildAdmissionCtrl bool `json:"disableChildAdmissionCtrl,omitempty"`
3435
FaultTolerance *FaultToleranceConfig `json:"faultTolerance,omitempty"`
3536
}
3637

@@ -75,6 +76,7 @@ func NewAppWrapperConfig() *AppWrapperConfig {
7576
return &AppWrapperConfig{
7677
ManageJobsWithoutQueueName: true,
7778
EnableKueueIntegrations: true,
79+
DisableChildAdmissionCtrl: false,
7880
FaultTolerance: &FaultToleranceConfig{
7981
WarmupGracePeriod: 5 * time.Minute,
8082
FailureGracePeriod: 1 * time.Minute,

pkg/controller/setup.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ func SetupControllers(mgr ctrl.Manager, awConfig *config.AppWrapperConfig) error
4747
return fmt.Errorf("workload controller: %w", err)
4848
}
4949

50-
if err := (&workload.ChildWorkloadReconciler{
51-
Client: mgr.GetClient(),
52-
Scheme: mgr.GetScheme(),
53-
}).SetupWithManager(mgr); err != nil {
54-
return fmt.Errorf("child admission controller: %w", err)
50+
if !awConfig.DisableChildAdmissionCtrl {
51+
if err := (&workload.ChildWorkloadReconciler{
52+
Client: mgr.GetClient(),
53+
Scheme: mgr.GetScheme(),
54+
}).SetupWithManager(mgr); err != nil {
55+
return fmt.Errorf("child admission controller: %w", err)
56+
}
5557
}
5658
}
5759

0 commit comments

Comments
 (0)