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

Draft: Test that an object is updatable after updating its status. #2486

Closed
wants to merge 2 commits into from
Closed

Draft: Test that an object is updatable after updating its status. #2486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f0fe71
Draft: Test that an object is updatable after updating its status.
berlin-ab Sep 10, 2023
c527239
Draft: ensure we udpate the new obj's accessor's ResourceVersion afte…
berlin-ab Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions pkg/client/fake/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,84 @@ var _ = Describe("Fake client", func() {
objOriginal.Status.NodeInfo.MachineID = "machine-id-from-status-update"
Expect(cmp.Diff(objOriginal, actual)).To(BeEmpty())
})

It("should be able to update an object after updating an object's status", func() {
obj := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node",
},
Spec: corev1.NodeSpec{
PodCIDR: "old-cidr",
},
Status: corev1.NodeStatus{
NodeInfo: corev1.NodeSystemInfo{
MachineID: "machine-id",
},
},
}
cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build()
expectedObj := obj.DeepCopy()

obj.Status.NodeInfo.MachineID = "machine-id-from-status-update"
Expect(cl.Status().Update(context.Background(), obj)).NotTo(HaveOccurred())

obj.Annotations = map[string]string{
"some-annotation-key": "some",
}
expectedObj.Annotations = map[string]string{
"some-annotation-key": "some",
}
Expect(cl.Update(context.Background(), obj)).NotTo(HaveOccurred())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test fails. The test below was double checking that the reverse order also works.


actual := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: obj.Name}}
Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(actual), actual)).NotTo(HaveOccurred())

expectedObj.APIVersion = actual.APIVersion
expectedObj.Kind = actual.Kind
expectedObj.ResourceVersion = actual.ResourceVersion
expectedObj.Status.NodeInfo.MachineID = "machine-id-from-status-update"
Expect(cmp.Diff(expectedObj, actual)).To(BeEmpty())
})

It("should be able to update an object's status after updating an object", func() {
obj := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node",
},
Spec: corev1.NodeSpec{
PodCIDR: "old-cidr",
},
Status: corev1.NodeStatus{
NodeInfo: corev1.NodeSystemInfo{
MachineID: "machine-id",
},
},
}
cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build()
expectedObj := obj.DeepCopy()

obj.Annotations = map[string]string{
"some-annotation-key": "some",
}
expectedObj.Annotations = map[string]string{
"some-annotation-key": "some",
}
Expect(cl.Update(context.Background(), obj)).NotTo(HaveOccurred())

obj.Spec.PodCIDR = "cidr-from-status-update"
obj.Status.NodeInfo.MachineID = "machine-id-from-status-update"
Expect(cl.Status().Update(context.Background(), obj)).NotTo(HaveOccurred())

actual := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: obj.Name}}
Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(actual), actual)).NotTo(HaveOccurred())

expectedObj.APIVersion = actual.APIVersion
expectedObj.Kind = actual.Kind
expectedObj.ResourceVersion = actual.ResourceVersion
expectedObj.Status.NodeInfo.MachineID = "machine-id-from-status-update"
Expect(cmp.Diff(expectedObj, actual)).To(BeEmpty())
})

It("Should only override status fields of typed objects that have a status subresource on status update", func() {
obj := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Expand Down
1 change: 1 addition & 0 deletions pkg/client/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ type SubResourceWriter interface {
// Create saves the subResource object in the Kubernetes cluster. obj must be a
// struct pointer so that obj can be updated with the content returned by the Server.
Create(ctx context.Context, obj Object, subResource Object, opts ...SubResourceCreateOption) error

// Update updates the fields corresponding to the status subresource for the
// given obj. obj must be a struct pointer so that obj can be updated
// with the content returned by the Server.
Expand Down
Loading