feat: remove release version from runner name template (#32)

Author: dzmitryharchanin-tomtom

examples/tarter-standalone-config.yaml

@@ -10,7 +10,6 @@ runners:
     restartOnFailure: false
     noGraphics: true        # optional
     cacheVolumePath: ""     # optional
-    releaseVersion: 1.0.0
     runnerGroup: group0
     startupProbe:           # optional
       githubRunnerGet: {}
@@ -37,7 +36,6 @@ runners:
     restartOnFailure: false # optional
     noGraphics: true        # optional
     cacheVolumePath: ""     # optional
-    releaseVersion: 1.0.0
     runnerGroup: group0
     startupProbe:           # optional
       githubRunnerGet: {}

pkg/clients/tart/client.go

@@ -25,7 +25,6 @@ import (
 	"os/exec"
 	"path"
 	"strings"
-	"time"
 
 	"github.com/tomtom-international/macos-actions-runner-controller/pkg/core/types"
 	"github.com/tomtom-international/macos-actions-runner-controller/pkg/logger"
@@ -176,7 +175,7 @@ func (c *Client) SetupRunnerConfiguration(
 	if err != nil {
 		return "", fmt.Errorf("failed to set runner hosts: %s", err.Error())
 	}
-	err = c.setRunnerHostname(runnerConfigFolder, config.RunnerHostname, runnerID, config.ReleaseVersion)
+	err = c.setRunnerHostname(runnerConfigFolder, config.RunnerHostname, runnerID)
 	if err != nil {
 		return "", fmt.Errorf("failed to set runner hostname: %s", err.Error())
 	}
@@ -202,7 +201,7 @@ func (c *Client) SetupRunnerConfiguration(
 		if err != nil {
 			return "", fmt.Errorf("failed to set runner github registration token: %s", err.Error())
 		}
-		ghaRunnerName, err = c.setGhaRunnerName(nodeName, runnerConfigFolder, runnerID, config.ReleaseVersion)
+		ghaRunnerName, err = c.setGhaRunnerName(nodeName, runnerConfigFolder, runnerID)
 		if err != nil {
 			return "", fmt.Errorf("failed to set github action runner name: %s", err.Error())
 		}
@@ -296,11 +295,9 @@ func (c *Client) setRunnerHosts(runnerConfigFolder string, runnerHosts []types.R
 	return nil
 }
 
-func (c *Client) setRunnerHostname(runnerConfigFolder string, hostname string, runnerID string, runnerVersion string) error {
+func (c *Client) setRunnerHostname(runnerConfigFolder string, hostname string, runnerID string) error {
 	if hostname == "" {
-		timestamp := time.Now().Unix()
-		version := strings.ReplaceAll(runnerVersion, ".", "-")
-		hostname = fmt.Sprintf("runner-%v-%v-v%v.local", runnerID, timestamp, version)
+		hostname = fmt.Sprintf("runner-%v", runnerID)
 	}
 	return writeToFile(path.Join(runnerConfigFolder, runnerHostname), hostname)
 }
@@ -320,13 +317,12 @@ func (c *Client) setRegistrationToken(runnerConfigFolder string, token string) e
 	return writeToFile(path.Join(runnerConfigFolder, runnerRegistrationTokenFile), token)
 }
 
-func (c *Client) setGhaRunnerName(nodeName string, runnerConfigFolder string, runnerID string, runnerVersion string) (string, error) {
-	timestamp := time.Now().Unix()
+func (c *Client) setGhaRunnerName(nodeName string, runnerConfigFolder string, runnerID string) (string, error) {
 	if strings.IndexByte(nodeName, '.') != -1 {
 		nodeName = nodeName[:strings.IndexByte(nodeName, '.')]
 	}
 
-	ghaRunnerName := fmt.Sprintf("%v-%v-%v-v%v", nodeName, runnerID, timestamp, runnerVersion)
+	ghaRunnerName := fmt.Sprintf("%v-%v", nodeName, runnerID)
 
 	err := writeToFile(path.Join(runnerConfigFolder, runnerNameFile), ghaRunnerName)
 	if err != nil {

pkg/core/types/runner.go

@@ -57,12 +57,11 @@ type RunnerCondition struct {
 }
 
 type RunnerConfig struct {
-	StartupProbe   *t.Probe `json:"startupProbe,omitempty" yaml:"startupProbe,omitempty"`
-	LivenessProbe  *t.Probe `json:"livenessProbe,omitempty" yaml:"livenessProbe,omitempty"`
-	ReleaseVersion string   `json:"releaseVersion" yaml:"releaseVersion"`
-	RunnerGroup    string   `json:"runnerGroup" yaml:"runnerGroup"`
-	Name           string   `json:"name" yaml:"name"`
-	BaseImage      string   `json:"baseImage" yaml:"baseImage"`
+	StartupProbe  *t.Probe `json:"startupProbe,omitempty" yaml:"startupProbe,omitempty"`
+	LivenessProbe *t.Probe `json:"livenessProbe,omitempty" yaml:"livenessProbe,omitempty"`
+	RunnerGroup   string   `json:"runnerGroup" yaml:"runnerGroup"`
+	Name          string   `json:"name" yaml:"name"`
+	BaseImage     string   `json:"baseImage" yaml:"baseImage"`
 	// JitConfig is ACTIONS_RUNNER_INPUT_JITCONFIG environment variable passed by Actions Runner Controller.
 	// Temporary solution before Runners Listener is implemented.
 	JitConfig              string            `json:"jitConfig,omitempty" yaml:"jitConfig,omitempty"`

pkg/tarter/runner/worker.go

@@ -149,7 +149,7 @@ func (w *worker) startRunner() error {
 	// It uses short Runner ID due to the limitation of the GHA runner name length.
 	ghaRunnerName, err := w.runnerManager.tartClient.SetupRunnerConfiguration(
 		w.runnerManager.nodeName,
-		string(w.runner.ID.Short()),
+		string(w.runner.ID),
 		w.runner.TartVMName,
 		w.runner.Config,
 		registrationToken.GetToken())