Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@satr
satr committed Mar 26, 2024
1 parent d220bec commit d125069
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 60 deletions.
60 changes: 30 additions & 30 deletions api/environments/environment_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1362,28 +1362,28 @@ func Test_GetJobs_Status(t *testing.T) {
JobStatuses: []v1.RadixBatchJobStatus{
{
Name: "no2",
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodPending}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodPending}},
},
{
Name: "no3",
Phase: v1.BatchJobPhaseWaiting,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodPending}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodPending}},
},
{
Name: "no4", Phase: v1.BatchJobPhaseActive,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodPending}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodPending}},
},
{
Name: "no5", Phase: v1.BatchJobPhaseSucceeded,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodSucceeded}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodSucceeded}},
},
{
Name: "no6", Phase: v1.BatchJobPhaseFailed,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodFailed}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodFailed}},
},
{
Name: "no7", Phase: v1.BatchJobPhaseStopped,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{time.Now()}, Phase: v1.PodSucceeded}},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{CreationTime: &metav1.Time{Time: time.Now()}, Phase: v1.PodSucceeded}},
},
{Name: "not-defined"},
},
Expand Down Expand Up @@ -2032,16 +2032,16 @@ func Test_GetBatches_Status(t *testing.T) {
Phase: v1.BatchJobPhaseActive,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodRunning,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
}},
},
{
Name: "j3",
Phase: v1.BatchJobPhaseWaiting,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodPending,
CreationTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
}},
},
},
Expand All @@ -2061,18 +2061,18 @@ func Test_GetBatches_Status(t *testing.T) {
Phase: v1.BatchJobPhaseRunning,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodRunning,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
}},
},
{
Name: "j3",
Phase: v1.BatchJobPhaseSucceeded,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodSucceeded,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
}},
},
},
Expand All @@ -2099,25 +2099,25 @@ func Test_GetBatches_Status(t *testing.T) {
{
Name: "j1",
Phase: v1.BatchJobPhaseFailed,
EndTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
Failed: 1,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodFailed,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
}},
},
{
Name: "j2",
Phase: v1.BatchJobPhaseFailed,
EndTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
Failed: 1,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodFailed,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
}},
},
},
Expand All @@ -2134,24 +2134,24 @@ func Test_GetBatches_Status(t *testing.T) {
{
Name: "j1",
Phase: v1.BatchJobPhaseFailed,
EndTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
Failed: 1,
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodFailed,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
}},
},
{
Name: "j2",
Phase: v1.BatchJobPhaseSucceeded,
EndTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
RadixBatchJobPodStatuses: []v1.RadixBatchJobPodStatus{{
Phase: v1.PodSucceeded,
CreationTime: &metav1.Time{time.Now()},
StartTime: &metav1.Time{time.Now()},
EndTime: &metav1.Time{time.Now()},
CreationTime: &metav1.Time{Time: time.Now()},
StartTime: &metav1.Time{Time: time.Now()},
EndTime: &metav1.Time{Time: time.Now()},
}},
},
},
Expand Down
32 changes: 2 additions & 30 deletions api/environments/job_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
operatorUtils "github.com/equinor/radix-operator/pkg/apis/utils"
radixLabels "github.com/equinor/radix-operator/pkg/apis/utils/labels"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand All @@ -48,7 +47,6 @@ func (eh EnvironmentHandler) getJobs(ctx context.Context, appName, envName, jobC
if err != nil {
return nil, err
}

return eh.getScheduledJobSummaryList(radixBatches), nil
}

Expand Down Expand Up @@ -337,32 +335,6 @@ func (eh EnvironmentHandler) getRadixBatch(ctx context.Context, appName, envName
return batch, nil
}

func (eh EnvironmentHandler) getPodsForBatch(ctx context.Context, appName, envName, batchName string) ([]corev1.Pod, error) {
namespace := operatorUtils.GetEnvironmentNamespace(appName, envName)
selector := radixLabels.ForBatchName(batchName)

return eh.getPodsWithLabelSelector(ctx, namespace, selector.String())
}

func (eh EnvironmentHandler) getPodsForBatchJob(ctx context.Context, appName, envName, batchName, jobName string) ([]corev1.Pod, error) {
namespace := operatorUtils.GetEnvironmentNamespace(appName, envName)
selector := radixLabels.Merge(
radixLabels.ForBatchName(batchName),
radixLabels.ForBatchJobName(jobName),
)

return eh.getPodsWithLabelSelector(ctx, namespace, selector.String())
}

func (eh EnvironmentHandler) getPodsWithLabelSelector(ctx context.Context, namespace, labelSelector string) ([]corev1.Pod, error) {
pods, err := eh.accounts.UserAccount.Client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: labelSelector})
if err != nil {
return nil, err
}

return pods.Items, nil
}

func (eh EnvironmentHandler) getScheduledBatchSummaryList(batches []radixv1.RadixBatch) (summaries []deploymentModels.ScheduledBatchSummary) {
for _, batch := range batches {
summaries = append(summaries, eh.getScheduledBatchSummary(&batch))
Expand Down Expand Up @@ -466,7 +438,7 @@ func (eh EnvironmentHandler) getScheduledJobSummary(batch *radixv1.RadixBatch, j

if statuses := slice.FindAll(batch.Status.JobStatuses, func(jobStatus radixv1.RadixBatchJobStatus) bool { return jobStatus.Name == job.Name }); len(statuses) == 1 {
status := statuses[0]
summary.Status = getScheduledJobStatus(job, status, stopJob).String()
summary.Status = getScheduledJobStatus(status, stopJob).String()
summary.Created = radixutils.FormatTime(status.CreationTime)
summary.Started = radixutils.FormatTime(status.StartTime)
summary.Ended = radixutils.FormatTime(status.EndTime)
Expand Down Expand Up @@ -499,7 +471,7 @@ func getScheduledBatchStatus(batch *radixv1.RadixBatch) (status jobSchedulerMode
return jobSchedulerModels.Waiting
}

func getScheduledJobStatus(job radixv1.RadixBatchJob, jobStatus radixv1.RadixBatchJobStatus, stopJob bool) (status jobSchedulerModels.ProgressStatus) {
func getScheduledJobStatus(jobStatus radixv1.RadixBatchJobStatus, stopJob bool) (status jobSchedulerModels.ProgressStatus) {
status = jobSchedulerModels.Waiting
switch jobStatus.Phase {
case radixv1.BatchJobPhaseActive:
Expand Down
1 change: 1 addition & 0 deletions api/kubequery/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ func Test_GetEvents(t *testing.T) {

// Get non-existing events (wrong namespace)
actual, err = GetEventsForEnvironment(context.Background(), client, "app3", "dev")
require.NoError(t, err)
assert.Len(t, actual, 0)
}

0 comments on commit d125069

Please sign in to comment.