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

remove need to name deployment same as service #82

Closed
wants to merge 2 commits into from
Closed

remove need to name deployment same as service #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4176e04
Spike: remove need to name deployment same as service
samos123 Feb 17, 2024
73c2beb
clean up logic
samos123 Feb 17, 2024
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
52 changes: 35 additions & 17 deletions pkg/endpoints/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log"
"sync"

corev1 "k8s.io/api/core/v1"
disv1 "k8s.io/api/discovery/v1"

ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -58,6 +59,8 @@ func (r *Manager) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result,
return ctrl.Result{}, fmt.Errorf("listing endpointslices: %w", err)
}

deployments := map[string]map[string]struct{}{}

ips := map[string]struct{}{}
for _, sliceItem := range sliceList.Items {
for _, endpointItem := range sliceItem.Endpoints {
Expand All @@ -67,9 +70,24 @@ func (r *Manager) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result,
}
}
ready := endpointItem.Conditions.Ready
if ready != nil && *ready {
for _, ip := range endpointItem.Addresses {
ips[ip] = struct{}{}
if ready != nil && *ready && endpointItem.TargetRef.Kind == "Pod" {
podName := endpointItem.TargetRef.Name
namespace := endpointItem.TargetRef.Namespace // Assuming the EndpointSlice and Pod are in the same namespace
// Fetch the Pod using the client
var pod corev1.Pod
if err := r.Get(ctx, client.ObjectKey{Name: podName, Namespace: namespace}, &pod); err != nil {
log.Printf("error fetching pod: %v\n", err)
continue
}
if pod.OwnerReferences != nil {
for _, owner := range pod.OwnerReferences {
if owner.Kind == "ReplicaSet" {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note we need to go 1 more level up

for _, ip := range endpointItem.Addresses {
ips[ip] = struct{}{}
}
deployments[owner.Name] = ips
}
}
}
}
}
Expand All @@ -86,25 +104,25 @@ func (r *Manager) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result,
}
}

priorLen := r.getEndpoints(serviceName).lenIPs()
r.getEndpoints(serviceName).setIPs(ips, ports)
for deploymentName, ips := range deployments {
priorLen := r.getEndpoints(deploymentName).lenIPs()
r.getEndpoints(deploymentName).setIPs(ips, ports)

if priorLen != len(ips) {
r.EndpointSizeCallback(deploymentName, len(ips))
}

if priorLen != len(ips) {
// TODO: Currently Service name needs to match Deployment name, however
// this shouldn't be the case. We should be able to reference deployment
// replicas by something else.
r.EndpointSizeCallback(serviceName, len(ips))
}

return ctrl.Result{}, nil
}

func (r *Manager) getEndpoints(service string) *endpointGroup {
func (r *Manager) getEndpoints(deploymentName string) *endpointGroup {
r.endpointsMtx.Lock()
e, ok := r.endpoints[service]
e, ok := r.endpoints[deploymentName]
if !ok {
e = newEndpointGroup()
r.endpoints[service] = e
r.endpoints[deploymentName] = e
}
r.endpointsMtx.Unlock()
return e
Expand All @@ -114,11 +132,11 @@ func (r *Manager) getEndpoints(service string) *endpointGroup {
// becomes available or the context times out.
//
// It returns a string in the format "host:port" or error on timeout
func (r *Manager) AwaitHostAddress(ctx context.Context, service, portName string) (string, error) {
return r.getEndpoints(service).getBestHost(ctx, portName)
func (r *Manager) AwaitHostAddress(ctx context.Context, deploymentName, portName string) (string, error) {
return r.getEndpoints(deploymentName).getBestHost(ctx, portName)
}

// GetAllHosts retrieves the list of all hosts for a given service and port.
func (r *Manager) GetAllHosts(service, portName string) []string {
return r.getEndpoints(service).getAllHosts(portName)
func (r *Manager) GetAllHosts(deploymentName, portName string) []string {
return r.getEndpoints(deploymentName).getAllHosts(portName)
}
Loading