Skip to content

fix(vd,vi): prevent empty storage class in allowedStorageClassSelector #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+37 −8
Open

fix(vd,vi): prevent empty storage class in allowedStorageClassSelector #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
81d3cf2
wip
loktev-d Sep 2, 2025
687fb6e
wip
loktev-d Sep 2, 2025
6d4c369
wip
loktev-d Sep 4, 2025
0b6c18f
wip
loktev-d Sep 4, 2025
5f47654
wip
loktev-d Sep 4, 2025
5d36394
wip
loktev-d Sep 4, 2025
8c0bb58
wip
loktev-d Sep 4, 2025
cd6b559
Merge branch 'main' into fix/vd-vi/storage-class-restrictions
loktev-d Sep 4, 2025
7c85b69
wip
loktev-d Sep 5, 2025
054fb6d
Merge branch 'main' into fix/vd-vi/storage-class-restrictions
loktev-d Sep 8, 2025
c348472
wip
loktev-d Sep 10, 2025
d54799f
Merge branch 'main' into fix/vd-vi/storage-class-restrictions
loktev-d Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions images/virtualization-artifact/cmd/virtualization-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,17 @@ func main() {
os.Exit(1)
}

viStorageClassSettings := appconfig.LoadVirtualImageStorageClassSettings()
vdStorageClassSettings := appconfig.LoadVirtualDiskStorageClassSettings()
viStorageClassSettings, err := appconfig.LoadVirtualImageStorageClassSettings()
if err != nil {
log.Error(err.Error())
os.Exit(1)
}

vdStorageClassSettings, err := appconfig.LoadVirtualDiskStorageClassSettings()
if err != nil {
log.Error(err.Error())
os.Exit(1)
}

// Get a config to talk to the apiserver
cfg, err := config.GetConfig()
Expand Down
10 changes: 7 additions & 3 deletions images/virtualization-artifact/pkg/config/load_vd_storage_class_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package config

import (
"fmt"
"os"
"strings"
)
Expand All @@ -33,15 +34,18 @@ type VirtualDiskStorageClassSettings struct {
DefaultStorageClassName string
}

func LoadVirtualDiskStorageClassSettings() VirtualDiskStorageClassSettings {
func LoadVirtualDiskStorageClassSettings() (VirtualDiskStorageClassSettings, error) {
var allowedStorageClassNames []string
allowedStorageClassNamesRaw := os.Getenv(VirtualDiskAllowedStorageClasses)
allowedStorageClassNamesRaw, exists := os.LookupEnv(VirtualDiskAllowedStorageClasses)
if exists && allowedStorageClassNamesRaw == "" {
return VirtualDiskStorageClassSettings{}, fmt.Errorf("%s is empty. Specify valid StorageClass names or remove the restriction", VirtualDiskAllowedStorageClasses)
}
if allowedStorageClassNamesRaw != "" {
allowedStorageClassNames = strings.Split(allowedStorageClassNamesRaw, ",")
}

return VirtualDiskStorageClassSettings{
AllowedStorageClassNames: allowedStorageClassNames,
DefaultStorageClassName: os.Getenv(VirtualDiskDefaultStorageClass),
}
}, nil
}
10 changes: 7 additions & 3 deletions images/virtualization-artifact/pkg/config/load_vi_storage_class_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package config

import (
"fmt"
"os"
"strings"
)
Expand All @@ -36,9 +37,12 @@ type VirtualImageStorageClassSettings struct {
StorageClassName string
}

func LoadVirtualImageStorageClassSettings() VirtualImageStorageClassSettings {
func LoadVirtualImageStorageClassSettings() (VirtualImageStorageClassSettings, error) {
var allowedStorageClassNames []string
allowedStorageClassNamesRaw := os.Getenv(VirtualImageAllowedStorageClasses)
allowedStorageClassNamesRaw, exists := os.LookupEnv(VirtualImageAllowedStorageClasses)
if exists && allowedStorageClassNamesRaw == "" {
return VirtualImageStorageClassSettings{}, fmt.Errorf("%s is empty. Specify valid StorageClass names or remove the restriction", VirtualImageAllowedStorageClasses)
}
if allowedStorageClassNamesRaw != "" {
allowedStorageClassNames = strings.Split(allowedStorageClassNamesRaw, ",")
}
Expand All @@ -47,5 +51,5 @@ func LoadVirtualImageStorageClassSettings() VirtualImageStorageClassSettings {
AllowedStorageClassNames: allowedStorageClassNames,
DefaultStorageClassName: os.Getenv(VirtualImageDefaultStorageClass),
StorageClassName: os.Getenv(VirtualImageStorageClass),
}
}, nil
}
6 changes: 6 additions & 0 deletions openapi/config-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,14 @@ properties:
type: object
description: |
Selector for allowed storage classes to be used for virtual images on PVC.
minProperties: 1
properties:
matchNames:
type: array
minItems: 1
items:
type: string
minLength: 1
x-examples: ["sc-1", "sc-2"]
virtualDisks:
type: object
Expand All @@ -227,11 +230,14 @@ properties:
type: object
description: |
Selector for allowed storage classes to be used for virtual disks.
minProperties: 1
properties:
matchNames:
type: array
minItems: 1
items:
type: string
minLength: 1
x-examples: ["sc-1", "sc-2"]
logLevel:
type: string
Expand Down
6 changes: 6 additions & 0 deletions openapi/doc-ru-config-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,14 @@ properties:
type: object
description: |
Селектор разрешенных классов хранения, которые можно использовать для виртуальных образов на PVC.
minProperties: 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
minProperties: 1
minProperties: 1

This an below dosn't make sense in the doc-ru specs

properties:
matchNames:
type: array
minItems: 1
items:
type: string
minLength: 1
virtualDisks:
type: object
description: |
Expand All @@ -127,11 +130,14 @@ properties:
type: object
description: |
Селектор разрешенных классов хранения, используемых для виртуальных дисков.
minProperties: 1
properties:
matchNames:
type: array
minItems: 1
items:
type: string
minLength: 1
audit:
type: object
description: |
Expand Down
Loading