Merge branch '17573-export-storage-classes' into main. Refs #17573

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 0f497a443befbbb7b7942fcd69f1bb7bb0ac9dec..4e009f45ab55ad6353944bbea5cb7ca5b09811ac 100644 (file)
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -741,6 +741,11 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
                                AccessViaHosts: map[arvados.URL]arvados.VolumeAccess{
                                        url: {},
                                },
+                               StorageClasses: map[string]bool{
+                                       "default": true,
+                                       "foo":     true,
+                                       "bar":     true,
+                               },
                        }
                }
        }

diff --git a/lib/config/export.go b/lib/config/export.go
index 8753b52f27e17dee80958fd32ab25e46cda2f9fb..bb939321c9ce17e220bb031f041efae53c79fa46 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -232,7 +232,7 @@ var whitelist = map[string]bool{
        "Volumes.*.ReadOnly":                                  true,
        "Volumes.*.Replication":                               true,
        "Volumes.*.StorageClasses":                            true,
-       "Volumes.*.StorageClasses.*":                          false,
+       "Volumes.*.StorageClasses.*":                          true,
        "Workbench":                                           true,
        "Workbench.ActivationContactLink":                     false,
        "Workbench.APIClientConnectTimeout":                   true,