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

Use ServiceAliasConfigKeys for dynamic config #108

Merged
merged 1 commit into from Jul 28, 2020
Merged

Use ServiceAliasConfigKeys for dynamic config #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/router/template/configmanager/haproxy/blueprint_plugin_test.go
View file
Open in desktop
Expand Up @@ -63,15 +63,15 @@ func (cm *fakeConfigManager) RemoveRouteEndpoints(id templaterouter.ServiceAlias
func (cm *fakeConfigManager) Notify(event templaterouter.RouterEventType) {
}

func (cm *fakeConfigManager) ServerTemplateName(id string) string {
func (cm *fakeConfigManager) ServerTemplateName(id templaterouter.ServiceAliasConfigKey) string {
return "fakeConfigManager"
}

func (cm *fakeConfigManager) ServerTemplateSize(id string) string {
func (cm *fakeConfigManager) ServerTemplateSize(id templaterouter.ServiceAliasConfigKey) string {
return "1"
}

func (cm *fakeConfigManager) GenerateDynamicServerNames(id string) []string {
func (cm *fakeConfigManager) GenerateDynamicServerNames(id templaterouter.ServiceAliasConfigKey) []string {
return []string{}
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/router/template/configmanager/haproxy/manager.go
View file
Open in desktop
Expand Up @@ -635,7 +635,7 @@ func (cm *haproxyConfigManager) Commit() {
}

// ServerTemplateName returns the dynamic server template name.
func (cm *haproxyConfigManager) ServerTemplateName(id string) string {
func (cm *haproxyConfigManager) ServerTemplateName(id templaterouter.ServiceAliasConfigKey) string {
if cm.maxDynamicServers > 0 {
// Adding the id makes the name unwieldy - use pod.
return fmt.Sprintf("%s-pod", dynamicServerPrefix)
Expand All @@ -646,7 +646,7 @@ func (cm *haproxyConfigManager) ServerTemplateName(id string) string {

// ServerTemplateSize returns the dynamic server template size.
// Note this is returned as a string for easier use in the haproxy template.
func (cm *haproxyConfigManager) ServerTemplateSize(id string) string {
func (cm *haproxyConfigManager) ServerTemplateSize(id templaterouter.ServiceAliasConfigKey) string {
if cm.maxDynamicServers < 1 {
return ""
}
Expand All @@ -655,7 +655,7 @@ func (cm *haproxyConfigManager) ServerTemplateSize(id string) string {
}

// GenerateDynamicServerNames generates the dynamic server names.
func (cm *haproxyConfigManager) GenerateDynamicServerNames(id string) []string {
func (cm *haproxyConfigManager) GenerateDynamicServerNames(id templaterouter.ServiceAliasConfigKey) []string {
if cm.maxDynamicServers > 0 {
if prefix := cm.ServerTemplateName(id); len(prefix) > 0 {
names := make([]string, cm.maxDynamicServers)
Expand Down
6 changes: 3 additions & 3 deletions pkg/router/template/types.go
View file
Open in desktop
Expand Up @@ -216,13 +216,13 @@ type ConfigManager interface {
Notify(event RouterEventType)

// ServerTemplateName returns the dynamic server template name.
ServerTemplateName(id string) string
ServerTemplateName(id ServiceAliasConfigKey) string

// ServerTemplateSize returns the dynamic server template size.
ServerTemplateSize(id string) string
ServerTemplateSize(id ServiceAliasConfigKey) string

// GenerateDynamicServerNames generates the dynamic server names.
GenerateDynamicServerNames(id string) []string
GenerateDynamicServerNames(id ServiceAliasConfigKey) []string
}

// RouterEventType indicates the type of event fired by the router.
Expand Down