Skip to content

Commit 6950720

Browse files
authored
Merge pull request kubernetes#123730 from pohly/dra-status-update-fix
dra api: fix status updates
2 parents 87f9b38 + 27df75c commit 6950720

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

pkg/registry/resource/podschedulingcontext/strategy.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"errors"
2222

23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2324
"k8s.io/apimachinery/pkg/fields"
2425
"k8s.io/apimachinery/pkg/labels"
2526
"k8s.io/apimachinery/pkg/runtime"
@@ -125,6 +126,7 @@ func (podSchedulingStatusStrategy) PrepareForUpdate(ctx context.Context, obj, ol
125126
newScheduling := obj.(*resource.PodSchedulingContext)
126127
oldScheduling := old.(*resource.PodSchedulingContext)
127128
newScheduling.Spec = oldScheduling.Spec
129+
metav1.ResetObjectMetaForStatus(&newScheduling.ObjectMeta, &oldScheduling.ObjectMeta)
128130
}
129131

130132
func (podSchedulingStatusStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {

pkg/registry/resource/resourceclaim/strategy.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"errors"
2222

23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2324
"k8s.io/apimachinery/pkg/fields"
2425
"k8s.io/apimachinery/pkg/labels"
2526
"k8s.io/apimachinery/pkg/runtime"
@@ -125,6 +126,7 @@ func (resourceclaimStatusStrategy) PrepareForUpdate(ctx context.Context, obj, ol
125126
newClaim := obj.(*resource.ResourceClaim)
126127
oldClaim := old.(*resource.ResourceClaim)
127128
newClaim.Spec = oldClaim.Spec
129+
metav1.ResetObjectMetaForStatus(&newClaim.ObjectMeta, &oldClaim.ObjectMeta)
128130
}
129131

130132
func (resourceclaimStatusStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {

0 commit comments

Comments
 (0)