new hetzner field "image" (#817)

Signed-off-by: Artiom Diomin <[email protected]>

Author: kron4eg

examples/hetzner-machinedeployment.yaml

@@ -47,6 +47,7 @@ spec:
             # Optional
             datacenter: ""
             location: "fsn1"
+            image: "ubuntu-20.04"
             # Optional: network IDs or names
             networks:
               - "<< YOUR_NETWORK >>"

pkg/cloudprovider/provider/hetzner/provider.go

@@ -58,6 +58,7 @@ type Config struct {
 	Token      string
 	ServerType string
 	Datacenter string
+	Image      string
 	Location   string
 	Networks   []string
 	Labels     map[string]string
@@ -97,25 +98,35 @@ func (p *provider) getConfig(s v1alpha1.ProviderSpec) (*Config, *providerconfigt
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to get the value of \"token\" field, error = %v", err)
 	}
+
 	c.ServerType, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.ServerType)
 	if err != nil {
 		return nil, nil, err
 	}
+
 	c.Datacenter, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.Datacenter)
 	if err != nil {
 		return nil, nil, err
 	}
+
+	c.Image, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.Image)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	c.Location, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.Location)
 	if err != nil {
 		return nil, nil, err
 	}
+
 	for _, network := range rawConfig.Networks {
 		networkValue, err := p.configVarResolver.GetConfigVarStringValue(network)
 		if err != nil {
 			return nil, nil, err
 		}
 		c.Networks = append(c.Networks, networkValue)
 	}
+
 	c.Labels = rawConfig.Labels
 	return &c, &pconfig, err
 }
@@ -154,6 +165,12 @@ func (p *provider) Validate(spec v1alpha1.MachineSpec) error {
 		}
 	}
 
+	if c.Image != "" {
+		if _, _, err = client.Image.Get(ctx, c.Image); err != nil {
+			return fmt.Errorf("failed to get image: %v", err)
+		}
+	}
+
 	if len(c.Networks) != 0 {
 		for _, network := range c.Networks {
 			if _, _, err = client.Network.Get(ctx, network); err != nil {
@@ -181,17 +198,21 @@ func (p *provider) Create(machine *v1alpha1.Machine, _ *cloudprovidertypes.Provi
 	ctx := context.TODO()
 	client := getClient(c.Token)
 
-	imageName, err := getNameForOS(pc.OperatingSystem)
-	if err != nil {
-		return nil, cloudprovidererrors.TerminalError{
-			Reason:  common.InvalidConfigurationMachineError,
-			Message: fmt.Sprintf("Invalid operating system specified %q, details = %v", pc.OperatingSystem, err),
+	if c.Image == "" {
+		imageName, err := getNameForOS(pc.OperatingSystem)
+		if err != nil {
+			return nil, cloudprovidererrors.TerminalError{
+				Reason:  common.InvalidConfigurationMachineError,
+				Message: fmt.Sprintf("Invalid operating system specified %q, details = %v", pc.OperatingSystem, err),
+			}
 		}
+		c.Image = imageName
 	}
 
 	if c.Labels == nil {
 		c.Labels = map[string]string{}
 	}
+
 	c.Labels[machineUIDLabelKey] = string(machine.UID)
 	serverCreateOpts := hcloud.ServerCreateOpts{
 		Name:     machine.Spec.Name,
@@ -224,7 +245,7 @@ func (p *provider) Create(machine *v1alpha1.Machine, _ *cloudprovidertypes.Provi
 		}
 	}
 
-	serverCreateOpts.Image, _, err = client.Image.Get(ctx, imageName)
+	serverCreateOpts.Image, _, err = client.Image.Get(ctx, c.Image)
 	if err != nil {
 		return nil, hzErrorToTerminalError(err, "failed to get image")
 	}

pkg/cloudprovider/provider/hetzner/types/types.go

@@ -24,6 +24,7 @@ type RawConfig struct {
 	Token      providerconfigtypes.ConfigVarString   `json:"token,omitempty"`
 	ServerType providerconfigtypes.ConfigVarString   `json:"serverType"`
 	Datacenter providerconfigtypes.ConfigVarString   `json:"datacenter"`
+	Image      providerconfigtypes.ConfigVarString   `json:"image"`
 	Location   providerconfigtypes.ConfigVarString   `json:"location"`
 	Networks   []providerconfigtypes.ConfigVarString `json:"networks"`
 	Labels     map[string]string                     `json:"labels,omitempty"`