review: incorporated some review comment changes

operator/cmd/main.go

@@ -133,6 +133,9 @@ func main() {
 	consoleEncoder := zapcore.NewConsoleEncoder(encoderConfig)
 	core := zapcore.NewCore(consoleEncoder, zapcore.AddSync(os.Stdout), zapcore.DebugLevel)
 	zapLogger := uberZap.New(core)
+
+	controller.INITDirectory(zapLogger)
+
 	if err = (&controller.ElastiServiceReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),

operator/config/default/kustomization.yaml

@@ -18,7 +18,7 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-- ../resolver
+#- ../resolver
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
 #- ../webhook

operator/config/manager/kustomization.yaml

@@ -5,5 +5,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: controller
-  newTag: latest
+  newName: localhost:5001/elasti-operator
+  newTag: v1alpha1

operator/config/rbac/kustomization.yaml

@@ -5,8 +5,8 @@ resources:
 # runtime. Be sure to update RoleBinding and ClusterRoleBinding
 # subjects if changing service account names.
 - service_account.yaml
-- role_EDS.yaml
-- role_EDS_binding.yaml
+- role_additional.yaml
+- role_additional_binding.yaml
 - role_apiserver.yaml
 - role_apiserver_binding.yaml
 - role.yaml

operator/config/rbac/role_EDS.yaml → operator/config/rbac/role_additional.yaml

@@ -2,11 +2,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: EDS-access
+  name: additional-access
 rules:
 - apiGroups: ["apps"]
   resources: ["deployments"]
-  verbs: ["get", "list", "watch"]
+  verbs: ["get", "list", "watch", "update", "patch"]
 - apiGroups: ["discovery.k8s.io"]
   resources: ["endpointslices"]
   verbs: ["get", "list", "watch", "update", "patch", "delete", "create"]

operator/config/rbac/role_EDS_binding.yaml → operator/config/rbac/role_additional_binding.yaml

@@ -4,11 +4,11 @@ metadata:
   labels:
     app.kubernetes.io/name: elasti-operator
     app.kubernetes.io/managed-by: kustomize
-  name: EDS-access-binding
+  name: additional-access-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: EDS-access
+  name: additional-access
 subjects:
 - kind: ServiceAccount
   name: elasti-operator-controller-manager

operator/internal/controller/directory.go

@@ -1,9 +1,14 @@
 package controller
 
-import "sync"
+import (
+	"sync"
+
+	"go.uber.org/zap"
+)
 
 type Directory struct {
 	Services sync.Map
+	Logger   *zap.Logger
 }
 
 type CRDDetails struct {
@@ -15,9 +20,11 @@ var ServiceDirectory *Directory
 
 var serviceDirectoryOnce sync.Once
 
-func NewDirectory() {
+func INITDirectory(logger *zap.Logger) {
 	serviceDirectoryOnce.Do(func() {
-		ServiceDirectory = &Directory{}
+		ServiceDirectory = &Directory{
+			Logger: logger,
+		}
 	})
 }
 
@@ -28,7 +35,9 @@ func (d *Directory) AddService(serviceName string, crdDetails *CRDDetails) {
 func (d *Directory) GetService(serviceName string) (*CRDDetails, bool) {
 	value, ok := d.Services.Load(serviceName)
 	if !ok {
+		d.Logger.Error("Service not found in directory", zap.String("service", serviceName))
 		return nil, false
 	}
+	d.Logger.Info("Service found in directory", zap.String("service", serviceName))
 	return value.(*CRDDetails), true
 }

operator/internal/controller/elastiServer.go

@@ -59,9 +59,12 @@ func (r *ElastiServiceReconciler) resolverReqHandler(w http.ResponseWriter, req
 		return
 	}
 	w.Write(jsonResponse)
-	// TODOs: The deployment name should be dynamic
+	depl, found := ServiceDirectory.GetService(body.Svc)
+	if !found {
+		r.Logger.Error("Failed to get CRD details from directory", zap.String("component", "elastiServer"))
+	}
 	namespace := types.NamespacedName{
-		Name:      "target",
+		Name:      depl.DeploymentName,
 		Namespace: body.Namespace,
 	}
 	r.compareAndScaleDeployment(ctx, namespace)

operator/internal/controller/elastiservice_controller.go

@@ -65,6 +65,12 @@ func (r *ElastiServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		r.Logger.Error("Failed to get ElastiService in Reconcile", zap.Error(esErr))
 		return res, esErr
 	}
+
+	ServiceDirectory.AddService(es.Spec.Service, &CRDDetails{
+		CRDName:        es.Name,
+		DeploymentName: es.Spec.DeploymentName,
+	})
+
 	if !es.ObjectMeta.DeletionTimestamp.IsZero() {
 		if controllerutil.ContainsFinalizer(es, v1alpha1.ElastiServiceFinalizer) {
 			r.Logger.Info("ElastiService is being deleted", zap.String("name", es.Name), zap.Any("deletionTimestamp", es.ObjectMeta.DeletionTimestamp))

pkg/utils/utils.go

@@ -9,5 +9,5 @@ func GetPrivateSerivceName(publicSVCName string) string {
 	hash := sha256.New()
 	hash.Write([]byte(publicSVCName))
 	hashed := hex.EncodeToString(hash.Sum(nil))
-	return publicSVCName + "-" + string(hashed)[:8] + "-pvt"
+	return publicSVCName + "-pvt" + "-" + string(hashed)[:10] + "-" + string(hashed)[11:16]
 }

resolver/Makefile

@@ -18,7 +18,7 @@ run-resolver: ## Run resolver locally
 
 .PHONY: docker-build-resolver
 docker-build-resolver: ## Build docker image for the resolver
-	docker build -t ${IMG} -f ./build/resolver/Dockerfile . 
+	docker build -t ${IMG} -f ./build/resolver/Dockerfile ../
 
 .PHONY: docker-publish-resolver
 docker-publish-resolver: ## Publish docker image for the resolver

resolver/build/resolver/Dockerfile

@@ -1,10 +1,11 @@
-FROM golang:1.22.2-alpine3.19 AS builder
+FROM golang:1.22  AS builder
 WORKDIR /app
-COPY go.sum .
-COPY go.mod .
+COPY ../pkg ../pkg
+COPY ./resolver/go.sum .
+COPY ./resolver/go.mod .
 RUN go mod tidy
 COPY ../../ .
-RUN go build -o resolver ./cmd/resolver
+RUN go build -o resolver ./resolver/cmd/resolver
 # Break
 FROM alpine:latest
 WORKDIR /root/

resolver/cmd/resolver/hostManager.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/truefoundry/elasti/pkg/utils"
 	"go.uber.org/zap"
 )
 
@@ -50,7 +51,7 @@ func (hm *hostManager) GetHost(req *http.Request) (*Host, error) {
 	}
 	host, ok := hm.hosts.Load(sourceService)
 	if !ok {
-		targetService = sourceService + "-pvt"
+		targetService = utils.GetPrivateSerivceName(sourceService)
 		sourceHost = hm.removeTrailingWildcardIfNeeded(sourceHost)
 		sourceHost = hm.addHTTPIfNeeded(sourceHost)
 		targetHost = hm.replaceServiceName(sourceHost, targetService)

resolver/go.mod

@@ -9,8 +9,11 @@ require (
 	golang.org/x/net v0.24.0
 	k8s.io/apimachinery v0.30.0
 	k8s.io/client-go v0.30.0
+	github.com/truefoundry/elasti/pkg v0.0.0
 )
 
+replace github.com/truefoundry/elasti/pkg v0.0.0 => ../pkg
+
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect