|
|
@@ -498,16 +498,22 @@ func checkForPodDeletionCronJob(config *PorterRunSharedConfig) error {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
+ if namespace.Name != "default" {
|
|
|
+ for _, cronJob := range cronJobs.Items {
|
|
|
+ if cronJob.Name == "porter-ephemeral-pod-deletion-cronjob" {
|
|
|
+ err = config.Clientset.BatchV1beta1().CronJobs(namespace.Name).Delete(
|
|
|
+ context.Background(), cronJob.Name, metav1.DeleteOptions{},
|
|
|
+ )
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
for _, cronJob := range cronJobs.Items {
|
|
|
if namespace.Name == "default" && cronJob.Name == "porter-ephemeral-pod-deletion-cronjob" {
|
|
|
return nil
|
|
|
- } else if cronJob.Name == "porter-ephemeral-pod-deletion-cronjob" {
|
|
|
- err = config.Clientset.BatchV1beta1().CronJobs(namespace.Name).Delete(
|
|
|
- context.Background(), cronJob.Name, metav1.DeleteOptions{},
|
|
|
- )
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|