Volume minimum size fixes / improvements

frontend/src/components/ShootWorkers/GVolumeSizeInput.vue

@@ -35,7 +35,7 @@ SPDX-License-Identifier: Apache-2.0
 </template>
 
 <script>
-import { parseSize } from '@/utils'
+import { convertToGi } from '@/utils'
 
 export default {
   props: {
@@ -75,7 +75,7 @@ export default {
     innerValue: {
       get () {
         if (this.modelValue) {
-          return parseSize(this.modelValue)
+          return convertToGi(this.modelValue)
         }
         return undefined
       },

frontend/src/components/ShootWorkers/GWorkerInputGeneric.vue

@@ -178,7 +178,7 @@ import {
 } from '@/utils/validators'
 import {
   getErrorMessages,
-  parseSize,
+  convertToGi,
 } from '@/utils'
 
 import {
@@ -297,14 +297,14 @@ export default {
     })
 
     const volumeSizeRules = {
-      minVolumeSize: withMessage(`Minimum size is ${this.minimumVolumeSize}`, value => {
+      minVolumeSize: withMessage(() => `Minimum size is ${this.minimumVolumeSize}`, value => {
         if (!this.hasVolumeSize) {
           return true
         }
         if (!value) {
           return false
         }
-        return this.minimumVolumeSize <= parseSize(value)
+        return this.minimumVolumeSize <= convertToGi(value)
       }),
     }
     rules.volumeSize = withFieldName(() => `${this.workerGroupName} Volume Size`, volumeSizeRules)
@@ -342,11 +342,11 @@ export default {
       return filter(machineImages, ({ isExpired, architectures }) => !isExpired && includes(architectures, this.machineArchitecture))
     },
     minimumVolumeSize () {
-      const minimumVolumeSize = parseSize(this.minimumVolumeSizeByMachineTypeAndVolumeType({
+      const minimumVolumeSize = convertToGi(this.minimumVolumeSizeByMachineTypeAndVolumeType({
         machineType: this.selectedMachineType,
         volumeType: this.selectedVolumeType,
       }))
-      const defaultSize = parseSize(get(this.selectedMachineType, 'storage.size'))
+      const defaultSize = convertToGi(get(this.selectedMachineType, 'storage.size'))
       if (defaultSize > 0 && defaultSize < minimumVolumeSize) {
         return defaultSize
       }

frontend/src/store/cloudProfile/index.js

@@ -19,7 +19,7 @@ import { useApi } from '@/composables/useApi'
 
 import {
   shortRandomString,
-  parseSize,
+  convertToGi,
   defaultCriNameByKubernetesVersion,
   isValidTerminationDate,
   machineImageHasUpdate,
@@ -632,7 +632,7 @@ export const useCloudProfileStore = defineStore('cloudProfile', () => {
     const machineImage = defaultMachineImageForCloudProfileNameAndMachineType(cloudProfileName, machineType)
     const minVolumeSize = minimumVolumeSizeByMachineTypeAndVolumeType({ machineType, volumeType })
 
-    const defaultVolumeSize = parseSize(minVolumeSize) <= parseSize('50Gi') ? '50Gi' : minVolumeSize
+    const defaultVolumeSize = convertToGi(minVolumeSize) <= convertToGi('50Gi') ? '50Gi' : minVolumeSize
     const worker = {
       id,
       name,

frontend/src/utils/index.js

@@ -43,11 +43,21 @@ import {
 } from '@/lodash'
 
 const serviceAccountRegex = /^system:serviceaccount:([^:]+):([^:]+)$/
-const sizeRegex = /^(\d+)Gi$/
 const emailRegex = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/
 const colorCodeRegex = /^#([a-f0-9]{6}|[a-f0-9]{3})$/i
 const magnitudeNumberSuffixRegex = /^(\d+(?:\.\d*)?)([kmbt]?)$/i
 const versionRegex = /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.\d+)*([-+].+)?$/
+const sizeRegex = /^(\d+)([GMKTi]{1,2})$/
+const sizeConversionFactors = {
+  Gi: 1,
+  G: 1 / 1.073741824, // 1 Gi = 1.073741824 G
+  Mi: 1 / 1024, // 1 Gi = 1024 Mi
+  M: 1 / (1024 * 1.073741824), // 1 Gi = 1073.741824 M
+  Ki: 1 / (1024 * 1024), // 1 Gi = 1024^2 Ki
+  K: 1 / (1024 * 1024 * 1.073741824), // 1 Gi = 1073741.824 K
+  Ti: 1024, // 1 Ti = 1024 Gi
+  T: 1024 / 1.073741824, // 1 Ti = 1073.741824 Gi
+}
 
 const logger = useLogger()
 
@@ -155,16 +165,19 @@ export function displayName (username) {
   return username
 }
 
-export function parseSize (value) {
+export function convertToGi (value) {
   if (!value) {
     return 0
   }
   const result = sizeRegex.exec(value)
   if (result) {
-    const [, sizeValue] = result
-    return parseInt(sizeValue, 10)
+    const [, sizeValue, unit] = result
+    const conversionFactor = sizeConversionFactors[unit]
+    if (conversionFactor !== undefined) {
+      return parseInt(sizeValue, 10) * conversionFactor
+    }
   }
-  logger.error(`Could not parse size ${value} as it does not match regex ^(\\d+)Gi$`)
+  logger.error(`Could not parse size ${value} as it does not match expected formats`)
   return 0
 }
 
@@ -648,7 +661,7 @@ export default {
   setInputFocus,
   fullDisplayName,
   displayName,
-  parseSize,
+  convertToGi,
   isEmail,
   gravatarUrlGeneric,
   gravatarUrlMp,