Skip to content

Commit 34eb13d

Browse files
committed
if network not defined, use default network
1 parent e36cb28 commit 34eb13d

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

cmd/vsphere-priv-check/vsphere-priv-check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func runRootCmd(cmd *cobra.Command, args []string) {
5353
}
5454

5555
func main() {
56-
fmt.Printf("OpenShift vSphere Pre-Flight Permissions Validator v1.1\n\n")
56+
fmt.Printf("OpenShift vSphere Pre-Flight Permissions Validator v1.2\n\n")
5757
rootCmd := newRootCmd()
5858
rootCmd.Execute()
5959
}

pkg/util/privileges.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/vmware/govmomi/find"
1010
"github.com/vmware/govmomi/object"
1111
"github.com/vmware/govmomi/vim25/types"
12+
"log"
1213
"strings"
1314
)
1415

@@ -121,10 +122,22 @@ func ValidatePrivileges(ssn *Session, p *pctypes.Platform, folder string) error
121122
}
122123

123124
if val, ok := permissions.RequiredPermissions["Port group"]; ok {
124-
network, err := finder.Network(ctx, p.Network)
125-
if err != nil {
126-
return err
125+
var network object.NetworkReference
126+
if p.Network == "" {
127+
log.Println("'network' not defined in install-config.yaml. attempting to use default network.")
128+
_network, err := finder.DefaultNetwork(ctx)
129+
if err != nil {
130+
return err
131+
}
132+
network = _network
133+
} else {
134+
_network, err := finder.Network(ctx, p.Network)
135+
if err != nil {
136+
return err
137+
}
138+
network = _network
127139
}
140+
128141
res, err := authManager.FetchUserPrivilegeOnEntities(ctx, []types.ManagedObjectReference{network.Reference()}, p.Username)
129142
if err != nil {
130143
return err

0 commit comments

Comments
 (0)