Change config: .network.multusStatus to .network.multus.status

Author: pmtk

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

@@ -470,6 +470,7 @@
       "type": "object",
       "required": [
         "clusterNetwork",
+        "multus",
         "serviceNetwork",
         "serviceNodePortRange"
       ],
@@ -493,13 +494,19 @@
             "ovnk"
           ]
         },
-        "multusStatus": {
-          "description": "MultusStatus controls the deployment of the Multus CNI.\nChanging from \"Enabled\" to \"Disabled\" will not cause Multus CNI to be deleted.\nAllowed values are: unset (disabled), \"Enabled\", or \"Disabled\"",
-          "type": "string",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ]
+        "multus": {
+          "type": "object",
+          "properties": {
+            "status": {
+              "description": "Status controls the deployment of the Multus CNI.\nChanging from \"Enabled\" to \"Disabled\" will not cause Multus CNI to be deleted.\nAllowed values are: unset (disabled), \"Enabled\", or \"Disabled\"",
+              "type": "string",
+              "default": "Disabled",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            }
+          }
         },
         "serviceNetwork": {
           "description": "IP address pool for services.\nCurrently, we only support a single entry here.\nThis field is immutable after installation.",

docs/user/howto_config.md

@@ -75,7 +75,8 @@ manifests:
 network:
     clusterNetwork: []
     cniPlugin: ""
-    multusStatus: ""
+    multus:
+        status: ""
     serviceNetwork: []
     serviceNodePortRange: ""
 node:
@@ -175,7 +176,8 @@ network:
     clusterNetwork:
         - 10.42.0.0/16
     cniPlugin: ""
-    multusStatus: ""
+    multus:
+        status: Disabled
     serviceNetwork:
         - 10.43.0.0/16
     serviceNodePortRange: 30000-32767

packaging/microshift/config.yaml

@@ -521,10 +521,11 @@ network:
     # assumes an empty string to mean the OVN-K should be deployed.
     # Allowed values are: unset or one of ["", "ovnk", "none"]
     cniPlugin: ""
-    # MultusStatus controls the deployment of the Multus CNI.
-    # Changing from "Enabled" to "Disabled" will not cause Multus CNI to be deleted.
-    # Allowed values are: unset (disabled), "Enabled", or "Disabled"
-    multusStatus: ""
+    multus:
+        # Status controls the deployment of the Multus CNI.
+        # Changing from "Enabled" to "Disabled" will not cause Multus CNI to be deleted.
+        # Allowed values are: unset (disabled), "Enabled", or "Disabled"
+        status: Disabled
     # IP address pool for services.
     # Currently, we only support a single entry here.
     # This field is immutable after installation.

packaging/microshift/dropins/enable-multus.yaml

@@ -1,2 +1,3 @@
 network:
-  multusStatus: Enabled
+  multus:
+    status: Enabled

pkg/components/networking.go

@@ -122,7 +122,7 @@ func startCNIPlugin(ctx context.Context, cfg *config.Config, kubeconfigPath stri
 }
 
 func deployMultus(ctx context.Context, cfg *config.Config, kubeconfigPath string) error {
-	if !cfg.Network.IsMultusEnabled() {
+	if !cfg.Network.Multus.IsEnabled() {
 		klog.Warningf("Multus CNI is disabled. Uninstall is not supported if it was installed previously.")
 		return nil
 	}

pkg/config/config.go

@@ -215,8 +215,8 @@ func (c *Config) incorporateUserSettings(u *Config) {
 		c.Network.DNS = u.Network.DNS
 	}
 
-	if u.Network.MultusStatus != "" {
-		c.Network.MultusStatus = u.Network.MultusStatus
+	if u.Network.Multus.Status != "" {
+		c.Network.Multus.Status = u.Network.Multus.Status
 	}
 
 	if u.Etcd.MemoryLimitMB != 0 {

pkg/config/network.go

@@ -36,6 +36,16 @@ const (
 	MultusDisabled MultusStatusEnum = "Disabled"
 )
 
+type Multus struct {
+	// Status controls the deployment of the Multus CNI.
+	// Changing from "Enabled" to "Disabled" will not cause Multus CNI to be deleted.
+	// Allowed values are: unset (disabled), "Enabled", or "Disabled"
+	//
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=Disabled
+	Status MultusStatusEnum `json:"status"`
+}
+
 type Network struct {
 	// CNIPlugin is a user defined string value matching one of the above CNI values. MicroShift uses this
 	// value to decide whether to deploy the OVN-K as default CNI. An unset field defaults to "" during yaml parsing, and thus
@@ -66,12 +76,7 @@ type Network struct {
 	// +kubebuilder:default="30000-32767"
 	ServiceNodePortRange string `json:"serviceNodePortRange"`
 
-	// MultusStatus controls the deployment of the Multus CNI.
-	// Changing from "Enabled" to "Disabled" will not cause Multus CNI to be deleted.
-	// Allowed values are: unset (disabled), "Enabled", or "Disabled"
-	//
-	// +kubebuilder:validation:Optional
-	MultusStatus MultusStatusEnum `json:"multusStatus"`
+	Multus Multus `json:"multus"`
 
 	// The DNS server to use
 	DNS string `json:"-"`
@@ -119,6 +124,6 @@ func (n Network) IsEnabled() bool {
 	return n.CNIPlugin != CniPluginNone
 }
 
-func (n Network) IsMultusEnabled() bool {
-	return n.MultusStatus == MultusEnabled
+func (m Multus) IsEnabled() bool {
+	return m.Status == MultusEnabled
 }