8000 Watch ClickHouseOperatorConfiguration in operator namespace by alex-zaitsev · Pull Request #1959 · Altinity/clickhouse-operator · GitHub
[go: up one dir, main page]
Skip to content

Watch ClickHouseOperatorConfiguration in operator namespace #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunsingerus merged 1 commit into from
Apr 20, 2026
Merged

Watch ClickHouseOperatorConfiguration in operator namespace #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions cmd/operator/app/thread_chi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,19 @@ func initClickHouse(ctx context.Context) {
chopInformerFactoryResyncPeriod,
chopinformers.WithNamespace(chop.Config().GetInformerNamespace()),
)
chopConfigInformerFactory := chopinformers.NewSharedInformerFactoryWithOptions(
chopClient,
chopInformerFactoryResyncPeriod,
chopinformers.WithNamespace(chop.Config().Runtime.Namespace),
)

// Create Controller
chiController = chi.NewController(
chopClient,
extClient,
kubeClient,
dynamicClient,
chopConfigInformerFactory,
chopInformerFactory,
kubeInformerFactory,
)
Expand All @@ -98,6 +104,7 @@ func initClickHouse(ctx context.Context) {
// Start Informers
kubeInformerFactory.Start(ctx.Done())
chopInformerFactory.Start(ctx.Done())
chopConfigInformerFactory.Start(ctx.Done())
}

// runClickHouse is an entry point of the application
Expand Down
20 changes: 6 additions & 14 deletions pkg/controller/chi/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func NewController(
extClient apiExtensions.Interface,
kubeClient kube.Interface,
dynamicClient dynamic.Interface,
chopConfigInformerFactory chopInformers.SharedInformerFactory,
chopInformerFactory chopInformers.SharedInformerFactory,
kubeInformerFactory kubeInformers.SharedInformerFactory,
) *Controller {
Expand Down Expand Up @@ -128,7 +129,7 @@ func NewController(
pvcDeleter: volume.NewPVCDeleter(managers.NewNameManager(managers.NameManagerTypeClickHouse)),
}
controller.initQueues()
controller.addEventHandlers(chopInformerFactory, kubeInformerFactory)
controller.addEventHandlers(chopConfigInformerFactory, chopInformerFactory, kubeInformerFactory)

return controller
}
Expand Down Expand Up @@ -218,32 +219,22 @@ func (c *Controller) addEventHandlersCHIT(
}

func (c *Controller) addEventHandlersChopConfig(
chopInformerFactory chopInformers.SharedInformerFactory,
chopConfigInformerFactory chopInformers.SharedInformerFactory,
) {
chopInformerFactory.Clickhouse().V1().ClickHouseOperatorConfigurations().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
chopConfigInformerFactory.Clickhouse().V1().ClickHouseOperatorConfigurations().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {
chopConfig := obj.(*api.ClickHouseOperatorConfiguration)
if !chop.Config().IsNamespaceWatched(chopConfig.Namespace) {
log.V(2).M(chopConfig).Info("chopInformer: skip event, namespace '%s' is not watched or is in deny list", chopConfig.Namespace)
return
}
log.V(3).M(chopConfig).Info("chopInformer.AddFunc")
c.enqueueObject(cmd_queue.NewReconcileChopConfig(cmd_queue.ReconcileAdd, nil, chopConfig))
},
UpdateFunc: func(old, new interface{}) {
newChopConfig := new.(*api.ClickHouseOperatorConfiguration)
oldChopConfig := old.(*api.ClickHouseOperatorConfiguration)
if !chop.Config().IsNamespaceWatched(newChopConfig.Namespace) {
return
}
log.V(3).M(newChopConfig).Info("chopInformer.UpdateFunc")
c.enqueueObject(cmd_queue.NewReconcileChopConfig(cmd_queue.ReconcileUpdate, oldChopConfig, newChopConfig))
},
DeleteFunc: func(obj interface{}) {
chopConfig := obj.(*api.ClickHouseOperatorConfiguration)
if !chop.Config().IsNamespaceWatched(chopConfig.Namespace) {
return
}
log.V(3).M(chopConfig).Info("chopInformer.DeleteFunc")
c.enqueueObject(cmd_queue.NewReconcileChopConfig(cmd_queue.ReconcileDelete, chopConfig, nil))
},
Expand Down Expand Up @@ -537,12 +528,13 @@ func (c *Controller) addEventHandlersPod(

// addEventHandlers
func (c *Controller) addEventHandlers(
chopConfigInformerFactory chopInformers.SharedInformerFactory,
chopInformerFactory chopInformers.SharedInformerFactory,
kubeInformerFactory kubeInformers.SharedInformerFactory,
) {
c.addEventHandlersChopConfig(chopConfigInformerFactory)
c.addEventHandlersCHI(chopInformerFactory)
c.addEventHandlersCHIT(chopInformerFactory)
c.addEventHandlersChopConfig(chopInformerFactory)
c.addEventHandlersService(kubeInformerFactory)
//c.addEventHandlersEndpoints(kubeInformerFactory)
c.addEventHandlersEndpointSlice(kubeInformerFactory)
Expand Down
Loading
0