Skip to content

Added Check for Zone Before applying affinity #6

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

Merged
shoaebjindani merged 1 commit into from
Jul 11, 2025
+27 −9
Merged

Added Check for Zone Before applying affinity #6

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/k8sbuilder/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import (
type Server struct {
SecretClient corev1.SecretInterface
PodClient corev1.PodInterface
NodeClient corev1.NodeInterface
SharedPath string
FSBaseURL string
FileTransferImage string
Expand Down Expand Up @@ -475,19 +476,22 @@ func (b *Server) runPodDefinition(runContainer v1.Container, runMetadata *runMet
Controller: &boolTrue,
}

affinity := &v1.Affinity{
PodAffinity: &v1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{
{
LabelSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"app": b.PeerID,
var affinity *v1.Affinity = nil
if b.hasZoneLabels() {
affinity = &v1.Affinity{
PodAffinity: &v1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{
{
LabelSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"app": b.PeerID,
},
},
TopologyKey: "topology.kubernetes.io/zone",
},
TopologyKey: "topology.kubernetes.io/zone",
},
},
},
}
}

return &v1.Pod{
Expand Down Expand Up @@ -547,6 +551,20 @@ func (b *Server) runPodDefinition(runContainer v1.Container, runMetadata *runMet
}
}

func (b *Server) hasZoneLabels() bool {
nodes, err := b.NodeClient.List(context.TODO(), metav1.ListOptions{})
if err != nil {
// If API call fails, better to assume zone labels are absent
return false
}
for _, node := range nodes.Items {
if _, ok := node.Labels["topology.kubernetes.io/zone"]; ok {
return true
}
}
return false
}

func (b *Server) runContainerDefinition(ccType string, rmd *runMetadata) (v1.Container, error) {
switch strings.ToLower(ccType) {
case "golang":
Expand Down