Systemd file units

.gitignore

@@ -1 +1,2 @@
-bin/*
+bin/*
+.vscode

Makefile

@@ -31,6 +31,4 @@ test:
 
 .PHONY: validate
 validate:
-	cd pkg/network
 	./validate.sh
-	cd -

api/v1/api.go

@@ -1,6 +1,8 @@
 package v1
 
-import "github.com/metal-stack/metal-go/api/models"
+import (
+	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
+)
 
 // Bootinfo is written by the installer in the target os to tell us
 // which kernel, initrd and cmdline must be used for kexec
@@ -11,39 +13,40 @@ type Bootinfo struct {
 	BootloaderID string `yaml:"bootloader_id"`
 }
 
-// InstallerConfig contains configuration items which are
-// used to install the os.
+const InstallerConfigPath = "/etc/metal/os-installer.yaml"
+
+// InstallerConfig can be placed inside the target OS to customize the os-installer.
 type InstallerConfig struct {
-	// Hostname of the machine
-	Hostname string `yaml:"hostname"`
-	// Networks all networks connected to this machine
-	Networks []*models.V1MachineNetwork `yaml:"networks"`
-	// MachineUUID is the unique UUID for this machine, usually the board serial.
-	MachineUUID string `yaml:"machineuuid"`
-	// SSHPublicKey of the user
-	SSHPublicKey string `yaml:"sshpublickey"`
+	// OsName enforces a specific os-installer implementation, defaults to auto-detection
+	OsName *string `yaml:"os_name"`
+	// Only allows to run installer tasks only with the given names
+	Only []string `yaml:"only"`
+	// Except allows to run installer tasks except for the given names
+	Except []string `yaml:"except"`
+	// CustomScript allows executing a custom script that's placed inside the OS at the end of the installer execution
+	CustomScript *struct {
+		ExecutablePath string `yaml:"executable_path"`
+		WorkDir        string `yaml:"workdir"`
+	} `yaml:"custom_script"`
+	// Overwrites allows specifying os-installer overwrites for the default implementation
+	Overwrites struct {
+		BootloaderID *string `yaml:"bootloader_id"`
+	}
+}
+
+type MachineDetails struct {
+	// Id is the machine UUID
+	ID string `yaml:"id"`
+	// Nics are the nics of the machine
+	Nics []*apiv2.MachineNic `yaml:"nics"`
 	// Password is the password for the metal user.
 	Password string `yaml:"password"`
 	// Console specifies where the kernel should connect its console to.
 	Console string `yaml:"console"`
-	// Timestamp is the the timestamp of installer config creation.
-	Timestamp string `yaml:"timestamp"`
-	// Nics are the network interfaces of this machine including their neighbors.
-	Nics []*models.V1MachineNic `yaml:"nics"`
-	// VPN is the config for connecting machine to VPN
-	VPN *models.V1MachineVPN `yaml:"vpn"`
-	// Role is either firewall or machine
-	Role string `yaml:"role"`
 	// RaidEnabled is set to true if any raid devices are specified
 	RaidEnabled bool `yaml:"raidenabled"`
 	// RootUUID is the fs uuid if the root fs
 	RootUUID string `yaml:"root_uuid"`
-	// FirewallRules if not empty firewall rules to enforce
-	FirewallRules *models.V1FirewallRules `yaml:"firewall_rules"`
-	// DNSServers for the machine
-	DNSServers []*models.V1DNSServer `yaml:"dns_servers"`
-	// NTPServers for the machine
-	NTPServers []*models.V1NTPServer `yaml:"ntp_servers"`
 }
 
 // FIXME legacy structs remove once old images are gone

go.mod

@@ -4,52 +4,40 @@ go 1.26
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
+	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/coreos/go-systemd/v22 v22.7.0
 	github.com/flatcar/ignition v0.36.2
 	github.com/google/go-cmp v0.7.0
-	github.com/metal-stack/metal-go v0.43.0
-	github.com/metal-stack/metal-lib v0.24.0
+	github.com/google/uuid v1.6.0
+	github.com/metal-stack/api v0.0.54-0.20260309104254-e1a94cd811ff
 	github.com/metal-stack/v v1.0.3
+	github.com/samber/lo v1.53.0
 	github.com/spf13/afero v1.15.0
 	github.com/stretchr/testify v1.11.1
-	gopkg.in/yaml.v3 v3.0.1
+	go.yaml.in/yaml/v3 v3.0.4
 )
 
 require (
+	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1 // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/go-openapi/analysis v0.24.2 // indirect
-	github.com/go-openapi/errors v0.22.6 // indirect
-	github.com/go-openapi/jsonpointer v0.22.5 // indirect
-	github.com/go-openapi/jsonreference v0.21.5 // indirect
-	github.com/go-openapi/loads v0.23.2 // indirect
-	github.com/go-openapi/spec v0.22.4 // indirect
-	github.com/go-openapi/strfmt v0.25.0 // indirect
-	github.com/go-openapi/swag v0.25.5 // indirect
-	github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
-	github.com/go-openapi/swag/conv v0.25.5 // indirect
-	github.com/go-openapi/swag/fileutils v0.25.5 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.5 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
-	github.com/go-openapi/swag/loading v0.25.5 // indirect
-	github.com/go-openapi/swag/mangling v0.25.5 // indirect
-	github.com/go-openapi/swag/netutils v0.25.5 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.5 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.5 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
-	github.com/go-openapi/validate v0.25.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/godbus/dbus/v5 v5.2.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
-	go.mongodb.org/mongo-driver v1.17.9 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
-	golang.org/x/net v0.51.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )