[0.3] Add ownerRef to kubeconfig secret, fix NPE in MachineScope (#926)

* Add ownerRef to kubeconfig secret

Signed-off-by: Vince Prignano <[email protected]>

* Fix NPE in MachineClose.Close()

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

pkg/cloud/aws/actuators/cluster/actuator.go

@@ -123,6 +123,14 @@ func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 		kubeConfigSecret := &apiv1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: kubeConfigSecretName,
+				OwnerReferences: []metav1.OwnerReference{
+					{
+						APIVersion: cluster.APIVersion,
+						Kind:       cluster.Kind,
+						Name:       cluster.Name,
+						UID:        cluster.UID,
+					},
+				},
 			},
 			StringData: map[string]string{
 				"value": kubeConfig,

pkg/cloud/aws/actuators/machine_scope.go

@@ -127,7 +127,7 @@ func (m *MachineScope) Close() {
 		return
 	}
 
-	if m.Machine.Spec.ProviderID == nil || *m.Machine.Spec.ProviderID == "" {
+	if m.MachineStatus.InstanceID != nil && (m.Machine.Spec.ProviderID == nil || *m.Machine.Spec.ProviderID == "") {
 		providerID := fmt.Sprintf("aws:////%s", *m.MachineStatus.InstanceID)
 		m.Machine.Spec.ProviderID = &providerID
 	}