particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignition: drop embedded provisioning url

Browse source 
Signed-off-by: Antonio Murdaca <antoniomurdaca@gmail.com>
This commit is contained in:
Antonio Murdaca 2023-02-06 09:58:12 +01:00 • committed by Achilleas Koutsou
parent 2b1facb44d
commit b3f1b0edc8
5 changed files with 4 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/blueprint/customizations.go
View file

@ -32,12 +32,11 @@ type IgnitionCustomization struct {
}
type EmbeddedIgnitionCustomization struct {
ProvisioningURL string `json:"url,omitempty" toml:"url,omitempty"`
Config string `json:"config,omitempty" toml:"config,omitempty"`
Config string `json:"config,omitempty" toml:"config,omitempty"`
}
type FirstBootIgnitionCustomization struct {
ProvisioningURL string `json:"url,omitempty" toml:"url"`
ProvisioningURL string `json:"url,omitempty" toml:"url,omitempty"`
}
type FDOCustomization struct {
@ -416,14 +415,3 @@ func (c *Customizations) GetIgnition() *IgnitionCustomization {
func (c *IgnitionCustomization) HasIgnition() bool {
return c != nil
}
func (c *EmbeddedIgnitionCustomization) CheckEmbeddedIgnition() error {
if c == nil {
return nil
}
if c.Config != "" && c.ProvisioningURL != "" {
t := reflect.TypeOf(*c)
return &CustomizationError{fmt.Sprintf("'%s' and '%s' are not allowed at the same time", t.Field(0).Name, t.Field(1).Name)}
}
return nil
}