Skip to content

[release-4.3] Bug 1802675: Consider mdns hostname file existence in utils.ShortHostname #45

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 4, 2020
Merged

[release-4.3] Bug 1802675: Consider mdns hostname file existence in utils.ShortHostname #45

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ import (
"net/http"
"os"
"strings"

"github.com/sirupsen/logrus"
)

var log = logrus.New()

func FletcherChecksum8(inp string) uint8 {
var ckA, ckB uint8
for i := 0; i < len(inp); i++ {
Expand All @@ -20,9 +24,29 @@ func FletcherChecksum8(inp string) uint8 {
}

func ShortHostname() (shortName string, err error) {
hostname, err := os.Hostname()
if err != nil {
panic(err)
var hostname string

if filePath, ok := os.LookupEnv("RUNTIMECFG_HOSTNAME_PATH"); ok {
dat, err := ioutil.ReadFile(filePath)
if err != nil {
log.WithFields(logrus.Fields{
"filePath": filePath,
}).Error("Failed to read file")
return "", err
}
hostname = strings.TrimSuffix(string(dat), "\n")
log.WithFields(logrus.Fields{
"hostname": hostname,
"file": filePath,
}).Debug("Hostname retrieved from a file")
} else {
hostname, err = os.Hostname()
if err != nil {
panic(err)
}
log.WithFields(logrus.Fields{
"hostname": hostname,
}).Debug("Hostname retrieved from OS")
}
splitHostname := strings.SplitN(hostname, ".", 2)
shortName = splitHostname[0]
Expand Down