Skip to content

Commit

Permalink
Use a daemonset instead of a deployment to run ComputeDomain daemons
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Klues <[email protected]>
  • Loading branch information
klueska committed Feb 9, 2025
1 parent a2a76f2 commit d593142
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 183 deletions.
28 changes: 14 additions & 14 deletions cmd/compute-domain-controller/computedomain.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type ComputeDomainManager struct {
factory nvinformers.SharedInformerFactory
informer cache.SharedIndexInformer

deploymentManager *DeploymentManager
DaemonSetManager *DaemonSetManager
resourceClaimTemplateManager *WorkloadResourceClaimTemplateManager
}

Expand All @@ -69,7 +69,7 @@ func NewComputeDomainManager(config *ManagerConfig) *ComputeDomainManager {
factory: factory,
informer: informer,
}
m.deploymentManager = NewDeploymentManager(config, m.Get)
m.DaemonSetManager = NewDaemonSetManager(config, m.Get)
m.resourceClaimTemplateManager = NewWorkloadResourceClaimTemplateManager(config)

return m
Expand Down Expand Up @@ -117,8 +117,8 @@ func (m *ComputeDomainManager) Start(ctx context.Context) (rerr error) {
return fmt.Errorf("informer cache sync for ComputeDomains failed")
}

if err := m.deploymentManager.Start(ctx); err != nil {
return fmt.Errorf("error starting Deployment manager: %w", err)
if err := m.DaemonSetManager.Start(ctx); err != nil {
return fmt.Errorf("error starting DaemonSet manager: %w", err)
}

if err := m.resourceClaimTemplateManager.Start(ctx); err != nil {
Expand All @@ -129,8 +129,8 @@ func (m *ComputeDomainManager) Start(ctx context.Context) (rerr error) {
}

func (m *ComputeDomainManager) Stop() error {
if err := m.deploymentManager.Stop(); err != nil {
return fmt.Errorf("error stopping Deployment manager: %w", err)
if err := m.DaemonSetManager.Stop(); err != nil {
return fmt.Errorf("error stopping DaemonSet manager: %w", err)
}
if err := m.resourceClaimTemplateManager.Stop(); err != nil {
return fmt.Errorf("error stopping ResourceClaim manager: %w", err)
Expand Down Expand Up @@ -220,8 +220,8 @@ func (m *ComputeDomainManager) onAddOrUpdate(ctx context.Context, obj any) error
return fmt.Errorf("error deleting ResourceClaimTemplate: %w", err)
}

if err := m.deploymentManager.Delete(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error deleting Deployment: %w", err)
if err := m.DaemonSetManager.Delete(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error deleting DaemonSet: %w", err)
}

// TODO: Condition the removal of these finalizers on there being no
Expand All @@ -238,12 +238,12 @@ func (m *ComputeDomainManager) onAddOrUpdate(ctx context.Context, obj any) error
return fmt.Errorf("error asserting removal of ResourceClaimTemplate: %w", err)
}

if err := m.deploymentManager.RemoveFinalizer(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error removing finalizer on Deployment: %w", err)
if err := m.DaemonSetManager.RemoveFinalizer(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error removing finalizer on DaemonSet: %w", err)
}

if err := m.deploymentManager.AssertRemoved(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error asserting removal of Deployment: %w", err)
if err := m.DaemonSetManager.AssertRemoved(ctx, string(cd.UID)); err != nil {
return fmt.Errorf("error asserting removal of DaemonSet: %w", err)
}

if err := m.RemoveFinalizer(ctx, string(cd.UID)); err != nil {
Expand All @@ -258,8 +258,8 @@ func (m *ComputeDomainManager) onAddOrUpdate(ctx context.Context, obj any) error
return fmt.Errorf("error adding finalizer: %w", err)
}

if _, err := m.deploymentManager.Create(ctx, m.config.driverNamespace, cd); err != nil {
return fmt.Errorf("error creating Deployment: %w", err)
if _, err := m.DaemonSetManager.Create(ctx, m.config.driverNamespace, cd); err != nil {
return fmt.Errorf("error creating DaemonSet: %w", err)
}

if _, err := m.resourceClaimTemplateManager.Create(ctx, cd.Namespace, cd.Spec.ResourceClaimTemplate.Name, cd); err != nil {
Expand Down
Loading

0 comments on commit d593142

Please sign in to comment.