DevFW-CICD/garm-provider-edge-connect
15
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

feature(provider): Make some of the runner parameters configurable in the extra config at garm runtime
Some checks failed
Go Tests / go-tests (push) Failing after 1m3s
Details

Browse source
This commit is contained in:
Waldemar 2025-10-23 12:00:36 +02:00
parent dadb5076f2
commit 94038106d7
Signed by: waldemar.kindler
SSH key fingerprint: SHA256:wlTo/iRV2dOcNfLJPdlwSsLvA1BH+gT9449nlU9sHXo
2 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
internal/spec/spec.go
View file

@ -1,6 +1,7 @@
package spec
import (
"encoding/json"
"fmt"
"net/url"
"strings"
@ -16,6 +17,12 @@ type GitHubScopeDetails struct {
Enterprise string
}
type RunnerExtraSpecs struct {
RunnerWorkDir string `json:"runner_workdir"`
DisableRunnerUpdate *bool `json:"disable_runner_update"`
RunnerEphemeral *bool `json:"runner_ephemeral"`
}
func ExtractGitHubScopeDetails(gitRepoURL string) (GitHubScopeDetails, error) {
if gitRepoURL == "" {
return GitHubScopeDetails{}, fmt.Errorf("no gitRepoURL supplied")
@ -51,6 +58,26 @@ func ExtractGitHubScopeDetails(gitRepoURL string) (GitHubScopeDetails, error) {
}
func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.BootstrapInstance) []corev1.EnvVar {
var extraSpecs RunnerExtraSpecs
if len(bootstrapParams.ExtraSpecs) > 0 {
_ = json.Unmarshal(bootstrapParams.ExtraSpecs, &extraSpecs)
}
runnerWorkDir := extraSpecs.RunnerWorkDir
if runnerWorkDir == "" {
runnerWorkDir = "/runner/_work/"
}
disableRunnerUpdate := "true"
if extraSpecs.DisableRunnerUpdate != nil {
disableRunnerUpdate = fmt.Sprintf("%t", *extraSpecs.DisableRunnerUpdate)
}
runnerEphemeral := "true"
if extraSpecs.RunnerEphemeral != nil {
runnerEphemeral = fmt.Sprintf("%t", *extraSpecs.RunnerEphemeral)
}
return []corev1.EnvVar{
{
Name: "RUNNER_GITEA_INSTANCE",
@ -74,11 +101,11 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
},
{
Name: "DISABLE_RUNNER_UPDATE",
Value: "true",
Value: disableRunnerUpdate,
},
{
Name: "RUNNER_WORKDIR",
Value: "/runner/_work/",
Value: runnerWorkDir,
},
{
Name: "GITHUB_URL",
@ -86,7 +113,7 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
},
{
Name: "RUNNER_EPHEMERAL",
Value: "true",
Value: runnerEphemeral,
},
{
Name: "RUNNER_TOKEN",