Merge pull request #3761 from danj-replicated/storage_type_safety

Check if Extensions.Storage exists before accessing Type key
k0sproject · Nov 28, 2023 · 82202b3 · 82202b3
2 parents c95dbfd + e80c996
commit 82202b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/pkg/apis/k0s/v1beta1/clusterconfig_types.go b/pkg/apis/k0s/v1beta1/clusterconfig_types.go
@@ -239,6 +239,9 @@ func (c *ClusterConfig) UnmarshalJSON(data []byte) error {
 	if jc.Spec.Extensions == nil {
 		jc.Spec.Extensions = DefaultExtensions()
 	}
+	if jc.Spec.Extensions.Storage == nil {
+		jc.Spec.Extensions.Storage = DefaultStorageExtension()
+	}
 	if jc.Spec.Network == nil {
 		jc.Spec.Network = DefaultNetwork()
 	}

diff --git a/pkg/apis/k0s/v1beta1/clusterconfig_types_test.go b/pkg/apis/k0s/v1beta1/clusterconfig_types_test.go
@@ -196,6 +196,15 @@ spec:
   telemetry: null
   konnectivity: null
 `
+	extensionsYamlData := `
+apiVersion: k0s.k0sproject.io/v1beta1
+kind: ClusterConfig
+metadata:
+  name: foobar
+spec:
+  extensions:
+    storage: null
+`
 
 	c, err := ConfigFromString(yamlData)
 	assert.NoError(t, err)
@@ -210,6 +219,10 @@ spec:
 	assert.Equal(t, DefaultInstallSpec(), c.Spec.Install)
 	assert.Equal(t, DefaultClusterTelemetry(), c.Spec.Telemetry)
 	assert.Equal(t, DefaultKonnectivitySpec(), c.Spec.Konnectivity)
+
+	e, err := ConfigFromString(extensionsYamlData)
+	assert.NoError(t, err)
+	assert.Equal(t, DefaultExtensions(), e.Spec.Extensions)
 }
 
 func TestWorkerProfileConfig(t *testing.T) {

diff --git a/pkg/apis/k0s/v1beta1/extensions.go b/pkg/apis/k0s/v1beta1/extensions.go
@@ -159,13 +159,17 @@ func (e *ClusterExtensions) Validate() []error {
 	return errs
 }
 
+func DefaultStorageExtension() *StorageExtension {
+	return &StorageExtension{
+		Type:                      ExternalStorage,
+		CreateDefaultStorageClass: false,
+	}
+}
+
 // DefaultExtensions default values
 func DefaultExtensions() *ClusterExtensions {
 	return &ClusterExtensions{
-		Storage: &StorageExtension{
-			Type:                      ExternalStorage,
-			CreateDefaultStorageClass: false,
-		},
+		Storage: DefaultStorageExtension(),
 		Helm: &HelmExtensions{
 			ConcurrencyLevel: 5,
 		},