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.

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

chore: delete options in k8s job delete function #27

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions utils/k8s/K8sUtil.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,22 +382,23 @@ func (impl K8sUtil) DeleteSecret(namespace string, name string, client *v12.Core
return nil
}

func (impl K8sUtil) DeleteJob(namespace string, name string, clusterConfig *ClusterConfig) error {
_, _, clientSet, err := impl.GetK8sConfigAndClients(clusterConfig)
func (impl K8sUtil) DeleteJob(jobName string, deleteAndCreateJobRequest *DeleteAndCreateJobRequest) error {
_, _, clientSet, err := impl.GetK8sConfigAndClients(deleteAndCreateJobRequest.ClusterConfig)
if err != nil {
impl.logger.Errorw("clientSet err, DeleteJob", "err", err)
return err
}
jobs := clientSet.BatchV1().Jobs(namespace)
jobs := clientSet.BatchV1().Jobs(deleteAndCreateJobRequest.Namespace)

job, err := jobs.Get(context.Background(), name, metav1.GetOptions{})
job, err := jobs.Get(context.Background(), jobName, metav1.GetOptions{})
if err != nil && errors.IsNotFound(err) {
impl.logger.Errorw("get job err, DeleteJob", "err", err)
return nil
}

if job != nil {
err := jobs.Delete(context.Background(), name, metav1.DeleteOptions{})
deleteOptions := deleteAndCreateJobRequest.GetK8sDeleteOptions()
err := jobs.Delete(context.Background(), jobName, deleteOptions)
if err != nil && !errors.IsNotFound(err) {
impl.logger.Errorw("delete err, DeleteJob", "err", err)
return err
Expand Down Expand Up @@ -559,30 +560,30 @@ func (impl K8sUtil) DeletePodByLabel(namespace string, labels string, clusterCon
}

// DeleteAndCreateJob Deletes and recreates if job exists else creates the job
func (impl K8sUtil) DeleteAndCreateJob(content []byte, namespace string, clusterConfig *ClusterConfig) error {
func (impl K8sUtil) DeleteAndCreateJob(deleteAndCreateJob *DeleteAndCreateJobRequest) error {
// Job object from content
var job batchV1.Job
err := yaml.Unmarshal(content, &job)
err := yaml.Unmarshal(deleteAndCreateJob.Content, &job)
if err != nil {
impl.logger.Errorw("Unmarshal err, CreateJobSafely", "err", err)
return err
}

// delete job if exists
err = impl.DeleteJob(namespace, job.Name, clusterConfig)
err = impl.DeleteJob(job.Name, deleteAndCreateJob)
if err != nil {
impl.logger.Errorw("DeleteJobIfExists err, CreateJobSafely", "err", err)
return err
}

labels := "job-name=" + job.Name
err = impl.DeletePodByLabel(namespace, labels, clusterConfig)
err = impl.DeletePodByLabel(deleteAndCreateJob.Namespace, labels, deleteAndCreateJob.ClusterConfig)
if err != nil {
impl.logger.Errorw("DeleteJobIfExists err, CreateJobSafely", "err", err)
return err
}
// create job
err = impl.CreateJob(namespace, job.Name, clusterConfig, &job)
err = impl.CreateJob(deleteAndCreateJob.Namespace, job.Name, deleteAndCreateJob.ClusterConfig, &job)
if err != nil {
impl.logger.Errorw("CreateJob err, CreateJobSafely", "err", err)
return err
Expand Down
44 changes: 44 additions & 0 deletions utils/k8s/bean.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,47 @@ func GetResourceKey(obj *unstructured.Unstructured) ResourceKey {
gvk := obj.GroupVersionKind()
return NewResourceKey(gvk.Group, gvk.Kind, obj.GetNamespace(), obj.GetName())
}

type DeletionPropagationOptions string

const (
DeletePropagationOrphan DeletionPropagationOptions = "Orphan"
DeletePropagationBackground DeletionPropagationOptions = "Background"
DeletePropagationForeground DeletionPropagationOptions = "Foreground"
)

type DeleteOptions struct {
Kind string
APIVersion string
GracePeriodSeconds *int64
Preconditions string
OrphanDependents *bool
PropagationPolicy DeletionPropagationOptions
DryRun []string
}

type DeleteAndCreateJobRequest struct {
Content []byte
Namespace string
ClusterConfig *ClusterConfig
DeleteOptions *DeleteOptions
}

func (impl DeleteAndCreateJobRequest) GetK8sDeleteOptions() v12.DeleteOptions {
if impl.DeleteOptions == nil {
return v12.DeleteOptions{}
}
deleteOptions := v12.DeleteOptions{
TypeMeta: v12.TypeMeta{
Kind: impl.DeleteOptions.Kind,
APIVersion: impl.DeleteOptions.APIVersion,
},
GracePeriodSeconds: impl.DeleteOptions.GracePeriodSeconds,
DryRun: impl.DeleteOptions.DryRun,
}
deletionPropagation := v12.DeletionPropagation(impl.DeleteOptions.PropagationPolicy)
if len(deletionPropagation) > 0 {
deleteOptions.PropagationPolicy = &deletionPropagation
}
return deleteOptions
}