Skip to content

feat: Add fallback support for modern Kubernetes labels in pod discovery #3

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

Open
ahmad-hamade wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add fallback support for modern Kubernetes labels in pod discovery #3

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
36 changes: 27 additions & 9 deletions pkg/istio/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,22 +188,40 @@ func (sd *ServiceDiscovery) CollectMetrics(ctx context.Context, namespace, servi
}

func (sd *ServiceDiscovery) getServicePods(ctx context.Context, namespace, serviceName string) ([]string, error) {
// Try legacy 'app' label first
listOptions := metav1.ListOptions{
LabelSelector: fmt.Sprintf("app=%s", serviceName),
}

pods, err := sd.clientset.CoreV1().Pods(namespace).List(ctx, listOptions)
if err != nil {
return nil, fmt.Errorf("failed to list pods: %w", err)
if err == nil && len(pods.Items) > 0 {
var podNames []string
for _, pod := range pods.Items {
if hasIstioSidecar(pod.Labels, pod.Annotations) && pod.Status.Phase == "Running" {
podNames = append(podNames, pod.Name)
}
}
if len(podNames) > 0 {
return podNames, nil
}
}

var podNames []string
for _, pod := range pods.Items {
if hasIstioSidecar(pod.Labels, pod.Annotations) && pod.Status.Phase == "Running" {
podNames = append(podNames, pod.Name)

// Fallback to modern 'app.kubernetes.io/name' label
listOptions.LabelSelector = fmt.Sprintf("app.kubernetes.io/name=%s", serviceName)
pods, err = sd.clientset.CoreV1().Pods(namespace).List(ctx, listOptions)
if err == nil && len(pods.Items) > 0 {
var podNames []string
for _, pod := range pods.Items {
if hasIstioSidecar(pod.Labels, pod.Annotations) && pod.Status.Phase == "Running" {
podNames = append(podNames, pod.Name)
}
}
if len(podNames) > 0 {
return podNames, nil
}
}
return podNames, nil

return nil, fmt.Errorf("no running pods with Istio sidecars found for service %s in namespace %s", serviceName, namespace)
}

func (sd *ServiceDiscovery) collectEnvoyMetrics(ctx context.Context, podName string, metrics *ServiceMeshMetrics) error {
Expand Down