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

Kubernetes provider: include v1alpha+ label when searching for jobs #97

Merged
merged 4 commits into from
Feb 3, 2025
Merged

Kubernetes provider: include v1alpha+ label when searching for jobs #97

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32f9b05
Kubernetes provider: include v1alpha+ label when searching for jobs
andmat900 Jan 10, 2025
5c45e4c
job label iteration moved to getJobsByIdentifier()
andmat900 Jan 15, 2025
8781930
git version update in deploy/*/Dockerfile
andmat900 Jan 15, 2025
e268c59
url update in Kubernetes.New()
andmat900 Jan 15, 2025
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
53 changes: 36 additions & 17 deletions internal/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

config "github.com/eiffel-community/etos-api/internal/configs/base"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/batch/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down Expand Up @@ -73,15 +74,24 @@ func (k *Kubernetes) IsFinished(ctx context.Context, identifier string) bool {
k.logger.Error(err)
return false
}
jobs, err := client.BatchV1().Jobs(k.namespace).List(
ctx,
metav1.ListOptions{
LabelSelector: fmt.Sprintf("id=%s", identifier),
},
)
if err != nil {
k.logger.Error(err)
return false

var jobs v1.JobList
// Try different labels for backward compatibility:
// label id is v0 legacy, while etos.eiffel-community.github.io/id is v1alpha+
for _, label := range []string{"id", "etos.eiffel-community.github.io/id"} {
jobs, err := client.BatchV1().Jobs(k.namespace).List(
ctx,
metav1.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", label, identifier),
},
)
if err != nil {
k.logger.Error(err)
return false
}
if len(jobs.Items) > 0 {
break
}
}
if len(jobs.Items) == 0 {
// Assume that a job is finished if it does not exist.
Expand All @@ -101,14 +111,23 @@ func (k *Kubernetes) LogListenerIP(ctx context.Context, identifier string) (stri
if err != nil {
return "", err
}
jobs, err := client.BatchV1().Jobs(k.namespace).List(
ctx,
metav1.ListOptions{
LabelSelector: fmt.Sprintf("id=%s", identifier),
},
)
if err != nil {
return "", err
var jobs v1.JobList
// Try different labels for backward compatibility:
// label id is v0 legacy, while etos.eiffel-community.github.io/id is v1alpha+
for _, label := range []string{"id", "etos.eiffel-community.github.io/id"} {
jobs, err := client.BatchV1().Jobs(k.namespace).List(
ctx,
metav1.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", label, identifier),
},
)
if err != nil {
k.logger.Error(err)
return "", err
}
if len(jobs.Items) > 0 {
break
}
}
if len(jobs.Items) == 0 {
return "", fmt.Errorf("could not find esr job with id %s", identifier)
Expand Down
Loading