public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Include actions-runner-controller in runner's User-Agent for better telemetry in Actions service. (#2155)

This commit is contained in:
Tingluo Huang 2023-01-14 19:35:56 -05:00 committed by GitHub
parent eaa451df32
commit 044c8ad4d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
controllers/actions.summerwind.net/new_runner_pod_test.go
View File

@ -131,6 +131,10 @@ func TestNewRunnerPod(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
{ {
Name: "DOCKER_HOST", Name: "DOCKER_HOST",
Value: "tcp://localhost:2376", Value: "tcp://localhost:2376",
@ -274,6 +278,10 @@ func TestNewRunnerPod(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
}, },
VolumeMounts: []corev1.VolumeMount{ VolumeMounts: []corev1.VolumeMount{
{ {
@ -356,6 +364,10 @@ func TestNewRunnerPod(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
}, },
VolumeMounts: []corev1.VolumeMount{ VolumeMounts: []corev1.VolumeMount{
{ {
@ -649,6 +661,10 @@ func TestNewRunnerPodFromRunnerController(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
{ {
Name: "DOCKER_HOST", Name: "DOCKER_HOST",
Value: "tcp://localhost:2376", Value: "tcp://localhost:2376",
@ -807,6 +823,10 @@ func TestNewRunnerPodFromRunnerController(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
{ {
Name: "RUNNER_NAME", Name: "RUNNER_NAME",
Value: "runner", Value: "runner",
@ -908,6 +928,10 @@ func TestNewRunnerPodFromRunnerController(t *testing.T) {
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: "false", Value: "false",
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: "actions-runner-controller/NA",
},
{ {
Name: "RUNNER_NAME", Name: "RUNNER_NAME",
Value: "runner", Value: "runner",

5
controllers/actions.summerwind.net/runner_controller.go
View File

@ -25,6 +25,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/actions/actions-runner-controller/build"
"github.com/actions/actions-runner-controller/hash" "github.com/actions/actions-runner-controller/hash"
"github.com/go-logr/logr" "github.com/go-logr/logr"
@ -835,6 +836,10 @@ func newRunnerPodWithContainerMode(containerMode string, template corev1.Pod, ru
Name: "RUNNER_STATUS_UPDATE_HOOK", Name: "RUNNER_STATUS_UPDATE_HOOK",
Value: fmt.Sprintf("%v", useRunnerStatusUpdateHook), Value: fmt.Sprintf("%v", useRunnerStatusUpdateHook),
}, },
{
Name: "GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT",
Value: fmt.Sprintf("actions-runner-controller/%s", build.Version),
},
} }
var seLinuxOptions *corev1.SELinuxOptions var seLinuxOptions *corev1.SELinuxOptions