Skip to content

Commit 11cfbe4

Browse files
ajanikowajanikow
committed
Iter
1 parent f58b8ac commit 11cfbe4

13 files changed

+161
-161
lines changed

‎pkg/apis/scheduler/v1beta1/types_batchjob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type ArangoSchedulerBatchJobSpec struct {
5757
}
5858

5959
type ArangoSchedulerBatchJobStatus struct {
60-
ArangoSchedulerStatusMetadata `json:",inline"`
60+
Metadata ArangoSchedulerStatusMetadata `json:"metadata,omitempty"`
6161

6262
batch.JobStatus `json:",inline"`
6363
}

‎pkg/apis/scheduler/v1beta1/types_cronjob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type ArangoSchedulerCronJobSpec struct {
5757
}
5858

5959
type ArangoSchedulerCronJobStatus struct {
60-
ArangoSchedulerStatusMetadata `json:",inline"`
60+
Metadata ArangoSchedulerStatusMetadata `json:"metadata,omitempty"`
6161

6262
batch.CronJobStatus `json:",inline"`
6363
}

‎pkg/apis/scheduler/v1beta1/types_deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type ArangoSchedulerDeploymentSpec struct {
5757
}
5858

5959
type ArangoSchedulerDeploymentStatus struct {
60-
ArangoSchedulerStatusMetadata `json:",inline"`
60+
Metadata ArangoSchedulerStatusMetadata `json:"metadata,omitempty"`
6161

6262
apps.DeploymentStatus `json:",inline"`
6363
}

‎pkg/apis/scheduler/v1beta1/types_pod.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type ArangoSchedulerPodSpec struct {
5757
}
5858

5959
type ArangoSchedulerPodStatus struct {
60-
ArangoSchedulerStatusMetadata `json:",inline"`
60+
Metadata ArangoSchedulerStatusMetadata `json:"metadata,omitempty"`
6161

6262
core.PodStatus `json:",inline"`
6363
}

‎pkg/apis/scheduler/v1beta1/zz_generated.deepcopy.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/handlers/scheduler/batchjob/handler.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
131131
return false, err
132132
}
133133

134-
if status.Object == nil {
134+
if status.Metadata.Object == nil {
135135
// Create
136136

137137
obj := &batch.Job{}
@@ -152,17 +152,17 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
152152

153153
h.eventRecorder.Normal(extension, "Created", "Job %s created", newObj.GetName())
154154

155-
status.Object = util.NewType(sharedApi.NewObjectWithChecksum(newObj, hash))
155+
status.Metadata.Object = util.NewType(sharedApi.NewObjectWithChecksum(newObj, hash))
156156
return true, operator.Reconcile("Job Reference Changed")
157157
}
158158

159159
// Find existing
160-
obj, err := h.kubeClient.BatchV1().Jobs(status.Object.GetNamespace(extension)).Get(ctx, status.Object.GetName(), meta.GetOptions{})
160+
obj, err := h.kubeClient.BatchV1().Jobs(status.Metadata.Object.GetNamespace(extension)).Get(ctx, status.Metadata.Object.GetName(), meta.GetOptions{})
161161
if err != nil {
162162
if kerrors.IsNotFound(err) {
163163
// Object removed
164-
h.eventRecorder.Warning(extension, "Removed", "Job %s is gone", status.Object.GetName())
165-
status.Object = nil
164+
h.eventRecorder.Warning(extension, "Removed", "Job %s is gone", status.Metadata.Object.GetName())
165+
status.Metadata.Object = nil
166166
return true, operator.Reconcile("Job Reference Removed")
167167
}
168168
return false, err
@@ -173,8 +173,8 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
173173
})
174174

175175
// Try to fetch status
176-
if !equality.Semantic.DeepEqual(status.Profiles, profileNames) {
177-
status.Profiles = profileNames
176+
if !equality.Semantic.DeepEqual(status.Metadata.Profiles, profileNames) {
177+
status.Metadata.Profiles = profileNames
178178
return true, operator.Reconcile("Status Changed")
179179
}
180180

@@ -189,20 +189,20 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
189189
return false, operator.Reconcile("Job Deleting")
190190
}
191191

