Skip to content

Commit 143fd1f

Browse files
authored
Move constant to configuration (#17)
1 parent 5c8b824 commit 143fd1f

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

internal/configuration/settings.go

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
const (
2121
ConfigMapsNamespace = "nkl"
2222
ResyncPeriod = 0
23+
NklPrefix = ConfigMapsNamespace + "-"
2324
)
2425

2526
type WorkQueueSettings struct {

internal/translation/translator.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ package translation
66

77
import (
88
"fmt"
9+
"github.com/nginxinc/kubernetes-nginx-ingress/internal/configuration"
910
"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
1011
nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
1112
"github.com/sirupsen/logrus"
1213
v1 "k8s.io/api/core/v1"
1314
"strings"
1415
)
1516

16-
const NklPrefix = "nkl-"
17-
1817
func Translate(event *core.Event) (core.ServerUpdateEvents, error) {
1918
logrus.Debug("Translate::Translate")
2019

@@ -27,7 +26,7 @@ func filterPorts(ports []v1.ServicePort) []v1.ServicePort {
2726
var portsOfInterest []v1.ServicePort
2827

2928
for _, port := range ports {
30-
if strings.HasPrefix(port.Name, NklPrefix) {
29+
if strings.HasPrefix(port.Name, configuration.NklPrefix) {
3130
portsOfInterest = append(portsOfInterest, port)
3231
}
3332
}

internal/translation/translation_test.go renamed to internal/translation/translator_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package translation
66

77
import (
88
"fmt"
9+
"github.com/nginxinc/kubernetes-nginx-ingress/internal/configuration"
910
"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
1011
v1 "k8s.io/api/core/v1"
1112
"math/rand"
@@ -653,7 +654,7 @@ func generateUpdatablePorts(portCount int, updatableCount int) []v1.ServicePort
653654
nonupdatable := make([]string, portCount-updatableCount)
654655

655656
for i := range updatable {
656-
updatable[i] = NklPrefix
657+
updatable[i] = configuration.NklPrefix
657658
}
658659

659660
for j := range nonupdatable {

0 commit comments

Comments
 (0)