*: adapt needs for operator support #76
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
This was referenced Sep 8, 2022
Signed-off-by: xhe <xw897002528@gmail.com>
Signed-off-by: xhe <xw897002528@gmail.com>
djshow832
reviewed
Sep 8, 2022
lib/config/file.go
Outdated
| @@ -42,13 +42,13 @@ func NewNamespacesFromDir(nsdir string) (*NamespaceDir, error) { | |||
| nspath: make(map[string]string), | |||
| } | |||
|
|
|||
| yamlFiles, err := listAllYamlFiles(c.dir) | |||
| nFiles, err := listAllFiles(c.dir, ".toml") | |||
There was a problem hiding this comment.
Why change to toml files this time? Is it required by the operator?
There was a problem hiding this comment.
Kind of. Operator has built-in support for json and toml but not yaml. Weird enough that TiDB actually uses toml config file.... So config operator be like type no-lint/no-highlight toml in yaml files.
Anyway, dynamic namespace will not be done by using configuration file(can not restart the proxy). Also this is duplicated with weirctl.
It is not used at all, I removed this.
| sigs.k8s.io/yaml v1.2.0 // indirect | ||
| ) | ||
|
|
||
| replace github.com/pingcap/TiProxy/lib => ./lib |
There was a problem hiding this comment.
Same reason as parser as sub module of tidb. Can not test without pushing lib first. Golang reall sucks at multimodule and github workflow.
Signed-off-by: xhe <xw897002528@gmail.com>
Signed-off-by: xhe <xw897002528@gmail.com>
djshow832
approved these changes
Sep 9, 2022
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: xhe xw897002528@gmail.com
What problem does this PR solve?
Issue Number: ref #69
Problem Summary: A big PR including changes needed to adapt tidb-operator
What is changed and how it works:
go.modpkginto/lib. Otherwise tidb-operator is not able to importweirctldue to the complex dependency conflicts.server.Runreturns no error--pub_addrforweirproxyto expose the correct advertise address in k8s, simplifyxxx-urlsconfig, tooweirproxy, see Support tidb-operator and dev tier #69pingcap/loginutil/securityCheck List
Tests
Tested with k8s
Notable changes
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.