192-
if !status.Object.Equals(obj) {
192+
if !status.Metadata.Object.Equals(obj) {
193193
// Object changed or was recreated
194-
h.eventRecorder.Warning(extension, "Removed", "Job %s reference is invalid", status.Object.GetName())
195-
if err := h.kubeClient.BatchV1().Jobs(status.Object.GetNamespace(extension)).Delete(ctx, status.Object.GetName(), meta.DeleteOptions{}); err != nil {
194+
h.eventRecorder.Warning(extension, "Removed", "Job %s reference is invalid", status.Metadata.Object.GetName())
195+
if err := h.kubeClient.BatchV1().Jobs(status.Metadata.Object.GetNamespace(extension)).Delete(ctx, status.Metadata.Object.GetName(), meta.DeleteOptions{}); err != nil {
196196
return false, err
197197
}
198198

199199
return false, operator.Reconcile("Job Deleted")
200200
}
201201

202202
// Object is equal, lets check if changed
203-
if hash != status.Object.GetChecksum() {
203+
if hash != status.Metadata.Object.GetChecksum() {
204204
// Checksum changed, lets apply changes
205-
_, _, err := patcher.Patcher[*batch.Job](ctx, h.kubeClient.BatchV1().Jobs(status.Object.GetNamespace(extension)), obj, meta.PatchOptions{}, func(in *batch.Job) []patch.Item {
205+
_, _, err := patcher.Patcher[*batch.Job](ctx, h.kubeClient.BatchV1().Jobs(status.Metadata.Object.GetNamespace(extension)), obj, meta.PatchOptions{}, func(in *batch.Job) []patch.Item {
206206
return []patch.Item{
207207
patch.ItemReplace(patch.NewPath("spec"), batchJobTemplate.Spec),
208208
}
@@ -212,7 +212,7 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
212212
return false, err
213213
}
214214
h.eventRecorder.Normal(extension, "Updated", "Job %s patched", obj.GetName())
215-
status.Object.Checksum = util.NewType(hash)
215+
status.Metadata.Object.Checksum = util.NewType(hash)
216216
return true, nil
217217
}
218218

‎pkg/handlers/scheduler/batchjob/handler_manage_test.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ func Test_Handler_Create(t *testing.T) {
4949
refresh(t)
5050

5151
// Validate
52-
require.NotNil(t, extension.Status.Object)
53-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
54-
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Object.GetChecksum())
52+
require.NotNil(t, extension.Status.Metadata.Object)
53+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
54+
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Metadata.Object.GetChecksum())
5555
}
5656

5757
func Test_Handler_Update(t *testing.T) {
@@ -70,9 +70,9 @@ func Test_Handler_Update(t *testing.T) {
7070
refresh(t)
7171

7272
// Validate
73-
require.NotNil(t, extension.Status.Object)
74-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
75-
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Object.GetChecksum())
73+
require.NotNil(t, extension.Status.Metadata.Object)
74+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
75+
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Metadata.Object.GetChecksum())
7676

7777
// Update
7878
tests.Apply(t, extension, func(t *testing.T, obj *schedulerApi.ArangoSchedulerBatchJob) {
@@ -87,9 +87,9 @@ func Test_Handler_Update(t *testing.T) {
8787
refresh(t)
8888

8989
// Validate
90-
require.NotNil(t, extension.Status.Object)
91-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
92-
require.Equal(t, "65257e9b53283da2bfc00caeca08eee9cfbc465a3032119cb95c113efdf62b25", extension.Status.Object.GetChecksum())
90+
require.NotNil(t, extension.Status.Metadata.Object)
91+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
92+
require.Equal(t, "65257e9b53283da2bfc00caeca08eee9cfbc465a3032119cb95c113efdf62b25", extension.Status.Metadata.Object.GetChecksum())
9393
}
9494

9595
func Test_Handler_Recreate(t *testing.T) {
@@ -108,13 +108,13 @@ func Test_Handler_Recreate(t *testing.T) {
108108
refresh(t)
109109

110110
// Validate
111-
require.NotNil(t, extension.Status.Object)
112-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
113-
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Object.GetChecksum())
111+
require.NotNil(t, extension.Status.Metadata.Object)
112+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
113+
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Metadata.Object.GetChecksum())
114114

115115
// Update
116116
tests.Apply(t, extension, func(t *testing.T, obj *schedulerApi.ArangoSchedulerBatchJob) {
117-
obj.Status.Object.UID = util.NewType[types.UID]("TEST")
117+
obj.Status.Metadata.Object.UID = util.NewType[types.UID]("TEST")
118118
})
119119
tests.UpdateObjects(t, handler.kubeClient, handler.client, &extension)
120120

@@ -125,9 +125,9 @@ func Test_Handler_Recreate(t *testing.T) {
125125
refresh(t)
126126

127127
// Validate
128-
require.NotNil(t, extension.Status.Object)
129-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
130-
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Object.GetChecksum())
128+
require.NotNil(t, extension.Status.Metadata.Object)
129+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
130+
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Metadata.Object.GetChecksum())
131131
}
132132

133133
func Test_Handler_Parent(t *testing.T) {
@@ -146,7 +146,7 @@ func Test_Handler_Parent(t *testing.T) {
146146
refresh(t)
147147

148148
// Validate
149-
require.NotNil(t, extension.Status.Object)
149+
require.NotNil(t, extension.Status.Metadata.Object)
150150
tests.RefreshObjects(t, handler.kubeClient, handler.client, &batchJob)
151151

152152
require.Len(t, batchJob.OwnerReferences, 1)
@@ -170,9 +170,9 @@ func Test_Handler_Propagate(t *testing.T) {
170170
tests.RefreshObjects(t, handler.kubeClient, handler.client, &batchJob)
171171

172172
// Validate
173-
require.NotNil(t, extension.Status.Object)
174-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
175-
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Object.GetChecksum())
173+
require.NotNil(t, extension.Status.Metadata.Object)
174+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
175+
require.Equal(t, "c12919994bb3b13dfc1cd7903bd2020a4da93064d93b068171d1567a203c62c4", extension.Status.Metadata.Object.GetChecksum())
176176
require.Nil(t, batchJob.Spec.Completions)
177177
require.EqualValues(t, 0, extension.Status.Active)
178178

@@ -193,9 +193,9 @@ func Test_Handler_Propagate(t *testing.T) {
193193
tests.RefreshObjects(t, handler.kubeClient, handler.client, &batchJob)
194194

195195
// Validate
196-
require.NotNil(t, extension.Status.Object)
197-
require.Equal(t, extension.GetName(), extension.Status.Object.GetName())
198-
require.Equal(t, "65257e9b53283da2bfc00caeca08eee9cfbc465a3032119cb95c113efdf62b25", extension.Status.Object.GetChecksum())
196+
require.NotNil(t, extension.Status.Metadata.Object)
197+
require.Equal(t, extension.GetName(), extension.Status.Metadata.Object.GetName())
198+
require.Equal(t, "65257e9b53283da2bfc00caeca08eee9cfbc465a3032119cb95c113efdf62b25", extension.Status.Metadata.Object.GetChecksum())
199199
require.NotNil(t, batchJob.Spec.Completions)
200200
require.EqualValues(t, 2, *batchJob.Spec.Completions)
201201
require.EqualValues(t, 1, extension.Status.Active)
@@ -225,6 +225,6 @@ func Test_Handler_Profile(t *testing.T) {
225225
tests.RefreshObjects(t, handler.kubeClient, handler.client, &batchJob)
226226
require.NotNil(t, batchJob)
227227

228-
require.Len(t, extension.Status.Profiles, 1)
229-
require.Equal(t, profile.GetName(), extension.Status.Profiles[0])
228+
require.Len(t, extension.Status.Metadata.Profiles, 1)
229+
require.Equal(t, profile.GetName(), extension.Status.Metadata.Profiles[0])
230230
}

‎pkg/handlers/scheduler/cronjob/handler.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
131131
return false, err
132132
}
133133

134-
if status.Object == nil {
134+
if status.Metadata.Object == nil {
135135
// Create
136136

137137
obj := &batch.CronJob{}
@@ -152,17 +152,17 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
152152

153153
h.eventRecorder.Normal(extension, "Created", "CronJob %s created", newObj.GetName())
154154

155-
status.Object = util.NewType(sharedApi.NewObjectWithChecksum(newObj, hash))
155+
status.Metadata.Object = util.NewType(sharedApi.NewObjectWithChecksum(newObj, hash))
156156
return true, operator.Reconcile("Job Reference Changed")
157157
}
158158

159159
// Find existing
160-
obj, err := h.kubeClient.BatchV1().CronJobs(status.Object.GetNamespace(extension)).Get(ctx, status.Object.GetName(), meta.GetOptions{})
160+
obj, err := h.kubeClient.BatchV1().CronJobs(status.Metadata.Object.GetNamespace(extension)).Get(ctx, status.Metadata.Object.GetName(), meta.GetOptions{})
161161
if err != nil {
162162
if kerrors.IsNotFound(err) {
163163
// Object removed
164-
h.eventRecorder.Warning(extension, "Removed", "CronJob %s is gone", status.Object.GetName())
165-
status.Object = nil
164+
h.eventRecorder.Warning(extension, "Removed", "CronJob %s is gone", status.Metadata.Object.GetName())
165+
status.Metadata.Object = nil
166166
return true, operator.Reconcile("CronJob Reference Removed")
167167
}
168168
return false, err
@@ -173,8 +173,8 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
173173
})
174174

175175
// Try to fetch status
176-
if !equality.Semantic.DeepEqual(status.Profiles, profileNames) {
177-
status.Profiles = profileNames
176+
if !equality.Semantic.DeepEqual(status.Metadata.Profiles, profileNames) {
177+
status.Metadata.Profiles = profileNames
178178
return true, operator.Reconcile("Status Changed")
179179
}
180180

@@ -189,20 +189,20 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
189189
return false, operator.Reconcile("Job Deleting")
190190
}
191191

192-
if !status.Object.Equals(obj) {
192+
if !status.Metadata.Object.Equals(obj) {
193193
// Object changed or was recreated
194-
h.eventRecorder.Warning(extension, "Removed", "CronJob %s reference is invalid", status.Object.GetName())
195-
if err := h.kubeClient.BatchV1().CronJobs(status.Object.GetNamespace(extension)).Delete(ctx, status.Object.GetName(), meta.DeleteOptions{}); err != nil {
194+
h.eventRecorder.Warning(extension, "Removed", "CronJob %s reference is invalid", status.Metadata.Object.GetName())
195+
if err := h.kubeClient.BatchV1().CronJobs(status.Metadata.Object.GetNamespace(extension)).Delete(ctx, status.Metadata.Object.GetName(), meta.DeleteOptions{}); err != nil {
196196
return false, err
197197
}
198198

199199
return false, operator.Reconcile("CronJob Deleted")
200200
}
201201

202202
// Object is equal, lets check if changed
203-
if hash != status.Object.GetChecksum() {
203+
if hash != status.Metadata.Object.GetChecksum() {
204204
// Checksum changed, lets apply changes
205-
_, _, err := patcher.Patcher[*batch.CronJob](ctx, h.kubeClient.BatchV1().CronJobs(status.Object.GetNamespace(extension)), obj, meta.PatchOptions{}, func(in *batch.CronJob) []patch.Item {
205+
_, _, err := patcher.Patcher[*batch.CronJob](ctx, h.kubeClient.BatchV1().CronJobs(status.Metadata.Object.GetNamespace(extension)), obj, meta.PatchOptions{}, func(in *batch.CronJob) []patch.Item {
206206
return []patch.Item{
207207
patch.ItemReplace(patch.NewPath("spec"), cronJobTemplate.Spec),
208208
}
@@ -212,7 +212,7 @@ func (h *handler) HandleObject(ctx context.Context, item operation.Item, extensi
212212
return false, err
213213
}
214214
h.eventRecorder.Normal(extension, "Updated", "CronJob %s patched", obj.GetName())
215-
status.Object.Checksum = util.NewType(hash)
215+
status.Metadata.Object.Checksum = util.NewType(hash)
216216
return true, nil
217217
}
218218

0 commit comments

Comments
 (0)