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

Update IndexManagement CronJobs API from v1beta1 to v1 #813

Merged
merged 1 commit into from
Oct 28, 2021
Merged

Update IndexManagement CronJobs API from v1beta1 to v1 #813

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/indexmanagement/index_management_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
elasticsearch "github.com/openshift/elasticsearch-operator/apis/logging/v1"
"github.com/openshift/elasticsearch-operator/internal/constants"
"github.com/openshift/elasticsearch-operator/test/helpers"
batchv1beta1 "k8s.io/api/batch/v1beta1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = Describe("Index Management", func() {
It("should suspend all cronjobs when non available", func() {
Expect(req.createOrUpdateIndexManagement()).To(BeNil())

cj := &batchv1beta1.CronJob{}
cj := &batchv1.CronJob{}
key := client.ObjectKey{Name: "elasticsearch-im-infra", Namespace: "openshift-logging"}
Expect(req.client.Get(context.TODO(), key, cj)).To(BeNil())
Expect(*cj.Spec.Suspend).To(BeTrue())
Expand All @@ -126,7 +126,7 @@ var _ = Describe("Index Management", func() {
req.client = fake.NewFakeClient(esPods...)
Expect(req.createOrUpdateIndexManagement()).To(BeNil())

cj := &batchv1beta1.CronJob{}
cj := &batchv1.CronJob{}
key := client.ObjectKey{Name: "elasticsearch-im-infra", Namespace: "openshift-logging"}
Expect(req.client.Get(context.TODO(), key, cj)).To(BeNil())
Expect(*cj.Spec.Suspend).To(BeFalse())
Expand Down
2 changes: 1 addition & 1 deletion internal/indexmanagement/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/ViaQ/logerr/kverrors"
"github.com/go-logr/logr"
batch "k8s.io/api/batch/v1beta1"
batch "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/indexmanagement/reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

batch "k8s.io/api/batch/v1beta1"
batch "k8s.io/api/batch/v1"
core "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
17 changes: 8 additions & 9 deletions internal/manifests/cronjob/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,33 @@ package cronjob

import (
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// Builder represents the type to build Cronjob objects
type Builder struct {
cj *batchv1beta1.CronJob
cj *batchv1.CronJob
}

// New returns a new Builder for Cronjob objects
func New(name, namespace string, labels map[string]string) *Builder {
return &Builder{cj: newCronjob(name, namespace, labels)}
}

func newCronjob(name, namespace string, labels map[string]string) *batchv1beta1.CronJob {
return &batchv1beta1.CronJob{
func newCronjob(name, namespace string, labels map[string]string) *batchv1.CronJob {
return &batchv1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: batchv1beta1.SchemeGroupVersion.String(),
APIVersion: batchv1.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Labels: labels,
},
Spec: batchv1beta1.CronJobSpec{
JobTemplate: batchv1beta1.JobTemplateSpec{
Spec: batchv1.CronJobSpec{
JobTemplate: batchv1.JobTemplateSpec{
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -44,10 +43,10 @@ func newCronjob(name, namespace string, labels map[string]string) *batchv1beta1.
}

// Build returns the final Cronjob object
func (b *Builder) Build() *batchv1beta1.CronJob { return b.cj }
func (b *Builder) Build() *batchv1.CronJob { return b.cj }

// WithConcurrencyPolicy sets the concurrency policy for the cronjob
func (b *Builder) WithConcurrencyPolicy(cp batchv1beta1.ConcurrencyPolicy) *Builder {
func (b *Builder) WithConcurrencyPolicy(cp batchv1.ConcurrencyPolicy) *Builder {
b.cj.Spec.ConcurrencyPolicy = cp
return b
}
Expand Down
2 changes: 1 addition & 1 deletion internal/manifests/cronjob/cronjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/ViaQ/logerr/kverrors"
"github.com/ViaQ/logerr/log"

batchv1beta1 "k8s.io/api/batch/v1beta1"
batchv1beta1 "k8s.io/api/batch/v1"
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/util/retry"
Expand Down
2 changes: 1 addition & 1 deletion internal/utils/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/ViaQ/logerr/log"

apps "k8s.io/api/apps/v1"
batch "k8s.io/api/batch/v1beta1"
batch "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
)
Expand Down