Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#406 from ykakarap/default-vmfolder…
Browse files Browse the repository at this point in the history 
…-fix

default vmfolder set for cloudconfig
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Jul 8, 2019
2 parents 9656165 + 33826c0 commit 8561694
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 30 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.3 // indirect
github.com/spf13/cobra v0.0.4 // indirect
github.com/vmware/govmomi v0.20.1
github.com/vmware/govmomi v0.20.2
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/vmware/govmomi v0.20.1 h1:7b/SeTUB3tER8ZLGLLLH3xcnB2xeuLULXmfPFqPSRZA=
github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
github.com/vmware/govmomi v0.20.2 h1:i6BkIBpvPuLiNm9kJdS/jl6BymRrQnipjUkYqh3Aqng=
github.com/vmware/govmomi v0.20.2/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk=
Expand Down
10 changes: 9 additions & 1 deletion pkg/cloud/vsphere/services/govmomi/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,21 @@ func generateUserData(ctx *context.MachineContext, bootstrapToken string) ([]byt

// apply values based on the role of the machine
if ctx.HasControlPlaneRole() {

// Cloud init needs the a valid vmfolder in cloudconfig
// Check the vmfolder and replace with default if not present
folder, err := ctx.Session.Finder.FolderOrDefault(ctx, ctx.MachineConfig.Folder)
if err != nil {
return nil, errors.Wrapf(err, "unable to get folder for %q", ctx)
}

cloudConfig, err := userdata.NewCloudConfig(&userdata.CloudConfigInput{
SecretName: constants.CloudProviderSecretName,
SecretNamespace: constants.CloudProviderSecretNamespace,
Server: ctx.ClusterConfig.Server,
Datacenter: ctx.MachineConfig.Datacenter,
ResourcePool: ctx.MachineConfig.ResourcePool,
Folder: ctx.MachineConfig.Folder,
Folder: folder.Name(),
Datastore: ctx.MachineConfig.Datastore,
// assume the first VM network found for the vSphere cloud provider
Network: ctx.MachineConfig.Network.Devices[0].NetworkName,
Expand Down
42 changes: 21 additions & 21 deletions vendor/github.com/spf13/afero/.travis.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/vmware/govmomi/find/finder.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ github.com/spf13/afero/mem
github.com/spf13/cobra
# github.com/spf13/pflag v1.0.3
github.com/spf13/pflag
# github.com/vmware/govmomi v0.20.1
# github.com/vmware/govmomi v0.20.2
github.com/vmware/govmomi
github.com/vmware/govmomi/find
github.com/vmware/govmomi/object
Expand Down Expand Up @@ -374,9 +374,9 @@ k8s.io/apimachinery/pkg/runtime
k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/runtime/schema
k8s.io/apimachinery/pkg/util/json
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/labels
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/runtime/serializer
k8s.io/apimachinery/pkg/util/wait
k8s.io/apimachinery/pkg/fields
Expand All @@ -394,8 +394,8 @@ k8s.io/apimachinery/pkg/selection
k8s.io/apimachinery/pkg/util/intstr
k8s.io/apimachinery/pkg/apis/meta/v1/validation
k8s.io/apimachinery/pkg/util/validation/field
k8s.io/apimachinery/pkg/util/validation
k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
k8s.io/apimachinery/pkg/util/validation
k8s.io/apimachinery/pkg/util/yaml
k8s.io/apimachinery/pkg/runtime/serializer/json
k8s.io/apimachinery/pkg/runtime/serializer/protobuf
Expand Down Expand Up @@ -428,12 +428,12 @@ k8s.io/client-go/discovery
k8s.io/client-go/util/flowcontrol
k8s.io/client-go/tools/leaderelection
k8s.io/client-go/tools/leaderelection/resourcelock
k8s.io/client-go/dynamic
k8s.io/client-go/tools/auth
k8s.io/client-go/tools/clientcmd/api/latest
k8s.io/client-go/util/homedir
k8s.io/client-go/kubernetes
k8s.io/client-go/plugin/pkg/client/auth
k8s.io/client-go/dynamic
k8s.io/client-go/pkg/version
k8s.io/client-go/plugin/pkg/client/auth/exec
k8s.io/client-go/rest/watch
Expand Down Expand Up @@ -557,8 +557,8 @@ sigs.k8s.io/controller-runtime/pkg/client/config
sigs.k8s.io/controller-runtime/pkg/manager
sigs.k8s.io/controller-runtime/pkg/runtime/signals
sigs.k8s.io/controller-runtime/pkg/runtime/scheme
sigs.k8s.io/controller-runtime/pkg/patch
sigs.k8s.io/controller-runtime/pkg/client
sigs.k8s.io/controller-runtime/pkg/patch
sigs.k8s.io/controller-runtime/pkg/controller
sigs.k8s.io/controller-runtime/pkg/handler
sigs.k8s.io/controller-runtime/pkg/reconcile
Expand Down

0 comments on commit 8561694

Please sign in to comment.