Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add label-selector for watching namespace #715

Merged
merged 14 commits into from
Oct 28, 2021
Merged

feat: add label-selector for watching namespace #715

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dc257e0
feat: add label-selector for watching namespace
gxthrj Oct 17, 2021
d791683
add run invoke
gxthrj Oct 18, 2021
a7f5d4b
fix: linter
gxthrj Oct 18, 2021
c0b3abf
fix: use namespaceSelector instead of namespaceLabels
gxthrj Oct 18, 2021
5fafbea
fix: use sync.map for watchingNamespace
gxthrj Oct 18, 2021
3c87949
use namespace-selector in e2e
gxthrj Oct 18, 2021
6eecc0f
modify config-default.yaml description
gxthrj Oct 18, 2021
bb3df12
docs: add namespace_selector in docs
gxthrj Oct 18, 2021
8bb9de3
fix: remove comments
gxthrj Oct 20, 2021
18046e4
fix: review
gxthrj Oct 21, 2021
8f983c9
validate label with RFC
gxthrj Oct 26, 2021
f37bb34
use strings.join
gxthrj Oct 27, 2021
4c9ed5b
use linebreak instead of dot
gxthrj Oct 28, 2021
4808ad2
doc: remove app_namespace
gxthrj Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ const (
ApisixRouteV2beta2 = "apisix.apache.org/v2beta2"

_minimalResyncInterval = 30 * time.Second

LabelNameInvalidMsg = "a qualified name must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyName', or 'my.name', or '123-abc', regex used for validation is '([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]') with an optional DNS subdomain prefix and '/' (e.g. 'example.com/MyName')"
)

// Config contains all config items which are necessary for
Expand Down Expand Up @@ -228,10 +226,7 @@ func (cfg *Config) verifyNamespaceSelector() (bool, error) {
// ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
func (cfg *Config) validateLabelKey(key string) error {
errorMsg := validation.IsQualifiedName(key)
msg := ""
for _, err := range errorMsg {
msg = msg + err + " . "
}
msg := strings.Join(errorMsg, ".")
gxthrj marked this conversation as resolved.
Show resolved Hide resolved
if msg == "" {
return nil
}
Expand All @@ -242,10 +237,7 @@ func (cfg *Config) validateLabelKey(key string) error {
// ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
func (cfg *Config) validateLabelValue(value string) error {
errorMsg := validation.IsValidLabelValue(value)
msg := ""
for _, err := range errorMsg {
msg = msg + err + " . "
}
msg := strings.Join(errorMsg, ".")
if msg == "" {
return nil
}
Expand Down