Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Prevent unexpected fields at the root of addresspaace etc failing the controller loop #4885

Merged
merged 2 commits into from
Jul 4, 2020

Conversation

k-wall
Copy link
Member

@k-wall k-wall commented Jul 3, 2020

Type of change

  • Bugfix

Description

Prevent unexpected fields at the root of addresspaace, address and message from causing the controller loops to fail
We were already using @JsonIgnoreProperties(ignoreUnknown = true) at the root of some IoT objects. This seemed to the least unobtrusive change.

Added supporting tests.

Checklist

  • Update/write design documentation in ./documentation/design
  • Write tests and make sure they pass
  • Update documentation
  • Check RBAC rights for Kubernetes / OpenShift roles
  • Try your changes from Pod inside your Kubernetes and OpenShift cluster, not just locally
  • Reference relevant issue(s) and close them after merging
  • Update CHANGELOG.md

@k-wall k-wall requested a review from lulf July 3, 2020 10:00
…resspace, address and message from causing the controller loops to fail

We were already using @JsonIgnoreProperties(ignoreUnknown = true) at the root
of some IoT objects.  This seemed to the least unobtrustive change.

Added supporting tests.
@k-wall k-wall requested a review from kornys July 3, 2020 10:40
@k-wall
Copy link
Member Author

k-wall commented Jul 3, 2020

@kornys this changes adds new system tests.

@k-wall
Copy link
Member Author

k-wall commented Jul 3, 2020

@enmasse-ci run tests testcase=CustomResourceDefinitionAddressSpacesTest,CustomResourceDefinitionAddressesTest

@enmasse-ci
Copy link

✔️ Test Summary ✔️

TEST_PROFILE: pr
TEST_CASE: CustomResourceDefinitionAddressSpacesTest,CustomResourceDefinitionAddressesTest
TOTAL: 35
PASS: 35
FAIL: 0
SKIP: 0
BUILD_NUMBER: 1140
BUILD_ENV: oc cluster up

@k-wall
Copy link
Member Author

k-wall commented Jul 3, 2020

@enmasse-ci run tests profile=isolated

@kornys
Copy link
Member

kornys commented Jul 3, 2020

@k-wall could you please also add acceptance profile for this new test?

@enmasse-ci
Copy link

Build Failed

@k-wall
Copy link
Member Author

k-wall commented Jul 3, 2020

@enmasse-ci run tests profile=isolated

@enmasse-ci
Copy link

✔️ Test Summary ✔️

TEST_PROFILE: isolated
TEST_CASE:
TOTAL: 185
PASS: 179
FAIL: 0
SKIP: 6
BUILD_NUMBER: 1142
BUILD_ENV: oc cluster up

@k-wall k-wall merged commit 9032ffb into EnMasseProject:release-0.33 Jul 4, 2020
@k-wall k-wall deleted the issue-4873 branch July 4, 2020 14:29
k-wall added a commit that referenced this pull request Jul 4, 2020
… controller loop (#4885)

* Fix #4873: Prevent unexpected fields at the root of addresspace, address and message from causing the controller loops to fail

We were already using @JsonIgnoreProperties(ignoreUnknown = true) at the root
of some IoT objects.  This seemed to the least unobtrustive change.

Added supporting tests.

* Add tags and change log

(cherry picked from commit 9032ffb)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AddresSpaceController chokes on unexpected fields at the top level of the addressspace object
4 participants