Fix conflict schema url when initializing resources #5140
Merged
Conversation
This file contains hidden or 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: Ben Ye <[email protected]>
harry671003
approved these changes
Feb 10, 2023
alanprot
approved these changes
Feb 10, 2023
alexqyle
pushed a commit
to alexqyle/cortex
that referenced
this pull request
May 2, 2023
Signed-off-by: Ben Ye <[email protected]> Signed-off-by: Alex Le <[email protected]>
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.
Signed-off-by: Ben Ye [email protected]
What this PR does:
We are merging 2 resources in
newResourcewhen initializing. However, one resource is using the schema URL for v1.12.0 while another one is using the schema URL for v1.17.0.In order to fix this, I removed merging two resources, instead just statically set the service name attribute.
Which issue(s) this PR fixes:
#5139
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]