Use annotation to track created remote clusters #2891
Merged
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
pebrc
approved these changes
Apr 16, 2020
| if err != nil { | ||
| return remoteClustersInEs, err | ||
| } | ||
| for remoteClusterName := range remoteClusterSettings.PersistentSettings.Cluster.RemoteClusters { |
There was a problem hiding this comment.
I guess we can ignore transient settings for the purposes of this function?
There was a problem hiding this comment.
This is the assumption I made since we are only interested in clusters created by ECK.
sebgl
approved these changes
Apr 16, 2020
| // 3.1 Schedule its deletion from the Elasticsearch settings | ||
| // 3.2 Otherwise remove it from the annotation | ||
| // 4. Update the annotation on the Elasticsearch object | ||
| // 5. Apply the settings through the Elasticsearch API |
There was a problem hiding this comment.
I love that sort of comment 👍
|
Jenkins test this please |
barkbay
added a commit
to barkbay/cloud-on-k8s
that referenced
this pull request
Apr 16, 2020
* Use annotation to track created remote clusters
barkbay
added a commit
that referenced
this pull request
Apr 16, 2020
This was referenced Apr 20, 2020
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.
The PR fixes an issue where the annotation used to cache the Elasticsearch state wrt remote clusters may become inconsistent and could prevent some updates to be applied.
The annotation is kept but only to track the remote clusters that have been previously managed by ECK. In order to be consistent with the other API calls in ECK the algorithm never tries to optimize the number of calls performed on the ES cluster.
It can be noted that it still exists an edge case where ECK may delete a cluster managed by the user:
remote-foois declared as remote in the Specremote-foois removed from the specremote-foomanuallyremote-foo💥At each iteration a log is printed with the upserted and deleted remote clusters.
Last PR to completely fix #2864 , related to #2880
@anyasabo I think it should be included in
1.1.0to avoid a mix of "remote clusters related" labels on Elasticsearch resources in the future.