github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

gofmt rkt.go, rkt_test.go

Browse Source
This commit is contained in:
JulienBalestra 2017-02-21 23:06:13 +01:00
parent 89e1382dd9
commit 7de2d51f90
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/rkt/rkt.go
View File

@ -1111,10 +1111,10 @@ func (r *Runtime) getSelinuxContext(opt *v1.SELinuxOptions) (string, error) {
// From the generateName or the podName return a basename for improving the logging with the Journal // From the generateName or the podName return a basename for improving the logging with the Journal
// journalctl -t podBaseName // journalctl -t podBaseName
func constructSyslogIdentifier(generateName string, podName string) string { func constructSyslogIdentifier(generateName string, podName string) string {
if (len(generateName) > 1 && generateName[len(generateName) - 1] == '-') { if len(generateName) > 1 && generateName[len(generateName)-1] == '-' {
return generateName[0:len(generateName) - 1] return generateName[0 : len(generateName)-1]
} }
if (len(generateName) > 0) { if len(generateName) > 0 {
return generateName return generateName
} }
return podName return podName

8
pkg/kubelet/rkt/rkt_test.go
View File

@ -1955,9 +1955,9 @@ func TestPreparePodArgs(t *testing.T) {
func TestConstructSyslogIdentifier(t *testing.T) { func TestConstructSyslogIdentifier(t *testing.T) {
testCases := []struct { testCases := []struct {
podName string podName string
podGenerateName string podGenerateName string
identifier string identifier string
}{ }{
{ {
"prometheus-node-exporter-rv90m", "prometheus-node-exporter-rv90m",
@ -1979,4 +1979,4 @@ func TestConstructSyslogIdentifier(t *testing.T) {
identifier := constructSyslogIdentifier(testCase.podGenerateName, testCase.podName) identifier := constructSyslogIdentifier(testCase.podGenerateName, testCase.podName)
assert.Equal(t, testCase.identifier, identifier, fmt.Sprintf("Test case #%d", i)) assert.Equal(t, testCase.identifier, identifier, fmt.Sprintf("Test case #%d", i))
} }
} }