Fix VSphereCluster VCenterAvailable condition

We now check the connectivity regardless of whether
CloudProviderConfiguration is set on the spec.

That property has been deprecated and it is valuable to check this
connectivity early and surface this on the VSphereCluster status rather
than just on VSphereVMs.

This also fixes a bug where the status could be set to "False" if the
secret was not found and then never properly set to "True" once the secret
becomes present.

#1209

Co-authored-by: David McClure <[email protected]>
Co-authored-by: Guangyuan Wang <[email protected]>
Co-authored-by: Tyler Schultz <[email protected]>

Author: 3 people

controllers/vspherecluster_controller_test.go

@@ -24,6 +24,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/vmware/govmomi/simulator"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -37,6 +38,8 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context/fake"
+	"sigs.k8s.io/cluster-api-provider-vsphere/pkg/identity"
+	"sigs.k8s.io/cluster-api-provider-vsphere/test/helpers"
 )
 
 const (
@@ -49,12 +52,21 @@ var _ = Describe("ClusterReconciler", func() {
 
 	Context("Reconcile an VSphereCluster", func() {
 		It("should create a cluster", func() {
+			fakeVCenter := startVcenter()
+			vcURL := fakeVCenter.ServerURL()
+			defer fakeVCenter.Destroy()
+
 			// Create the secret containing the credentials
+			password, _ := vcURL.User.Password()
 			secret := &corev1.Secret{
 				ObjectMeta: metav1.ObjectMeta{
 					GenerateName: "secret-",
 					Namespace:    "default",
 				},
+				Data: map[string][]byte{
+					identity.UsernameKey: []byte(vcURL.User.Username()),
+					identity.PasswordKey: []byte(password),
+				},
 			}
 			Expect(testEnv.Create(ctx, secret)).To(Succeed())
 
@@ -69,6 +81,7 @@ var _ = Describe("ClusterReconciler", func() {
 						Kind: infrav1.SecretKind,
 						Name: secret.Name,
 					},
+					Server: fmt.Sprintf("%s://%s", vcURL.Scheme, vcURL.Host),
 				},
 			}
 			Expect(testEnv.Create(ctx, instance)).To(Succeed())
@@ -129,6 +142,14 @@ var _ = Describe("ClusterReconciler", func() {
 				}
 				return len(secret.OwnerReferences) > 0
 			}, timeout).Should(BeTrue())
+
+			By("setting the VSphereCluster's VCenterAvailableCondition to true")
+			Eventually(func() bool {
+				if err := testEnv.Get(ctx, key, instance); err != nil {
+					return false
+				}
+				return conditions.IsTrue(instance, infrav1.VCenterAvailableCondition)
+			}, timeout).Should(BeTrue())
 		})
 
 		It("should error if secret is already owned by a different cluster", func() {
@@ -453,3 +474,15 @@ func deploymentZone(server, fdName string, cp, ready *bool) *infrav1.VSphereDepl
 		Status: infrav1.VSphereDeploymentZoneStatus{Ready: ready},
 	}
 }
+
+func startVcenter() *helpers.Simulator {
+	model := simulator.VPX()
+	model.Pool = 1
+
+	simr, err := helpers.VCSimBuilder().WithModel(model).Build()
+	if err != nil {
+		panic(fmt.Sprintf("unable to create simulator %s", err))
+	}
+
+	return simr
+}