github/Reloader
1
0
Fork 0
mirror of https://github.com/stakater/Reloader.git synced 2026-05-17 06:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR issues

Browse Source 
Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>
This commit is contained in:
faizanahmad055
2026-05-11 11:29:09 +02:00
parent 84f2ca3248
commit e8d79c61c8
7 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/pkg/controller/controller.go
View File

@@ -3,6 +3,7 @@ package controller
import (
"fmt"
"slices"
"sync/atomic"
"time"
"github.com/sirupsen/logrus"
@@ -41,17 +42,19 @@ type Controller struct {
resourceSelector string
}
// controllerInitialized flag determines whether controlled is being initialized
var secretControllerInitialized = false
var configmapControllerInitialized = false
// controllerInitialized flags guard against processing Add/Delete events before
// the worker goroutines have started. Written by runWorker (in a goroutine) and
// read by the informer event handlers, so they must be atomic.
var secretControllerInitialized atomic.Bool
var configmapControllerInitialized atomic.Bool
var selectedNamespacesCache []string
// NewController for initializing a Controller
func NewController(client kubernetes.Interface, resource string, namespace string, ignoredNamespaces []string, namespaceLabelSelector string, resourceLabelSelector string, collectors metrics.Collectors) (*Controller,
error) {
if options.SyncAfterRestart {
secretControllerInitialized = true
configmapControllerInitialized = true
secretControllerInitialized.Store(true)
configmapControllerInitialized.Store(true)
}
c := Controller{
@@ -121,7 +124,7 @@ func (c *Controller) Add(obj interface{}) {
}
if options.ReloadOnCreate == "true" {
if !c.resourceInIgnoredNamespace(obj) && c.resourceInSelectedNamespaces(obj) && secretControllerInitialized && configmapControllerInitialized {
if !c.resourceInIgnoredNamespace(obj) && c.resourceInSelectedNamespaces(obj) && secretControllerInitialized.Load() && configmapControllerInitialized.Load() {
c.enqueue(handler.ResourceCreatedHandler{
Resource: obj,
Collectors: c.collectors,
@@ -214,7 +217,7 @@ func (c *Controller) Delete(old interface{}) {
}
if options.ReloadOnDelete == "true" {
if !c.resourceInIgnoredNamespace(old) && c.resourceInSelectedNamespaces(old) && secretControllerInitialized && configmapControllerInitialized {
if !c.resourceInIgnoredNamespace(old) && c.resourceInSelectedNamespaces(old) && secretControllerInitialized.Load() && configmapControllerInitialized.Load() {
c.enqueue(handler.ResourceDeleteHandler{
Resource: old,
Collectors: c.collectors,
@@ -266,9 +269,9 @@ func (c *Controller) Run(threadiness int, stopCh chan struct{}) {
func (c *Controller) runWorker() {
// At this point the controller is fully initialized and we can start processing the resources
if c.resource == string(v1.ResourceSecrets) {
secretControllerInitialized = true
secretControllerInitialized.Store(true)
} else if c.resource == string(v1.ResourceConfigMaps) {
configmapControllerInitialized = true
configmapControllerInitialized.Store(true)
}
for c.processNextItem() {

16
internal/pkg/controller/controller_test.go
View File

@@ -43,8 +43,8 @@ func (m *mockResourceHandler) GetEnqueueTime() time.Time {
// resetGlobalState resets global variables between tests
func resetGlobalState() {
secretControllerInitialized = false
configmapControllerInitialized = false
secretControllerInitialized.Store(false)
configmapControllerInitialized.Store(false)
selectedNamespacesCache = []string{}
}
@@ -386,8 +386,8 @@ func TestAddHandler(t *testing.T) {
tt.name, func(t *testing.T) {
resetGlobalState()
options.ReloadOnCreate = tt.reloadOnCreate
secretControllerInitialized = tt.controllersInit
configmapControllerInitialized = tt.controllersInit
secretControllerInitialized.Store(tt.controllersInit)
configmapControllerInitialized.Store(tt.controllersInit)
c := newTestController(tt.ignoredNamespaces, "")
c.Add(tt.resource)
@@ -601,8 +601,8 @@ func TestDeleteHandler(t *testing.T) {
tt.name, func(t *testing.T) {
resetGlobalState()
options.ReloadOnDelete = tt.reloadOnDelete
secretControllerInitialized = tt.controllersInit
configmapControllerInitialized = tt.controllersInit
secretControllerInitialized.Store(tt.controllersInit)
configmapControllerInitialized.Store(tt.controllersInit)
c := newTestController(tt.ignoredNamespaces, "")
c.Delete(tt.resource)
@@ -685,8 +685,8 @@ func TestDeleteHandlerWithNamespaceEvent(t *testing.T) {
c := newTestController([]string{}, "env=prod")
options.ReloadOnDelete = "true"
secretControllerInitialized = true
configmapControllerInitialized = true
secretControllerInitialized.Store(true)
configmapControllerInitialized.Store(true)
ns := &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{Name: "ns-to-delete"},