Skip to content
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

Revert "Call reconcile from server (#58)" #59

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Revert "Call reconcile from server (#58)" #59

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: 3 additions & 4 deletions operator/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,19 @@ func mainWithError() error {
informerManager.Start()

// Set up the ElastiService controller
reconciler := &controller.ElastiServiceReconciler{
if err = (&controller.ElastiServiceReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Logger: zapLogger,
InformerManager: informerManager,
}
if err = reconciler.SetupWithManager(mgr); err != nil {
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ElastiService")
sentry.CaptureException(err)
return fmt.Errorf("main: %w", err)
}

// Start the elasti server
eServer := elastiserver.NewServer(zapLogger, mgr.GetConfig(), 30*time.Second, reconciler)
eServer := elastiserver.NewServer(zapLogger, mgr.GetConfig(), 30*time.Second)
errChan := make(chan error, 1)
go func() {
if err := eServer.Start(elastiServerPort); err != nil {
Expand Down
29 changes: 4 additions & 25 deletions operator/internal/elastiserver/elastiServer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ import (

sentryhttp "github.com/getsentry/sentry-go/http"

"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"

"truefoundry/elasti/operator/internal/crddirectory"
"truefoundry/elasti/operator/internal/prom"

"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/truefoundry/elasti/pkg/k8shelper"
"github.com/truefoundry/elasti/pkg/messages"
Expand All @@ -42,19 +39,17 @@ type (
scaleLocks sync.Map
// rescaleDuration is the duration to wait before checking to rescaling the target
rescaleDuration time.Duration
reconciler reconcile.Reconciler
}
)

func NewServer(logger *zap.Logger, config *rest.Config, rescaleDuration time.Duration, reconciler reconcile.Reconciler) *Server {
func NewServer(logger *zap.Logger, config *rest.Config, rescaleDuration time.Duration) *Server {
// Get Ops client
k8sUtil := k8shelper.NewOps(logger, config)
return &Server{
logger: logger.Named("elastiServer"),
k8shelper: k8sUtil,
// rescaleDuration is the duration to wait before checking to rescaling the target
rescaleDuration: rescaleDuration,
reconciler: reconciler,
}
}

Expand Down Expand Up @@ -153,7 +148,7 @@ func (s *Server) resolverReqHandler(w http.ResponseWriter, req *http.Request) {
zap.String("namespace", body.Namespace))
}

func (s *Server) scaleTargetForService(ctx context.Context, serviceName, namespace string) error {
func (s *Server) scaleTargetForService(_ context.Context, serviceName, namespace string) error {
scaleMutex, loaded := s.getMutexForServiceScale(serviceName)
if loaded {
s.logger.Debug("Scale target lock already exists", zap.String("service", serviceName))
Expand All @@ -162,26 +157,10 @@ func (s *Server) scaleTargetForService(ctx context.Context, serviceName, namespa
scaleMutex.Lock()
defer s.logger.Debug("Scale target lock released", zap.String("service", serviceName))
s.logger.Debug("Scale target lock taken", zap.String("service", serviceName))

crd, found := crddirectory.CRDDirectory.GetCRD(serviceName)
if !found {
s.logger.Debug("Failed to get CRD details from directory, running reconcile")
_, err := s.reconciler.Reconcile(ctx, reconcile.Request{
NamespacedName: types.NamespacedName{
Name: serviceName,
Namespace: namespace,
},
})
if err != nil {
s.releaseMutexForServiceScale(serviceName)
return fmt.Errorf("scaleTargetForService - error: reconcile failed, serviceName: %s, %w", serviceName, err)
}

crd, found = crddirectory.CRDDirectory.GetCRD(serviceName)
if !found {
s.releaseMutexForServiceScale(serviceName)
return fmt.Errorf("scaleTargetForService - error: failed to get CRD details from directory even after reconcile, serviceName: %s", serviceName)
}
s.releaseMutexForServiceScale(serviceName)
return fmt.Errorf("scaleTargetForService - error: failed to get CRD details from directory, serviceName: %s", serviceName)
}

if err := s.k8shelper.ScaleTargetWhenAtZero(namespace, crd.Spec.ScaleTargetRef.Name, crd.Spec.ScaleTargetRef.Kind, crd.Spec.MinTargetReplicas); err != nil {
Expand Down
Loading