Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 1e3ff6d

Browse files
committed
fixup naming
1 parent f911529 commit 1e3ff6d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

internal/endpoint/k8s.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func parseURL(rawurl string) (*k8sURL, error) {
178178
case 2:
179179
svc, ns = parts[0], parts[1]
180180
default:
181-
return nil, errors.Errorf("invalid k8s url. expected k8s+http://service.Namespace:port/path?kind=$kind, got %s", rawurl)
181+
return nil, errors.Errorf("invalid k8s url. expected k8s+http://service.namespace:port/path?kind=$kind, got %s", rawurl)
182182
}
183183

184184
return &k8sURL{
@@ -193,17 +193,17 @@ func parseURL(rawurl string) (*k8sURL, error) {
193193
// this is done because the k8s client we previously used set the Namespace
194194
// when the client was created, the official k8s client does not
195195
func Namespace(logger log.Logger) string {
196-
logger = logger.Scoped("Namespace")
197-
const filename = "/var/run/secrets/kubernetes.io/serviceaccount/Namespace"
196+
logger = logger.Scoped("namespace")
197+
const filename = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
198198
data, err := os.ReadFile(filename)
199199
if err != nil {
200-
logger.Warn("falling back to kubernetes default Namespace", log.String("error", filename+" is empty"))
200+
logger.Warn("falling back to kubernetes default namespace", log.String("error", filename+" is empty"))
201201
return "default"
202202
}
203203

204204
ns := strings.TrimSpace(string(data))
205205
if ns == "" {
206-
logger.Warn("empty Namespace in file", log.String("filename", filename), log.String("namespaceInFile", ""), log.String("Namespace", "default"))
206+
logger.Warn("empty namespace in file", log.String("filename", filename), log.String("namespaceInFile", ""), log.String("namespace", "default"))
207207
return "default"
208208
}
209209
return ns

internal/endpoint/k8s_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func TestK8sURL(t *testing.T) {
9999
cases := map[string]string{
100100
"k8s+http://searcher:3181": "http://endpoint.service:3181",
101101
"k8s+http://searcher": "http://endpoint.service",
102-
"k8s+http://searcher.Namespace:123": "http://endpoint.service:123",
102+
"k8s+http://searcher.namespace:123": "http://endpoint.service:123",
103103
"k8s+rpc://indexed-search:6070": "endpoint.service:6070",
104104
}
105105
for rawurl, want := range cases {

0 commit comments

Comments
 (0)