homelab/traefik
1
0
Fork 0
Code Activity

Merge branch v2.3 into v2.4

Browse source
This commit is contained in:
romain 2021-01-11 16:25:07 +01:00
commit 92886c46ea
60 changed files with 129 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/provider/kubernetes/ingress/annotations.go
View file

@ -13,6 +13,8 @@ const (
annotationsPrefix = "traefik.ingress.kubernetes.io/"
)
var annotationsRegex = regexp.MustCompile(`(.+)\.(\w+)\.(\d+)\.(.+)`)
// RouterConfig is the router's root configuration from annotations.
type RouterConfig struct {
Router *RouterIng `json:"router,omitempty"`
@ -86,8 +88,6 @@ func convertAnnotations(annotations map[string]string) map[string]string {
return nil
}
exp := regexp.MustCompile(`(.+)\.(\w+)\.(\d+)\.(.+)`)
result := make(map[string]string)
for key, value := range annotations {
@ -97,8 +97,8 @@ func convertAnnotations(annotations map[string]string) map[string]string {
newKey := strings.ReplaceAll(key, "ingress.kubernetes.io/", "")
if exp.MatchString(newKey) {
newKey = exp.ReplaceAllString(newKey, "$1.$2[$3].$4")
if annotationsRegex.MatchString(newKey) {
newKey = annotationsRegex.ReplaceAllString(newKey, "$1.$2[$3].$4")
}
result[newKey] = value