skipped updating istio resources which were not created by admiral #271
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: Shriram Sharma <shriram_sharma@intuit.com>
shriramsharma
force-pushed
the
admiral-skip-custom-se
branch
from
9ebf3f5
to
7b30fba
Compare
aattuluri
requested changes
Jan 9, 2023
admiral/pkg/clusters/serviceentry.go
Outdated
| @@ -35,6 +35,11 @@ type SeDrTuple struct { | |||
| DestinationRule *networking.DestinationRule | |||
| } | |||
|
|
|||
| const ( | |||
| istioCustomResourceCreatedByAnnotationLabel = "app.kubernetes.io/created-by" | |||
There was a problem hiding this comment.
Probably rename these as resourceCreatedByAnnotationLabel as we can use these for other resources.
admiral/pkg/clusters/serviceentry.go
Outdated
| // if it was, then admiral will not take any action on this SE | ||
| skipSEUpdate := false | ||
| if oldServiceEntry != nil { | ||
| if !isGeneratedByAdmiral(oldServiceEntry.Annotations) { |
There was a problem hiding this comment.
Can be made a single if statement instead of nesting?
| newServiceEntry := createServiceEntrySkeletion(*seDr.ServiceEntry, seDr.SeName, syncNamespace) | ||
| if newServiceEntry != nil { | ||
| newServiceEntry.Labels = map[string]string{common.GetWorkloadIdentifier(): fmt.Sprintf("%v", identityId)} | ||
| addUpdateServiceEntry(ctx, newServiceEntry, oldServiceEntry, syncNamespace, rc) |
There was a problem hiding this comment.
Is it possible to move the logic to skip updating into addUpdateServiceEntry and addUpdateDestinationRule? That might make it cleaner.
There was a problem hiding this comment.
hey @aattuluri , I agree it will make it cleaner but I would need to do the same for the deleteSE and deleteDR funcs. Plus, in order to avoid adding it to the SEClusterCache, I added the logic here.
Signed-off-by: Shriram Sharma <shriram_sharma@intuit.com>
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.
Fixes #270