Merge branch 'master' into bump-v1.8.0

pkg/cluster/cluster.go

@@ -149,7 +149,6 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec acidv1.Postgres
 	cluster.EBSVolumes = make(map[string]volumes.VolumeProperties)
 	if cfg.OpConfig.StorageResizeMode != "pvc" || cfg.OpConfig.EnableEBSGp3Migration {
 		cluster.VolumeResizer = &volumes.EBSVolumeResizer{AWSRegion: cfg.OpConfig.AWSRegion}
-
 	}
 
 	return cluster

pkg/cluster/sync.go

@@ -69,7 +69,7 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
 		return err
 	}
 
-	if c.OpConfig.EnableEBSGp3Migration {
+	if c.OpConfig.EnableEBSGp3Migration && len(c.EBSVolumes) > 0 {
 		err = c.executeEBSMigration()
 		if nil != err {
 			return err

pkg/cluster/volumes.go

@@ -137,7 +137,6 @@ func (c *Cluster) syncUnderlyingEBSVolume() error {
 		for _, s := range errors {
 			c.logger.Warningf(s)
 		}
-		// c.logger.Errorf("failed to modify %d of %d volumes", len(c.EBSVolumes), len(errors))
 	}
 	return nil
 }
@@ -149,7 +148,11 @@ func (c *Cluster) populateVolumeMetaData() error {
 	if err != nil {
 		return fmt.Errorf("could not list persistent volumes: %v", err)
 	}
-	c.logger.Debugf("found %d volumes, size of known volumes %d", len(pvs), len(c.EBSVolumes))
+	if len(pvs) == 0 {
+		c.EBSVolumes = make(map[string]volumes.VolumeProperties)
+		return fmt.Errorf("no persistent volumes found")
+	}
+	c.logger.Debugf("found %d persistent volumes, size of known volumes %d", len(pvs), len(c.EBSVolumes))
 
 	volumeIds := []string{}
 	var volumeID string
@@ -167,7 +170,7 @@ func (c *Cluster) populateVolumeMetaData() error {
 		return err
 	}
 
-	if len(currentVolumes) != len(c.EBSVolumes) {
+	if len(currentVolumes) != len(c.EBSVolumes) && len(c.EBSVolumes) > 0 {
 		c.logger.Debugf("number of ebs volumes (%d) discovered differs from already known volumes (%d)", len(currentVolumes), len(c.EBSVolumes))
 	}
 
@@ -205,7 +208,7 @@ func (c *Cluster) syncVolumeClaims() error {
 
 // syncVolumes reads all persistent volumes and checks that their size matches the one declared in the statefulset.
 func (c *Cluster) syncEbsVolumes() error {
-	c.setProcessName("syncing EBS and Claims volumes")
+	c.setProcessName("syncing EBS volumes")
 
 	act, err := c.volumesNeedResizing()
 	if err != nil {
@@ -451,29 +454,17 @@ func quantityToGigabyte(q resource.Quantity) int64 {
 }
 
 func (c *Cluster) executeEBSMigration() error {
-	if !c.OpConfig.EnableEBSGp3Migration {
-		return nil
-	}
-	c.logger.Infof("starting EBS gp2 to gp3 migration")
-
 	pvs, err := c.listPersistentVolumes()
 	if err != nil {
 		return fmt.Errorf("could not list persistent volumes: %v", err)
 	}
+	if len(pvs) == 0 {
+		c.logger.Warningf("no persistent volumes found - skipping EBS migration")
+		return nil
+	}
 	c.logger.Debugf("found %d volumes, size of known volumes %d", len(pvs), len(c.EBSVolumes))
 
-	volumeIds := []string{}
+	if len(pvs) == len(c.EBSVolumes) {
-	var volumeID string
-	for _, pv := range pvs {
-		volumeID, err = c.VolumeResizer.ExtractVolumeID(pv.Spec.AWSElasticBlockStore.VolumeID)
-		if err != nil {
-			continue
-		}
-
-		volumeIds = append(volumeIds, volumeID)
-	}
-
-	if len(volumeIds) == len(c.EBSVolumes) {
 		hasGp2 := false
 		for _, v := range c.EBSVolumes {
 			if v.VolumeType == "gp2" {
@@ -487,15 +478,10 @@ func (c *Cluster) executeEBSMigration() error {
 		}
 	}
 
-	awsVolumes, err := c.VolumeResizer.DescribeVolumes(volumeIds)
-	if nil != err {
-		return err
-	}
-
 	var i3000 int64 = 3000
 	var i125 int64 = 125
 
-	for _, volume := range awsVolumes {
+	for _, volume := range c.EBSVolumes {
 		if volume.VolumeType == "gp2" && volume.Size < c.OpConfig.EnableEBSGp3MigrationMaxSize {
 			c.logger.Infof("modifying EBS volume %s to type gp3 migration (%d)", volume.VolumeID, volume.Size)
 			err = c.VolumeResizer.ModifyVolume(volume.VolumeID, aws.String("gp3"), &volume.Size, &i3000, &i125)

pkg/cluster/volumes_test.go

@@ -224,7 +224,10 @@ func TestMigrateEBS(t *testing.T) {
 	resizer.EXPECT().ModifyVolume(gomock.Eq("ebs-volume-1"), gomock.Eq(aws.String("gp3")), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 
 	cluster.VolumeResizer = resizer
-	cluster.executeEBSMigration()
+	err := cluster.populateVolumeMetaData()
+	assert.NoError(t, err)
+	err = cluster.executeEBSMigration()
+	assert.NoError(t, err)
 }
 
 func initTestVolumesAndPods(client k8sutil.KubernetesClient, namespace, clustername string, labels labels.Set, volumes []testVolume) {