Revert "Update packaging/microshift/config.yaml"

This reverts commit 72afe2181f62a02dc68003a92d2ace10f43779c2.

Update packaging/microshift/config.yaml

Co-authored-by: Patryk Matuszak <[email protected]>

include [""] as a valid value for optionalCsiComponents to workaround the way controller-gen interprets an empty array when set as a default

Signed-off-by: Jon Cope <[email protected]>

generate the default config with an empty array. it was created with an array of 1 element, and empty str, which is not an accepted value

Signed-off-by: Jon Cope <[email protected]>

Author: copejon

cmd/generate-config/config/config-openapi-spec.json

@@ -291,9 +291,14 @@
             "enum": [
               "none",
               "snapshot-controller",
-              "snapshot-webhook"
+              "snapshot-webhook",
+              ""
             ]
-          }
+          },
+          "example": [
+            "snapshot-controller",
+            "snapshot-webhook"
+          ]
         }
       }
     }

etcd/vendor/github.com/openshift/microshift/pkg/config/storage.go

@@ -131,6 +131,9 @@ storage:
     # storage driver. Like CSIStorageDriver, uninstallation is not supported as this can lead to orphaned storage
     # objects.
     # Allowed values are: unset, [], or one or more of ["snapshot-controller", "snapshot-webhook"]
+    # example:
+    #   - snapshot-controller
+    # - snapshot-webhook
     optionalCsiComponents:
         - ""
 

packaging/microshift/config.yaml

@@ -26,7 +26,7 @@ const (
 
 // OptionalCsiComponent values determine which CSI components MicroShift should deploy. Currently only csi snapshot components
 // are supported.
-// +kubebuilder:validation:Enum:=none;snapshot-controller;snapshot-webhook
+// +kubebuilder:validation:Enum:=none;snapshot-controller;snapshot-webhook;""
 type OptionalCsiComponent string
 
 const (
@@ -41,6 +41,10 @@ const (
 	CsiComponentSnapshot OptionalCsiComponent = "snapshot-controller"
 	// CsiComponentSnapshotWebhook causes MicroShift to deploy the CSI Snapshot Validation Webhook.
 	CsiComponentSnapshotWebhook OptionalCsiComponent = "snapshot-webhook"
+	// CsiComponentNullAlias is equivalent to not specifying a value. It exists because controller-gen generates
+	// default empty-array values as [""], instead of []. Failing to include this odd value would mean the generated
+	// /etc/microshift/config.default.yaml would break if passed to MicroShift.
+	CsiComponentNullAlias OptionalCsiComponent = ""
 )
 
 // Storage represents a subfield of the MicroShift config data structure. Its purpose to provide a user
@@ -62,6 +66,7 @@ type Storage struct {
 	// objects.
 	// Allowed values are: unset, [], or one or more of ["snapshot-controller", "snapshot-webhook"]
 	// +kubebuilder:validation:Optional
+	// +kubebuilder:example={"snapshot-controller", "snapshot-webhook"}
 	OptionalCSIComponents []OptionalCsiComponent `json:"optionalCsiComponents,omitempty"`
 }
 
@@ -70,7 +75,8 @@ func (s Storage) driverIsValid() (isSupported bool) {
 }
 
 func (s Storage) csiComponentsAreValid() []string {
-	supported := sets.New[OptionalCsiComponent](CsiComponentSnapshot, CsiComponentSnapshotWebhook, CsiComponentNone)
+	supported := sets.New[OptionalCsiComponent](CsiComponentSnapshot, CsiComponentSnapshotWebhook, CsiComponentNone,
+		CsiComponentNullAlias)
 	unsupported := sets.New[string]()
 
 	for _, cfgComp := range s.OptionalCSIComponents {