Merge pull request #937 from yastij/automated-cherry-pick-of-#925-upstream-release-0.6

Automated cherry pick of #925: Use DataSecretName to get Bootstrap data

Author: k8s-ci-robot

controllers/vspheremachine_controller.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -388,7 +389,13 @@ func (r machineReconciler) reconcileNormalPre7(ctx *context.MachineContext, vsph
 			}))
 
 		// Instruct the VSphereVM to use the CAPI bootstrap data resource.
-		vm.Spec.BootstrapRef = ctx.Machine.Spec.Bootstrap.ConfigRef
+		// TODO: BootstrapRef field should be replaced with BootstrapSecret of type string
+		vm.Spec.BootstrapRef = &corev1.ObjectReference{
+			APIVersion: "v1",
+			Kind:       "Secret",
+			Name:       *ctx.Machine.Spec.Bootstrap.DataSecretName,
+			Namespace:  ctx.Machine.ObjectMeta.Namespace,
+		}
 
 		// Initialize the VSphereVM's labels map if it is nil.
 		if vm.Labels == nil {