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

Jump to bottom

remove legacy job handler #584

Merged
merged 1 commit into from
Jan 4, 2024
Merged

remove legacy job handler #584

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion api/environments/environment_controller_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,6 @@ func (s *secretHandlerTestSuite) createPodForRadixComponent(kubeClient kubernete
kube.RadixComponentLabel: componentName,
}
if isJobComponent {
labels[k8sJobNameLabel] = componentName
labels[kube.RadixJobTypeLabel] = kube.RadixJobTypeJobSchedule
}
_, _ = kubeClient.CoreV1().Pods(envNamespace).Create(context.Background(), &corev1.Pod{
Expand Down
49 changes: 3 additions & 46 deletions api/environments/job_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ func (eh EnvironmentHandler) GetJobs(ctx context.Context, appName, envName, jobC
return nil, err
}

// Backward compatibility: Get list of jobs not handled by RadixBatch
// TODO: Remove when there are no legacy jobs left
jh := legacyJobHandler{accounts: eh.accounts}
legacyJobs, err := jh.GetJobs(ctx, appName, envName, jobComponentName)
if err != nil {
return nil, err
}
jobs = append(jobs, legacyJobs...)

sort.SliceStable(jobs, func(i, j int) bool {
return utils.IsBefore(&jobs[j], &jobs[i])
})
Expand All @@ -62,16 +53,7 @@ func (eh EnvironmentHandler) getJobs(ctx context.Context, appName, envName, jobC

// GetJob Gets job by name
func (eh EnvironmentHandler) GetJob(ctx context.Context, appName, envName, jobComponentName, jobName string) (*deploymentModels.ScheduledJobSummary, error) {
if jobSummary, err := eh.getJob(ctx, appName, envName, jobComponentName, jobName); err == nil {
return jobSummary, nil
}

// TODO: Return error from getJob when legacy handler is removed
// TODO: Remove when there are no legacy jobs left

// Backward compatibility: Get job not handled by RadixBatch
jh := legacyJobHandler{accounts: eh.accounts}
return jh.GetJob(ctx, appName, envName, jobComponentName, jobName)
return eh.getJob(ctx, appName, envName, jobComponentName, jobName)
}

// StopJob Stop job by name
Expand Down Expand Up @@ -178,15 +160,6 @@ func (eh EnvironmentHandler) GetBatches(ctx context.Context, appName, envName, j
return nil, err
}

// Backward compatibility: Get list of batches not handled by RadixBatch
// TODO: Remove when there are no legacy jobs left
jh := legacyJobHandler{accounts: eh.accounts}
legacyBatches, err := jh.GetBatches(ctx, appName, envName, jobComponentName)
if err != nil {
return nil, err
}
summaries = append(summaries, legacyBatches...)

sort.SliceStable(summaries, func(i, j int) bool {
return utils.IsBefore(&summaries[j], &summaries[i])
})
Expand Down Expand Up @@ -265,16 +238,7 @@ func (eh EnvironmentHandler) CopyJob(ctx context.Context, appName, envName, jobC

// GetBatch Gets batch by name
func (eh EnvironmentHandler) GetBatch(ctx context.Context, appName, envName, jobComponentName, batchName string) (*deploymentModels.ScheduledBatchSummary, error) {
if batchSummary, err := eh.getBatch(ctx, appName, envName, jobComponentName, batchName); err == nil {
return batchSummary, nil
}

// TODO: Return error from getBatch when legacy handler is removed
// TODO: Remove legacy handler when there are no legacy jobs left

// Backward compatibility: Get batch not handled by RadixBatch
jh := legacyJobHandler{accounts: eh.accounts}
return jh.GetBatch(ctx, appName, envName, jobComponentName, batchName)
return eh.getBatch(ctx, appName, envName, jobComponentName, batchName)
}

func (eh EnvironmentHandler) getBatch(ctx context.Context, appName, envName, jobComponentName, batchName string) (*deploymentModels.ScheduledBatchSummary, error) {
Expand All @@ -295,14 +259,7 @@ func (eh EnvironmentHandler) getBatch(ctx context.Context, appName, envName, job

// GetJobPayload Gets job payload
func (eh EnvironmentHandler) GetJobPayload(ctx context.Context, appName, envName, jobComponentName, jobName string) (io.ReadCloser, error) {
if payload, err := eh.getJobPayload(ctx, appName, envName, jobComponentName, jobName); err == nil {
return payload, nil
}

// Backward compatibility: Get batch not handled by RadixBatch
// TODO: Remove when there are no legacy jobs left
jh := legacyJobHandler{accounts: eh.accounts}
return jh.GetJobPayload(appName, envName, jobComponentName, jobName)
return eh.getJobPayload(ctx, appName, envName, jobComponentName, jobName)
}

func (eh EnvironmentHandler) getJobPayload(ctx context.Context, appName, envName, jobComponentName, jobName string) (io.ReadCloser, error) {
Expand Down
Loading