Fix runtime panic when trying to update operator controlled resources that don't have annotation or labels #433
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Xabier Larrakoetxea <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #433 +/- ##
==========================================
+ Coverage 89.79% 91.11% +1.32%
==========================================
Files 64 64
Lines 3115 3130 +15
==========================================
+ Hits 2797 2852 +55
+ Misses 216 196 -20
+ Partials 102 82 -20
Continue to review full report at Codecov.
|
objectiser
reviewed
May 23, 2019
pkg/inventory/misc.go
Outdated
|
|
||
| // initK8sObjectMeta will set the required default settings to | ||
| // kubernetes objects metadata if is required. | ||
| func initK8sObjectMeta(obj metav1.Object) { |
There was a problem hiding this comment.
Could you move this to pkg/util/util.go?
Also would be good to have a test for this.
|
Ready for a new check! |
…ethod to an utility method Signed-off-by: Xabier Larrakoetxea <[email protected]>
objectiser
approved these changes
May 24, 2019
|
@slok Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi!
First of all, thanks for this awesome software, it helps us a lot (also Jaeger! 😄).
This PR fixes the possibility of having runtime panics due to the operator trying to update annotations or labels on existing Kubernetes resources that don't have labels or annotations.
This happened to us when we upgraded from
v1.11.0to a newer version (v1.11.1andv1.12.0), the operator listed the operator ownedservicesand tried to update the annotations, it didn't have, so the map wasn't initialized and when updating it hit a panic due to the assignment on the map making the operator enter in crash loopback.To fix it I initialized the annotation and label maps when they are nil, also I saw that this was on all the resources of the inventory, so I applied the same logic to all of the resources.
In the meantime, we managed to bypass the problem setting a dummy annotation on all the services controlled by the operator.
Here are tracebacks of the panic:
Also happens on
v1.11.1Thanks!