make controller logic independable with certain tidbcluster label #1419
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: Aylei <rayingecho@gmail.com>
aylei
commented
Dec 25, 2019
| @@ -403,3 +404,14 @@ func (tc *TidbCluster) Timezone() string { | |||
| } | |||
| return tz | |||
| } | |||
|
|
|||
| func (tc *TidbCluster) GetInstanceName() string { | |||
There was a problem hiding this comment.
Alternatively, we could define a GetLabels() method and shadow the one of ObjectMeta so that the controller logic don't have to be modified, but that way we have to copy a map every time this method get called.
|
/run-all-test |
1 similar comment
|
/run-all-test |
onlymellb
reviewed
Dec 25, 2019
| @@ -1088,7 +1088,7 @@ func TestGetPDConfigMap(t *testing.T) { | |||
| Labels: map[string]string{ | |||
| "app.kubernetes.io/name": "tidb-cluster", | |||
| "app.kubernetes.io/managed-by": "tidb-operator", | |||
| "app.kubernetes.io/instance": "", | |||
| "app.kubernetes.io/instance": "foo", | |||
There was a problem hiding this comment.
Use const vars in label package to replace these keys?
There was a problem hiding this comment.
I think both make sense, by not using the const var, the correctness of the labelKey itself is also tested, it just depends on the purpose of the UTs
onlymellb
reviewed
Dec 25, 2019
| @@ -676,7 +676,7 @@ func TestGetNewPumpConfigMap(t *testing.T) { | |||
| Labels: map[string]string{ | |||
| "app.kubernetes.io/name": "tidb-cluster", | |||
| "app.kubernetes.io/managed-by": "tidb-operator", | |||
| "app.kubernetes.io/instance": "", | |||
| "app.kubernetes.io/instance": "foo", | |||
weekface
approved these changes
Dec 26, 2019
|
/merge |
|
Your auto merge job has been accepted, waiting for 1417 |
|
/run-all-tests |
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: Aylei rayingecho@gmail.com
close #1418
Check List
Tests
Does this PR introduce a user-facing change?: