Skip to content

K
k3s
Commit 1f2185fb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #49743 from euank/hostname

Automatic merge from submit-queue (batch tested with PRs 49847, 49743, 49853, 50225, 50479) cloudprovider/photon: remove unneeded bash exec **Release note**: ```release-note NONE ```
parents 2d4c609a a5d01a35
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
pkg/cloudprovider/providers/photon/photon.go
View file @ 1f2185fb
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
"log" "log"
"net" "net"
"os" "os"
"os/exec"
"strings" "strings"
"github.com/golang/glog" "github.com/golang/glog"
...@@ -268,18 +267,11 @@ func newPCCloud(cfg PCConfig) (*PCCloud, error) { ...@@ -268,18 +267,11 @@ func newPCCloud(cfg PCConfig) (*PCCloud, error) {
vmID := cfg.Global.VMID vmID := cfg.Global.VMID
// Get local hostname // Get local hostname
cmd := exec.Command("bash", "-c", `echo $HOSTNAME`) hostname, err := os.Hostname()
out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
glog.Errorf("Photon Cloud Provider: get local hostname bash command failed. Error[%v]", err) glog.Errorf("Photon Cloud Provider: get hostname failed. Error[%v]", err)
return nil, err return nil, err
} }
if len(out) == 0 {
glog.Errorf("unable to retrieve hostname for Instance ID")
return nil, fmt.Errorf("unable to retrieve hostname for Instance ID")
}
hostname := strings.TrimRight(string(out), "\n")
pc := PCCloud{ pc := PCCloud{
cfg: &cfg, cfg: &cfg,
localInstanceID: vmID, localInstanceID: vmID,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment