Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cmd/createtemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ func runGenerateConfig(cmd *cobra.Command, args []string) error {
return fmt.Errorf("invalid boot method: '%s'. Must be 'agent' or 'netboot'", bootMethod)
}

// Interlock: SNO + netboot is an invalid combination
if configType == "sno" && bootMethod == "netboot" {
return fmt.Errorf("invalid combination: Single Node OpenShift (SNO) requires the 'agent' boot method. Netboot is not supported for SNO")
}

if _, err := os.Stat(genOutputPath); err == nil {
return fmt.Errorf("file '%s' already exists. Refusing to overwrite", genOutputPath)
}
Expand Down Expand Up @@ -125,6 +120,7 @@ func runGenerateConfig(cmd *cobra.Command, args []string) error {

return nil
}

// TemplateData struct
type TemplateData struct {
IsSNO bool
Expand Down
3 changes: 0 additions & 3 deletions types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,6 @@ func (c *AgentConfig) GetAllNodes() []*NodeConfig {
// Validate processes configuration layout rules before triggering pipelines.
func (c *AgentConfig) Validate() error {
if c.IsSNO() {
if c.Nodes.BootMethod == "netboot" {
return fmt.Errorf("topology mismatch: Single Node OpenShift (SNO) is completely incompatible with 'netboot'")
}
if len(c.Nodes.Workers) > 0 || len(c.Nodes.Bootstrap) > 0 {
return fmt.Errorf("topology conflict: exactly 1 master node is defined, triggering Single Node OpenShift (SNO) mode. However, you still have targets listed under 'workers' or 'bootstrap'. Please remove those extra nodes to proceed")
}
Expand Down
Loading