topology needs to be string

Signed-off-by: vsoch <[email protected]>
flux-framework · Nov 5, 2024 · b599e73 · b599e73
1 parent d881f8e
commit b599e73
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/api/v1alpha2/minicluster_types.go b/api/v1alpha2/minicluster_types.go
@@ -318,7 +318,7 @@ type FluxSpec struct {
 
 	// Specify a custom Topology
 	// +optional
-	Topology bool `json:"topology"`
+	Topology string `json:"topology"`
 
 	// Do not wait for the socket
 	// +optional

diff --git a/api/v1alpha2/swagger.json b/api/v1alpha2/swagger.json
@@ -332,8 +332,8 @@
         },
         "topology": {
           "description": "Specify a custom Topology",
-          "type": "boolean",
-          "default": false
+          "type": "string",
+          "default": ""
         },
         "wrap": {
           "description": "Commands for flux start --wrap",

diff --git a/api/v1alpha2/zz_generated.openapi.go b/api/v1alpha2/zz_generated.openapi.go
diff --git a/chart/templates/minicluster-crd.yaml b/chart/templates/minicluster-crd.yaml
@@ -466,7 +466,7 @@ spec:
                     type: string
                   topology:
                     description: Specify a custom Topology
-                    type: boolean
+                    type: string
                   wrap:
                     description: Commands for flux start --wrap
                     type: string

diff --git a/config/crd/bases/flux-framework.org_miniclusters.yaml b/config/crd/bases/flux-framework.org_miniclusters.yaml
@@ -467,7 +467,7 @@ spec:
                     type: string
                   topology:
                     description: Specify a custom Topology
-                    type: boolean
+                    type: string
                   wrap:
                     description: Commands for flux start --wrap
                     type: string

diff --git a/examples/dist/flux-operator-arm.yaml b/examples/dist/flux-operator-arm.yaml
@@ -473,7 +473,7 @@ spec:
                     type: string
                   topology:
                     description: Specify a custom Topology
-                    type: boolean
+                    type: string
                   wrap:
                     description: Commands for flux start --wrap
                     type: string

diff --git a/examples/dist/flux-operator.yaml b/examples/dist/flux-operator.yaml
@@ -473,7 +473,7 @@ spec:
                     type: string
                   topology:
                     description: Specify a custom Topology
-                    type: boolean
+                    type: string
                   wrap:
                     description: Commands for flux start --wrap
                     type: string

diff --git a/sdk/python/v1alpha2/docs/FluxSpec.md b/sdk/python/v1alpha2/docs/FluxSpec.md
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
 **option_flags** | **str** | Flux option flags, usually provided with -o optional - if needed, default option flags for the server These can also be set in the user interface to override here. This is only valid for a FluxRunner \&quot;runFlux\&quot; true | [optional] [default to '']
 **scheduler** | [**FluxScheduler**](FluxScheduler.md) |  | [optional] 
 **submit_command** | **str** | Modify flux submit to be something else | [optional] 
-**topology** | **bool** | Specify a custom Topology | [optional] [default to False]
+**topology** | **str** | Specify a custom Topology | [optional] [default to '']
 **wrap** | **str** | Commands for flux start --wrap | [optional] 
 
 ## Example

diff --git a/sdk/python/v1alpha2/fluxoperator/models/flux_spec.py b/sdk/python/v1alpha2/fluxoperator/models/flux_spec.py
@@ -44,7 +44,7 @@ class FluxSpec(BaseModel):
     option_flags: Optional[StrictStr] = Field(default='', description="Flux option flags, usually provided with -o optional - if needed, default option flags for the server These can also be set in the user interface to override here. This is only valid for a FluxRunner \"runFlux\" true", alias="optionFlags")
     scheduler: Optional[FluxScheduler] = None
     submit_command: Optional[StrictStr] = Field(default=None, description="Modify flux submit to be something else", alias="submitCommand")
-    topology: Optional[StrictBool] = Field(default=False, description="Specify a custom Topology")
+    topology: Optional[StrictStr] = Field(default='', description="Specify a custom Topology")
     wrap: Optional[StrictStr] = Field(default=None, description="Commands for flux start --wrap")
     __properties: ClassVar[List[str]] = ["arch", "brokerConfig", "bursting", "completeWorkers", "connectTimeout", "container", "curveCert", "disableSocket", "logLevel", "minimalService", "mungeSecret", "noWaitSocket", "optionFlags", "scheduler", "submitCommand", "topology", "wrap"]
 
@@ -123,7 +123,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "optionFlags": obj.get("optionFlags") if obj.get("optionFlags") is not None else '',
             "scheduler": FluxScheduler.from_dict(obj["scheduler"]) if obj.get("scheduler") is not None else None,
             "submitCommand": obj.get("submitCommand"),
-            "topology": obj.get("topology") if obj.get("topology") is not None else False,
+            "topology": obj.get("topology") if obj.get("topology") is not None else '',
             "wrap": obj.get("wrap")
         })
         return _obj