Small tweaks after rebasing

Signed-off-by: Grant Linville <[email protected]>

pkg/controller/resolvedofferings/volumeclass.go

@@ -37,34 +37,33 @@ func resolveVolumeClasses(ctx context.Context, c kclient.Client, app *v1.AppInst
 	})
 
 	for name, vol := range app.Status.AppSpec.Volumes {
+		if _, alreadySet := app.Status.ResolvedOfferings.Volumes[name]; alreadySet {
+			continue
+		}
+
 		resolvedVolume := app.Status.ResolvedOfferings.Volumes[name]
 		vol = volume.ResolveVolumeRequest(vol, volumeBindings[name], resolvedVolume)
 
-		// If the Volume is already resolved, skip these steps. We don't want to overwrite
-		// the resolved class or access modes for volumes as it can lead to unexpected behavior when
-		// volume classes are updated.
-		if _, alreadySet := app.Status.ResolvedOfferings.Volumes[name]; !alreadySet {
-			resolvedVolume.Class = vol.Class
-			if vol.Class == "" && defaultVolumeClass != nil {
-				resolvedVolume.Class = defaultVolumeClass.Name
-				vol.Class = defaultVolumeClass.Name
-			}
+		resolvedVolume.Class = vol.Class
+		if vol.Class == "" && defaultVolumeClass != nil {
+			resolvedVolume.Class = defaultVolumeClass.Name
+			vol.Class = defaultVolumeClass.Name
+		}
 
-			resolvedVolume.AccessModes = vol.AccessModes
-			if len(vol.AccessModes) == 0 {
-				resolvedVolume.AccessModes = volumeClasses[vol.Class].AllowedAccessModes
-			}
+		resolvedVolume.AccessModes = vol.AccessModes
+		if len(vol.AccessModes) == 0 {
+			resolvedVolume.AccessModes = volumeClasses[vol.Class].AllowedAccessModes
+		}
 
-			resolvedVolume.Size = vol.Size
-			if vol.Size == "" {
-				resolvedVolume.Size = volumeClasses[vol.Class].Size.Default
-				if resolvedVolume.Size == "" {
-					defaultSize, err := getDefaultVolumeSize(ctx, c)
-					if err != nil {
-						return err
-					}
-					resolvedVolume.Size = defaultSize
+		resolvedVolume.Size = vol.Size
+		if vol.Size == "" {
+			resolvedVolume.Size = volumeClasses[vol.Class].Size.Default
+			if resolvedVolume.Size == "" {
+				defaultSize, err := getDefaultVolumeSize(ctx, c)
+				if err != nil {
+					return err
 				}
+				resolvedVolume.Size = defaultSize
 			}
 		}