PWX-32567: merge into 23.7.0 (#1177)

* PWX-32567: pre-flight pods do not run on master so don't create pre-f… (#1170)

* PWX-32567: pre-flight pods do not run on master so don't create pre-flight storage node entry for master.

Signed-off-by: Jose Rivera <jose@portworx.com>

* PWX-32567: Add additional logging to update storage cluster error for debugging.

Signed-off-by: Jose Rivera <jose@portworx.com>

* PWX-32539: When preflight enables PX-storeV2 for vsphere.  It should … (#1167)

* PWX-32539: When preflight enables PX-storeV2 for vsphere.  It should add a default 'type=eagerzeroedthick,size=64' SystemMdDeviceSpec if none is provided.

Signed-off-by: Jose Rivera <jose@portworx.com>

* PWX-32539: Change name of default metadata drive const for AWS.

Signed-off-by: Jose Rivera <jose@portworx.com>

---------

Signed-off-by: Jose Rivera <jose@portworx.com>

---------

Signed-off-by: Jose Rivera <jose@portworx.com>
Co-authored-by: Naveen Revanna <83608369+nrevanna@users.noreply.github.com>

* fix merge conflict.

---------

Signed-off-by: Jose Rivera <jose@portworx.com>
Co-authored-by: Naveen Revanna <83608369+nrevanna@users.noreply.github.com>

pkg/controller/storagecluster/storagecluster.go

@@ -64,6 +64,7 @@ import (
 	preflight "github.com/libopenstorage/operator/pkg/preflight"
 	"github.com/libopenstorage/operator/pkg/util"
 	"github.com/libopenstorage/operator/pkg/util/k8s"
+	coreops "github.com/portworx/sched-ops/k8s/core"
 )
 
 const (
@@ -438,8 +439,10 @@ func (c *Controller) runPreflightCheck(cluster *corev1.StorageCluster) error {
 		err = c.client.List(context.TODO(), k8sNodeList)
 		if err == nil {
 			for _, node := range k8sNodeList.Items {
-				logrus.Infof("Create pre-flight storage node entry for node: %s", node.Name)
-				c.createStorageNode(cluster, node.Name)
+				if !coreops.Instance().IsNodeMaster(node) {
+					logrus.Infof("Create pre-flight storage node entry for node: %s", node.Name)
+					c.createStorageNode(cluster, node.Name)
+				}
 			}
 		} else {
 			logrus.WithError(err).Errorf("Failed to get cluster nodes")
@@ -490,12 +493,12 @@ func (c *Controller) runPreflightCheck(cluster *corev1.StorageCluster) error {
 	if !reflect.DeepEqual(cluster, toUpdate) {
 		toUpdate.DeepCopyInto(cluster)
 		if err := c.client.Update(context.TODO(), cluster); err != nil {
-			return err
+			return fmt.Errorf("update storage cluster failure, %v", err)
 		}
 
 		cluster.Status = *toUpdate.Status.DeepCopy()
 		if err := c.client.Status().Update(context.TODO(), cluster); err != nil {
-			return err
+			return fmt.Errorf("update storage cluster status failure, %v", err)
 		}
 	}
 	return err