add defaults for CSI / CPI images

Signed-off-by: Andrew Sy Kim <kiman@vmware.com>

api/v1alpha2/cloudprovider/encoding_test.go

@@ -261,7 +261,7 @@ folder = kubernetes
 					Folder:     "kubernetes",
 				},
 				ProviderConfig: cloudprovider.ProviderConfig{
-					Cloud: cloudprovider.CloudConfig{
+					Cloud: &cloudprovider.CloudConfig{
 						ControllerImage: "test",
 					},
 				},

api/v1alpha2/cloudprovider/types.go

@@ -51,8 +51,8 @@ type Config struct {
 // ProviderConfig defines any extra information used to configure
 // the vSphere external cloud provider
 type ProviderConfig struct {
-	Cloud   CloudConfig   `json:"cloud,omitempty"`
-	Storage StorageConfig `json:"storage,omitempty"`
+	Cloud   *CloudConfig   `json:"cloud,omitempty"`
+	Storage *StorageConfig `json:"storage,omitempty"`
 }
 
 type CloudConfig struct {

controllers/vspherecluster_controller.go

@@ -265,11 +265,22 @@ func (r *VSphereClusterReconciler) reconcileAPIEndpoints(ctx *context.ClusterCon
 
 func (r *VSphereClusterReconciler) reconcileCloudProvider(ctx *context.ClusterContext) error {
 	// if the cloud provider image is not specified, then we do nothing
-	controllerImage := ctx.VSphereCluster.Spec.CloudProviderConfiguration.ProviderConfig.Cloud.ControllerImage
-	if controllerImage == "" {
+	cloudproviderConfig := ctx.VSphereCluster.Spec.CloudProviderConfiguration.ProviderConfig.Cloud
+	if cloudproviderConfig == nil {
+		ctx.Logger.V(2).Info(
+			"cloud provider config was not specified in VSphereCluster, skipping reconciliation of the cloud provider integration",
+		)
+
 		return nil
 	}
 
+	if cloudproviderConfig.ControllerImage == "" {
+		cloudproviderConfig.ControllerImage = cloudprovider.DefaultCPIControllerImage
+	}
+
+	ctx.VSphereCluster.Spec.CloudProviderConfiguration.ProviderConfig.Cloud = cloudproviderConfig
+	controllerImage := cloudproviderConfig.ControllerImage
+
 	targetClusterClient, err := infrautilv1.NewKubeClient(ctx, ctx.Client, ctx.Cluster)
 	if err != nil {
 		return errors.Wrapf(err,
@@ -321,6 +332,48 @@ func (r *VSphereClusterReconciler) reconcileCloudProvider(ctx *context.ClusterCo
 }
 
 func (r *VSphereClusterReconciler) reconcileStorageProvider(ctx *context.ClusterContext) error {
+	// if storage config is not defined, assume we don't want CSI installed
+	storageConfig := ctx.VSphereCluster.Spec.CloudProviderConfiguration.ProviderConfig.Storage
+	if storageConfig == nil {
+		ctx.Logger.V(2).Info(
+			"storage config was not specified in VSphereCluster, skipping reconciliation of the CSI driver",
+		)
+
+		return nil
+	}
+
+	// if at least 1 field in the storage config is defined, assume CNS should be installed
+	// and use default images when not defined
+	if storageConfig.ControllerImage == "" {
+		storageConfig.ControllerImage = cloudprovider.DefaultCSIControllerImage
+	}
+
+	if storageConfig.NodeDriverImage == "" {
+		storageConfig.NodeDriverImage = cloudprovider.DefaultCSINodeDriverImage
+	}
+
+	if storageConfig.AttacherImage == "" {
+		storageConfig.AttacherImage = cloudprovider.DefaultCSIAttacherImage
+	}
+
+	if storageConfig.ProvisionerImage == "" {
+		storageConfig.ProvisionerImage = cloudprovider.DefaultCSIProvisionerImage
+	}
+
+	if storageConfig.MetadataSyncerImage == "" {
+		storageConfig.MetadataSyncerImage = cloudprovider.DefaultCSIMetadataSyncerImage
+	}
+
+	if storageConfig.LivenessProbeImage == "" {
+		storageConfig.LivenessProbeImage = cloudprovider.DefaultCSILivenessProbeImage
+	}
+
+	if storageConfig.RegistrarImage == "" {
+		storageConfig.RegistrarImage = cloudprovider.DefaultCSIRegistrarImage
+	}
+
+	ctx.VSphereCluster.Spec.CloudProviderConfiguration.ProviderConfig.Storage = storageConfig
+
 	targetClusterClient, err := infrautilv1.NewKubeClient(ctx, ctx.Client, ctx.Cluster)
 	if err != nil {
 		return errors.Wrapf(err,

pkg/cloud/vsphere/services/cloudprovider/cloud-controller-manager.go

@@ -24,6 +24,10 @@ import (
 
 // NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager
 
+const (
+	DefaultCPIControllerImage = "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.0.0"
+)
+
 // CloudControllerManagerServiceAccount returns the ServiceAccount used for the cloud-controller-manager
 func CloudControllerManagerServiceAccount() *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{

pkg/cloud/vsphere/services/cloudprovider/csi.go

@@ -27,6 +27,16 @@ import (
 
 // NOTE: the contents of this file are derived from https://github.com/kubernetes-sigs/vsphere-csi-driver/tree/master/manifests/1.14
 
+const (
+	DefaultCSIControllerImage     = "vmware/vsphere-block-csi-driver:v1.0.0"
+	DefaultCSINodeDriverImage     = "vmware/vsphere-block-csi-driver:v1.0.0"
+	DefaultCSIAttacherImage       = "quay.io/k8scsi/csi-attacher:v1.1.1"
+	DefaultCSIProvisionerImage    = "quay.io/k8scsi/csi-provisioner:v1.2.1"
+	DefaultCSIMetadataSyncerImage = "vmware/volume-metadata-syncer:v1.0.0"
+	DefaultCSILivenessProbeImage  = "quay.io/k8scsi/livenessprobe:v1.1.0"
+	DefaultCSIRegistrarImage      = "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
+)
+
 func CSIControllerServiceAccount() *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
@@ -138,7 +148,7 @@ func CSIDriver() *storagev1beta1.CSIDriver {
 	}
 }
 
-func VSphereCSINodeDaemonSet(storageConfig cloudprovider.StorageConfig) *appsv1.DaemonSet {
+func VSphereCSINodeDaemonSet(storageConfig *cloudprovider.StorageConfig) *appsv1.DaemonSet {
 	return &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "vsphere-csi-node",
@@ -343,7 +353,7 @@ func LivenessProbeForNodeContainer(image string) corev1.Container {
 	}
 }
 
-func CSIControllerStatefulSet(storageConfig cloudprovider.StorageConfig) *appsv1.StatefulSet {
+func CSIControllerStatefulSet(storageConfig *cloudprovider.StorageConfig) *appsv1.StatefulSet {
 	return &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "vsphere-csi-controller",