Skip to content

Commit 8ec6490

Browse files
authored
K8SPSMDB-965 update batch/v1beta1 to batch/v1 (#1296)
1 parent e131f0e commit 8ec6490

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pkg/controller/perconaservermongodb/backup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/robfig/cron/v3"
1212
"go.mongodb.org/mongo-driver/mongo"
1313
"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
14-
batchv1beta1 "k8s.io/api/batch/v1beta1"
14+
batchv1 "k8s.io/api/batch/v1"
1515
corev1 "k8s.io/api/core/v1"
1616
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
1717
"k8s.io/apimachinery/pkg/labels"
@@ -101,7 +101,7 @@ func (r *ReconcilePerconaServerMongoDB) deleteOldBackupTasks(ctx context.Context
101101

102102
if cr.CompareVersion("1.13.0") < 0 {
103103
ls := backup.NewBackupCronJobLabels(cr.Name, cr.Spec.Backup.Labels)
104-
tasksList := &batchv1beta1.CronJobList{}
104+
tasksList := &batchv1.CronJobList{}
105105
err := r.client.List(ctx,
106106
tasksList,
107107
&client.ListOptions{

pkg/psmdb/backup/job.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"time"
77

88
batchv1 "k8s.io/api/batch/v1"
9-
batchv1beta1 "k8s.io/api/batch/v1beta1"
109
corev1 "k8s.io/api/core/v1"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211

@@ -15,11 +14,11 @@ import (
1514
"github.com/pkg/errors"
1615
)
1716

18-
func BackupCronJob(cr *api.PerconaServerMongoDB, task *api.BackupTaskSpec) (batchv1beta1.CronJob, error) {
17+
func BackupCronJob(cr *api.PerconaServerMongoDB, task *api.BackupTaskSpec) (batchv1.CronJob, error) {
1918
backupSpec := cr.Spec.Backup
2019
containerArgs, err := newBackupCronJobContainerArgs(cr, task)
2120
if err != nil {
22-
return batchv1beta1.CronJob{}, errors.Wrap(err, "cannot generate container arguments")
21+
return batchv1.CronJob{}, errors.Wrap(err, "cannot generate container arguments")
2322
}
2423

2524
backupPod := corev1.PodSpec{
@@ -50,9 +49,9 @@ func BackupCronJob(cr *api.PerconaServerMongoDB, task *api.BackupTaskSpec) (batc
5049
RuntimeClassName: backupSpec.RuntimeClassName,
5150
}
5251

53-
return batchv1beta1.CronJob{
52+
return batchv1.CronJob{
5453
TypeMeta: metav1.TypeMeta{
55-
APIVersion: "batch/v1beta1",
54+
APIVersion: "batch/v1",
5655
Kind: "CronJob",
5756
},
5857
ObjectMeta: metav1.ObjectMeta{
@@ -61,10 +60,10 @@ func BackupCronJob(cr *api.PerconaServerMongoDB, task *api.BackupTaskSpec) (batc
6160
Labels: NewBackupCronJobLabels(cr.Name, backupSpec.Labels),
6261
Annotations: backupSpec.Annotations,
6362
},
64-
Spec: batchv1beta1.CronJobSpec{
63+
Spec: batchv1.CronJobSpec{
6564
Schedule: task.Schedule,
66-
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
67-
JobTemplate: batchv1beta1.JobTemplateSpec{
65+
ConcurrencyPolicy: batchv1.ForbidConcurrent,
66+
JobTemplate: batchv1.JobTemplateSpec{
6867
ObjectMeta: metav1.ObjectMeta{
6968
Labels: NewBackupCronJobLabels(cr.Name, backupSpec.Labels),
7069
Annotations: backupSpec.Annotations,

0 commit comments

Comments
 (0)