Fix runner startup.sh tests

- `should_work_use_disable_once_switch` was failing since the support for --once has been removed a while ago. Removed the test.
- Added `cd` before running `startup.sh` for access to the logger.sh library from within the script
- Included the runner directory into `$PATH` for access to `update-status` from within the script

.github/workflows/gha-e2e-tests.yaml

@@ -16,7 +16,7 @@ env:
   TARGET_ORG: actions-runner-controller
   TARGET_REPO: arc_e2e_test_dummy
   IMAGE_NAME: "arc-test-image"
-  IMAGE_VERSION: "0.6.1"
+  IMAGE_VERSION: "0.6.0"
 
 concurrency:
   # This will make sure we only apply the concurrency limits on pull requests

charts/gha-runner-scale-set-controller/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.1
+version: 0.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.6.1"
+appVersion: "0.6.0"
 
 home: https://github.com/actions/actions-runner-controller
 

charts/gha-runner-scale-set/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.1
+version: 0.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.6.1"
+appVersion: "0.6.0"
 
 home: https://github.com/actions/dev-arc
 

charts/gha-runner-scale-set/templates/_helpers.tpl

@@ -10,10 +10,6 @@ gha-rs
 {{- default (include "gha-base-name" .) .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{- define "gha-runner-scale-set.scale-set-name" -}}
-{{ .Values.runnerScaleSetName | default .Release.Name }}
-{{- end }}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -21,7 +17,7 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "gha-runner-scale-set.fullname" -}}
 {{- $name := default (include "gha-base-name" .) }}
-{{- printf "%s-%s" (include "gha-runner-scale-set.scale-set-name" .) $name | trunc 63 | trimSuffix "-" }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -42,7 +38,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: gha-rs
-actions.github.com/scale-set-name: {{ include "gha-runner-scale-set.scale-set-name" . }}
+actions.github.com/scale-set-name: {{ .Release.Name }}
 actions.github.com/scale-set-namespace: {{ .Release.Namespace }}
 {{- end }}
 
@@ -50,8 +46,8 @@ actions.github.com/scale-set-namespace: {{ .Release.Namespace }}
 Selector labels
 */}}
 {{- define "gha-runner-scale-set.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "gha-runner-scale-set.scale-set-name" . }}
-app.kubernetes.io/instance: {{ include "gha-runner-scale-set.scale-set-name" . }}
+app.kubernetes.io/name: {{ include "gha-runner-scale-set.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{- define "gha-runner-scale-set.githubsecret" -}}

charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml

@@ -1,13 +1,13 @@
 apiVersion: actions.github.com/v1alpha1
 kind: AutoscalingRunnerSet
 metadata:
-  {{- if or (not (include "gha-runner-scale-set.scale-set-name" .)) (gt (len (include "gha-runner-scale-set.scale-set-name" .)) 45) }}
+  {{- if or (not .Release.Name) (gt (len .Release.Name) 45) }}
   {{ fail "Name must have up to 45 characters" }}
   {{- end }}
   {{- if gt (len .Release.Namespace) 63 }}
   {{ fail "Namespace must have up to 63 characters" }}
   {{- end }}
-  name: {{ include "gha-runner-scale-set.scale-set-name" . }}
+  name: {{ .Values.runnerScaleSetName | default .Release.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/component: "autoscaling-runner-set"

charts/gha-runner-scale-set/tests/template_test.go

@@ -330,7 +330,7 @@ func TestTemplateRenderedAutoScalingRunnerSet(t *testing.T) {
 	assert.Equal(t, namespaceName, ars.Namespace)
 	assert.Equal(t, "test-runners", ars.Name)
 
-	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/name"])
+	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/name"])
 	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/instance"])
 	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/part-of"])
 	assert.Equal(t, "autoscaling-runner-set", ars.Labels["app.kubernetes.io/component"])
@@ -361,7 +361,6 @@ func TestTemplateRenderedAutoScalingRunnerSet_RunnerScaleSetName(t *testing.T) {
 	require.NoError(t, err)
 
 	releaseName := "test-runners"
-	nameOverride := "test-runner-scale-set-name"
 	namespaceName := "test-" + strings.ToLower(random.UniqueId())
 
 	options := &helm.Options{
@@ -369,7 +368,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_RunnerScaleSetName(t *testing.T) {
 		SetValues: map[string]string{
 			"githubConfigUrl":                    "https://github.com/actions",
 			"githubConfigSecret.github_token":    "gh_token12345",
-			"runnerScaleSetName":                 nameOverride,
+			"runnerScaleSetName":                 "test-runner-scale-set-name",
 			"controllerServiceAccount.name":      "arc",
 			"controllerServiceAccount.namespace": "arc-system",
 		},
@@ -382,15 +381,12 @@ func TestTemplateRenderedAutoScalingRunnerSet_RunnerScaleSetName(t *testing.T) {
 	helm.UnmarshalK8SYaml(t, output, &ars)
 
 	assert.Equal(t, namespaceName, ars.Namespace)
-	assert.Equal(t, nameOverride, ars.Name)
+	assert.Equal(t, "test-runner-scale-set-name", ars.Name)
 
-	assert.Equal(t, nameOverride, ars.Labels["app.kubernetes.io/name"])
-	assert.Equal(t, nameOverride, ars.Labels["app.kubernetes.io/instance"])
-	assert.Equal(t, nameOverride, ars.Labels["actions.github.com/scale-set-name"])
-	assert.Equal(t, namespaceName, ars.Labels["actions.github.com/scale-set-namespace"])
-	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/part-of"])
+	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/name"])
+	assert.Equal(t, releaseName, ars.Labels["app.kubernetes.io/instance"])
 	assert.Equal(t, "https://github.com/actions", ars.Spec.GitHubConfigUrl)
-	assert.Equal(t, nameOverride+"-gha-rs-github-secret", ars.Spec.GitHubConfigSecret)
+	assert.Equal(t, "test-runners-gha-rs-github-secret", ars.Spec.GitHubConfigSecret)
 	assert.Equal(t, "test-runner-scale-set-name", ars.Spec.RunnerScaleSetName)
 
 	assert.Empty(t, ars.Spec.RunnerGroup, "RunnerGroup should be empty")
@@ -844,7 +840,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_EnableDinD(t *testing.T) {
 	assert.Equal(t, namespaceName, ars.Namespace)
 	assert.Equal(t, "test-runners", ars.Name)
 
-	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/name"])
+	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/name"])
 	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/instance"])
 	assert.Equal(t, "https://github.com/actions", ars.Spec.GitHubConfigUrl)
 	assert.Equal(t, "test-runners-gha-rs-github-secret", ars.Spec.GitHubConfigSecret)
@@ -932,7 +928,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_EnableKubernetesMode(t *testing.T)
 	assert.Equal(t, namespaceName, ars.Namespace)
 	assert.Equal(t, "test-runners", ars.Name)
 
-	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/name"])
+	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/name"])
 	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/instance"])
 	assert.Equal(t, "https://github.com/actions", ars.Spec.GitHubConfigUrl)
 	assert.Equal(t, "test-runners-gha-rs-github-secret", ars.Spec.GitHubConfigSecret)
@@ -1033,7 +1029,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_UsePredefinedSecret(t *testing.T)
 	assert.Equal(t, namespaceName, ars.Namespace)
 	assert.Equal(t, "test-runners", ars.Name)
 
-	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/name"])
+	assert.Equal(t, "gha-rs", ars.Labels["app.kubernetes.io/name"])
 	assert.Equal(t, "test-runners", ars.Labels["app.kubernetes.io/instance"])
 	assert.Equal(t, "https://github.com/actions", ars.Spec.GitHubConfigUrl)
 	assert.Equal(t, "pre-defined-secrets", ars.Spec.GitHubConfigSecret)

controllers/actions.github.com/autoscalinglistener_controller_test.go

@@ -701,155 +701,6 @@ var _ = Describe("Test AutoScalingListener controller with proxy", func() {
 	})
 })
 
-var _ = Describe("Test AutoScalingListener controller with template modification", func() {
-	var ctx context.Context
-	var mgr ctrl.Manager
-	var autoscalingNS *corev1.Namespace
-	var autoscalingRunnerSet *actionsv1alpha1.AutoscalingRunnerSet
-	var configSecret *corev1.Secret
-	var autoscalingListener *actionsv1alpha1.AutoscalingListener
-
-	createRunnerSetAndListener := func(listenerTemplate *corev1.PodTemplateSpec) {
-		min := 1
-		max := 10
-		autoscalingRunnerSet = &actionsv1alpha1.AutoscalingRunnerSet{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test-asrs",
-				Namespace: autoscalingNS.Name,
-			},
-			Spec: actionsv1alpha1.AutoscalingRunnerSetSpec{
-				GitHubConfigUrl:    "https://github.com/owner/repo",
-				GitHubConfigSecret: configSecret.Name,
-				MaxRunners:         &max,
-				MinRunners:         &min,
-				Template: corev1.PodTemplateSpec{
-					Spec: corev1.PodSpec{
-						Containers: []corev1.Container{
-							{
-								Name:  "runner",
-								Image: "ghcr.io/actions/runner",
-							},
-						},
-					},
-				},
-				ListenerTemplate: listenerTemplate,
-			},
-		}
-
-		err := k8sClient.Create(ctx, autoscalingRunnerSet)
-		Expect(err).NotTo(HaveOccurred(), "failed to create AutoScalingRunnerSet")
-
-		autoscalingListener = &actionsv1alpha1.AutoscalingListener{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test-asl",
-				Namespace: autoscalingNS.Name,
-			},
-			Spec: actionsv1alpha1.AutoscalingListenerSpec{
-				GitHubConfigUrl:               "https://github.com/owner/repo",
-				GitHubConfigSecret:            configSecret.Name,
-				RunnerScaleSetId:              1,
-				AutoscalingRunnerSetNamespace: autoscalingRunnerSet.Namespace,
-				AutoscalingRunnerSetName:      autoscalingRunnerSet.Name,
-				EphemeralRunnerSetName:        "test-ers",
-				MaxRunners:                    10,
-				MinRunners:                    1,
-				Image:                         "ghcr.io/owner/repo",
-				Template:                      listenerTemplate,
-			},
-		}
-
-		err = k8sClient.Create(ctx, autoscalingListener)
-		Expect(err).NotTo(HaveOccurred(), "failed to create AutoScalingListener")
-	}
-
-	BeforeEach(func() {
-		ctx = context.Background()
-		autoscalingNS, mgr = createNamespace(GinkgoT(), k8sClient)
-		configSecret = createDefaultSecret(GinkgoT(), k8sClient, autoscalingNS.Name)
-
-		controller := &AutoscalingListenerReconciler{
-			Client: mgr.GetClient(),
-			Scheme: mgr.GetScheme(),
-			Log:    logf.Log,
-		}
-		err := controller.SetupWithManager(mgr)
-		Expect(err).NotTo(HaveOccurred(), "failed to setup controller")
-
-		startManagers(GinkgoT(), mgr)
-	})
-
-	It("Should create listener pod with modified spec", func() {
-		runAsUser1001 := int64(1001)
-		runAsUser1000 := int64(1000)
-		tmpl := &corev1.PodTemplateSpec{
-			ObjectMeta: metav1.ObjectMeta{
-				Annotations: map[string]string{
-					"test-annotation-key": "test-annotation-value",
-				},
-				Labels: map[string]string{
-					"test-label-key": "test-label-value",
-				},
-			},
-			Spec: corev1.PodSpec{
-				Containers: []corev1.Container{
-					{
-						Name:            "listener",
-						ImagePullPolicy: corev1.PullAlways,
-						SecurityContext: &corev1.SecurityContext{
-							RunAsUser: &runAsUser1001,
-						},
-					},
-					{
-						Name:            "sidecar",
-						ImagePullPolicy: corev1.PullIfNotPresent,
-						Image:           "busybox",
-					},
-				},
-				SecurityContext: &corev1.PodSecurityContext{
-					RunAsUser: &runAsUser1000,
-				},
-			},
-		}
-
-		createRunnerSetAndListener(tmpl)
-
-		// wait for listener pod to be created
-		Eventually(
-			func(g Gomega) {
-				pod := new(corev1.Pod)
-				err := k8sClient.Get(
-					ctx,
-					client.ObjectKey{Name: autoscalingListener.Name, Namespace: autoscalingListener.Namespace},
-					pod,
-				)
-				g.Expect(err).NotTo(HaveOccurred(), "failed to get pod")
-
-				g.Expect(pod.ObjectMeta.Annotations).To(HaveKeyWithValue("test-annotation-key", "test-annotation-value"), "pod annotations should be copied from runner set template")
-				g.Expect(pod.ObjectMeta.Labels).To(HaveKeyWithValue("test-label-key", "test-label-value"), "pod labels should be copied from runner set template")
-
-			},
-			autoscalingListenerTestTimeout,
-			autoscalingListenerTestInterval).Should(Succeed(), "failed to create listener pod with proxy details")
-
-		// Delete the AutoScalingListener
-		err := k8sClient.Delete(ctx, autoscalingListener)
-		Expect(err).NotTo(HaveOccurred(), "failed to delete test AutoScalingListener")
-
-		Eventually(
-			func(g Gomega) {
-				var proxySecret corev1.Secret
-				err := k8sClient.Get(
-					ctx,
-					types.NamespacedName{Name: proxyListenerSecretName(autoscalingListener), Namespace: autoscalingNS.Name},
-					&proxySecret,
-				)
-				g.Expect(kerrors.IsNotFound(err)).To(BeTrue())
-			},
-			autoscalingListenerTestTimeout,
-			autoscalingListenerTestInterval).Should(Succeed(), "failed to delete secret with proxy details")
-	})
-})
-
 var _ = Describe("Test GitHub Server TLS configuration", func() {
 	var ctx context.Context
 	var mgr ctrl.Manager

controllers/actions.github.com/resourcebuilder.go

@@ -317,9 +317,7 @@ func (b *resourceBuilder) newScaleSetListenerPod(autoscalingListener *v1alpha1.A
 }
 
 func mergeListenerPodWithTemplate(pod *corev1.Pod, tmpl *corev1.PodTemplateSpec) {
-	if pod.Annotations == nil {
-		pod.Annotations = make(map[string]string)
-	}
+	// apply metadata
 	for k, v := range tmpl.Annotations {
 		if _, ok := pod.Annotations[k]; !ok {
 			pod.Annotations[k] = v

docs/gha-runner-scale-set-controller/README.md

@@ -43,12 +43,6 @@ You can follow [this troubleshooting guide](https://docs.github.com/en/actions/h
 
 ## Changelog
 
-### v0.6.1
-1. Replace TLS dockerd connection with unix socket (#2833)[https://github.com/actions/actions-runner-controller/pull/2833]
-1. Fix name override labels when runnerScaleSetName value is set (#2915)[https://github.com/actions/actions-runner-controller/pull/2915]
-1. Fix nil map when annotations are applied (#2916)[https://github.com/actions/actions-runner-controller/pull/2916]
-1. Updates: container-hooks to v0.4.0 (#2928)[https://github.com/actions/actions-runner-controller/pull/2928]
-
 ### v0.6.0
 1. Fix parsing AcquireJob MessageQueueTokenExpiredError (#2837)[https://github.com/actions/actions-runner-controller/pull/2837]
 1. Set restart policy on the runner pod to Never if restartPolicy is not set in template (#2787)[https://github.com/actions/actions-runner-controller/pull/2787]

runner/Makefile

@@ -7,7 +7,7 @@ OS_IMAGE ?= ubuntu-22.04
 TARGETPLATFORM ?= $(shell arch)
 
 RUNNER_VERSION ?= 2.309.0
-RUNNER_CONTAINER_HOOKS_VERSION ?= 0.4.0
+RUNNER_CONTAINER_HOOKS_VERSION ?= 0.3.2
 DOCKER_VERSION ?= 20.10.23
 
 # default list of platforms for which multiarch image is built

runner/VERSION

@@ -1,2 +1,2 @@
 RUNNER_VERSION=2.309.0
-RUNNER_CONTAINER_HOOKS_VERSION=0.4.0
+RUNNER_CONTAINER_HOOKS_VERSION=0.3.2

runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile

@@ -77,7 +77,9 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \

runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile

@@ -54,7 +54,9 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \

runner/actions-runner-dind.ubuntu-20.04.dockerfile

@@ -72,7 +72,9 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \

runner/actions-runner-dind.ubuntu-22.04.dockerfile

@@ -48,7 +48,9 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \

runner/actions-runner.ubuntu-20.04.dockerfile

@@ -68,7 +68,10 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
+ARG EXTERNALS_DIR_NAME=externalstmp
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \
@@ -77,7 +80,7 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && tar xzf ./runner.tar.gz \
     && rm runner.tar.gz \
     && ./bin/installdependencies.sh \
-    && mv ./externals ./externalstmp \
+    && if [ "${EXTERNALS_DIR_NAME}" != externals ]; then mv ./externals ./${EXTERNALS_DIR_NAME}; fi \
     # libyaml-dev is required for ruby/setup-ruby action.
     # It is installed after installdependencies.sh and before removing /var/lib/apt/lists
     # to avoid rerunning apt-update on its own.

runner/actions-runner.ubuntu-22.04.dockerfile

@@ -45,7 +45,11 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && curl -fLo /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \
     && chmod +x /usr/bin/dumb-init
 
-ENV RUNNER_ASSETS_DIR=/runnertmp
+# Set this to /home/runner for compatibility with v1 runners
+ARG RUNNER_ASSETS_DIR=/runnertmp
+ENV RUNNER_ASSETS_DIR=$RUNNER_ASSETS_DIR
+# Set this to "externals" for compatibility with v1 runners
+ARG EXTERNALS_DIR_NAME=externalstmp
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \
     && mkdir -p "$RUNNER_ASSETS_DIR" \
@@ -54,7 +58,7 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && tar xzf ./runner.tar.gz \
     && rm runner.tar.gz \
     && ./bin/installdependencies.sh \
-    && mv ./externals ./externalstmp \
+    && if [ "${EXTERNALS_DIR_NAME}" != externals ]; then mv ./externals ./${EXTERNALS_DIR_NAME}; fi \
     # libyaml-dev is required for ruby/setup-ruby action.
     # It is installed after installdependencies.sh and before removing /var/lib/apt/lists
     # to avoid rerunning apt-update on its own.

runner/startup.sh

@@ -16,61 +16,6 @@ if [ -n "${STARTUP_DELAY_IN_SECONDS}" ]; then
   sleep "${STARTUP_DELAY_IN_SECONDS}"
 fi
 
-if [ -z "${GITHUB_URL}" ]; then
-  log.debug 'Working with public GitHub'
-  GITHUB_URL="https://github.com/"
-else
-  length=${#GITHUB_URL}
-  last_char=${GITHUB_URL:length-1:1}
-
-  [[ $last_char != "/" ]] && GITHUB_URL="$GITHUB_URL/"; :
-  log.debug "Github endpoint URL ${GITHUB_URL}"
-fi
-
-if [ -z "${RUNNER_NAME}" ]; then
-  log.error 'RUNNER_NAME must be set'
-  exit 1
-fi
-
-if [ -n "${RUNNER_ORG}" ] && [ -n "${RUNNER_REPO}" ] && [ -n "${RUNNER_ENTERPRISE}" ]; then
-  ATTACH="${RUNNER_ORG}/${RUNNER_REPO}"
-elif [ -n "${RUNNER_ORG}" ]; then
-  ATTACH="${RUNNER_ORG}"
-elif [ -n "${RUNNER_REPO}" ]; then
-  ATTACH="${RUNNER_REPO}"
-elif [ -n "${RUNNER_ENTERPRISE}" ]; then
-  ATTACH="enterprises/${RUNNER_ENTERPRISE}"
-else
-  log.error 'At least one of RUNNER_ORG, RUNNER_REPO, or RUNNER_ENTERPRISE must be set'
-  exit 1
-fi
-
-if [ -z "${RUNNER_TOKEN}" ]; then
-  log.error 'RUNNER_TOKEN must be set'
-  exit 1
-fi
-
-if [ -z "${RUNNER_REPO}" ] && [ -n "${RUNNER_GROUP}" ];then
-  RUNNER_GROUPS=${RUNNER_GROUP}
-fi
-
-# Hack due to https://github.com/actions/actions-runner-controller/issues/252#issuecomment-758338483
-if [ ! -d "${RUNNER_HOME}" ]; then
-  log.error "$RUNNER_HOME should be an emptyDir mount. Please fix the pod spec."
-  exit 1
-fi
-
-# if this is not a testing environment
-if [[ "${UNITTEST:-}" == '' ]]; then
-  sudo chown -R runner:docker "$RUNNER_HOME"
-  # enable dotglob so we can copy a ".env" file to load in env vars as part of the service startup if one is provided
-  # loading a .env from the root of the service is part of the actions/runner logic
-  shopt -s dotglob
-  # use cp instead of mv to avoid issues when src and dst are on different devices
-  cp -r "$RUNNER_ASSETS_DIR"/* "$RUNNER_HOME"/
-  shopt -u dotglob
-fi
-
 if ! cd "${RUNNER_HOME}"; then
   log.error "Failed to cd into ${RUNNER_HOME}"
   exit 1
@@ -78,68 +23,138 @@ fi
 
 # past that point, it's all relative pathes from /runner
 
-config_args=()
-if [ "${RUNNER_FEATURE_FLAG_ONCE:-}" != "true" ] && [ "${RUNNER_EPHEMERAL}" == "true" ]; then
-  config_args+=(--ephemeral)
-  log.debug 'Passing --ephemeral to config.sh to enable the ephemeral runner.'
-fi
-if [ "${DISABLE_RUNNER_UPDATE:-}" == "true" ]; then
-  config_args+=(--disableupdate)
-  log.debug 'Passing --disableupdate to config.sh to disable automatic runner updates.'
-fi
+# This is for registering ARC v0 runners.
+# ARC v1 runners do not need config.sh for registering themselves.
+# ARC v1 runners are supposed to given the ACTIONS_RUNNER_INPUT_JITCONFIG envvars
+# so we use it as the trigger to skip config.sh.
+if [ -z "${ACTIONS_RUNNER_INPUT_JITCONFIG:-}" ]; then
+  if [ -z "${GITHUB_URL}" ]; then
+    log.debug 'Working with public GitHub'
+    GITHUB_URL="https://github.com/"
+  else
+    length=${#GITHUB_URL}
+    last_char=${GITHUB_URL:length-1:1}
 
-update-status "Registering"
-
-retries_left=10
-while [[ ${retries_left} -gt 0 ]]; do
-  log.debug 'Configuring the runner.'
-  ./config.sh --unattended --replace \
-    --name "${RUNNER_NAME}" \
-    --url "${GITHUB_URL}${ATTACH}" \
-    --token "${RUNNER_TOKEN}" \
-    --runnergroup "${RUNNER_GROUPS}" \
-    --labels "${RUNNER_LABELS}" \
-    --work "${RUNNER_WORKDIR}" "${config_args[@]}"
-
-  if [ -f .runner ]; then
-    log.debug 'Runner successfully configured.'
-    break
+    [[ $last_char != "/" ]] && GITHUB_URL="$GITHUB_URL/"; :
+    log.debug "Github endpoint URL ${GITHUB_URL}"
   fi
 
-  log.debug 'Configuration failed. Retrying'
-  retries_left=$((retries_left - 1))
-  sleep 1
-done
+  if [ -z "${RUNNER_NAME}" ]; then
+    log.error 'RUNNER_NAME must be set'
+    exit 1
+  fi
 
-if [ ! -f .runner ]; then
-  # we couldn't configure and register the runner; no point continuing
-  log.error 'Configuration failed!'
-  exit 2
+  if [ -n "${RUNNER_ORG}" ] && [ -n "${RUNNER_REPO}" ] && [ -n "${RUNNER_ENTERPRISE}" ]; then
+    ATTACH="${RUNNER_ORG}/${RUNNER_REPO}"
+  elif [ -n "${RUNNER_ORG}" ]; then
+    ATTACH="${RUNNER_ORG}"
+  elif [ -n "${RUNNER_REPO}" ]; then
+    ATTACH="${RUNNER_REPO}"
+  elif [ -n "${RUNNER_ENTERPRISE}" ]; then
+    ATTACH="enterprises/${RUNNER_ENTERPRISE}"
+  else
+    log.error 'At least one of RUNNER_ORG, RUNNER_REPO, or RUNNER_ENTERPRISE must be set'
+    exit 1
+  fi
+
+  if [ -z "${RUNNER_TOKEN}" ]; then
+    log.error 'RUNNER_TOKEN must be set'
+    exit 1
+  fi
+
+  if [ -z "${RUNNER_REPO}" ] && [ -n "${RUNNER_GROUP}" ];then
+    RUNNER_GROUPS=${RUNNER_GROUP}
+  fi
+
+  # Hack due to https://github.com/actions/actions-runner-controller/issues/252#issuecomment-758338483
+  if [ ! -d "${RUNNER_HOME}" ]; then
+    log.error "$RUNNER_HOME should be an emptyDir mount. Please fix the pod spec."
+    exit 1
+  fi
+
+  # if this is not a testing environment
+  if [[ "${UNITTEST:-}" == '' ]]; then
+    sudo chown -R runner:docker "$RUNNER_HOME"
+    # enable dotglob so we can copy a ".env" file to load in env vars as part of the service startup if one is provided
+    # loading a .env from the root of the service is part of the actions/runner logic
+    shopt -s dotglob
+    # use cp instead of mv to avoid issues when src and dst are on different devices
+    cp -r "$RUNNER_ASSETS_DIR"/* "$RUNNER_HOME"/
+    shopt -u dotglob
+  fi
+
+  config_args=()
+  if [ "${RUNNER_FEATURE_FLAG_ONCE:-}" != "true" ] && [ "${RUNNER_EPHEMERAL}" == "true" ]; then
+    config_args+=(--ephemeral)
+    log.debug 'Passing --ephemeral to config.sh to enable the ephemeral runner.'
+  fi
+  if [ "${DISABLE_RUNNER_UPDATE:-}" == "true" ]; then
+    config_args+=(--disableupdate)
+    log.debug 'Passing --disableupdate to config.sh to disable automatic runner updates.'
+  fi
+
+  update-status "Registering"
+
+  retries_left=10
+  while [[ ${retries_left} -gt 0 ]]; do
+    log.debug 'Configuring the runner.'
+    ./config.sh --unattended --replace \
+      --name "${RUNNER_NAME}" \
+      --url "${GITHUB_URL}${ATTACH}" \
+      --token "${RUNNER_TOKEN}" \
+      --runnergroup "${RUNNER_GROUPS}" \
+      --labels "${RUNNER_LABELS}" \
+      --work "${RUNNER_WORKDIR}" "${config_args[@]}"
+
+    if [ -f .runner ]; then
+      log.debug 'Runner successfully configured.'
+      break
+    fi
+
+    log.debug 'Configuration failed. Retrying'
+    retries_left=$((retries_left - 1))
+    sleep 1
+  done
+
+  # Note that ARC v1 runners do create this file, but only after the runner
+  # agent is up and running.
+  # On the other hand, this logic assumes the file to be created BEFORE
+  # the runner is up, by running `config.sh`, which is not present in a v1 runner deployment.
+  # That's why we need to skip this check for v1 runners.
+  # Otherwise v1 runner will never start up due to this check.
+  if [ ! -f .runner ]; then
+    # we couldn't configure and register the runner; no point continuing
+    log.error 'Configuration failed!'
+    exit 2
+  fi
+
+  cat .runner
+  # Note: the `.runner` file's content should be something like the below:
+  #
+  # $ cat /runner/.runner
+  # {
+  # "agentId": 117, #=> corresponds to the ID of the runner
+  # "agentName": "THE_RUNNER_POD_NAME",
+  # "poolId": 1,
+  # "poolName": "Default",
+  # "serverUrl": "https://pipelines.actions.githubusercontent.com/SOME_RANDOM_ID",
+  # "gitHubUrl": "https://github.com/USER/REPO",
+  # "workFolder": "/some/work/dir" #=> corresponds to Runner.Spec.WorkDir
+  # }
+  #
+  # Especially `agentId` is important, as other than listing all the runners in the repo,
+  # this is the only change we could get the exact runnner ID which can be useful for further
+  # GitHub API call like the below. Note that 171 is the agentId seen above.
+  #   curl \
+  #     -H "Accept: application/vnd.github.v3+json" \
+  #     -H "Authorization: bearer ${GITHUB_TOKEN}"
+  #     https://api.github.com/repos/USER/REPO/actions/runners/171
 fi
 
-cat .runner
-# Note: the `.runner` file's content should be something like the below:
-#
-# $ cat /runner/.runner
-# {
-# "agentId": 117, #=> corresponds to the ID of the runner
-# "agentName": "THE_RUNNER_POD_NAME",
-# "poolId": 1,
-# "poolName": "Default",
-# "serverUrl": "https://pipelines.actions.githubusercontent.com/SOME_RANDOM_ID",
-# "gitHubUrl": "https://github.com/USER/REPO",
-# "workFolder": "/some/work/dir" #=> corresponds to Runner.Spec.WorkDir
-# }
-#
-# Especially `agentId` is important, as other than listing all the runners in the repo,
-# this is the only change we could get the exact runnner ID which can be useful for further
-# GitHub API call like the below. Note that 171 is the agentId seen above.
-#   curl \
-#     -H "Accept: application/vnd.github.v3+json" \
-#     -H "Authorization: bearer ${GITHUB_TOKEN}"
-#     https://api.github.com/repos/USER/REPO/actions/runners/171
-
 # Hack due to the DinD volumes
+# This is necessary only for legacy ARC v0.x.
+# ARC v1.x uses the "externals" as the copy source and "tmpDir" as the copy destionation.
+# See https://github.com/actions/actions-runner-controller/blob/91c8991835016f8c6568f101d4a28185baec3dcc/charts/gha-runner-scale-set/templates/_helpers.tpl#L76-L87
 if [ -z "${UNITTEST:-}" ] && [ -e ./externalstmp ]; then
   mkdir -p ./externals
   mv ./externalstmp/* ./externals/

test/startup/should_retry_configuring/test.sh

@@ -15,7 +15,7 @@ startup_log() {
 }
 
 log "Setting up test area"
-export RUNNER_HOME=testarea
+export RUNNER_HOME=$(pwd)/testarea
 mkdir -p ${RUNNER_HOME}
 
 log "Setting up the test config"
@@ -49,7 +49,9 @@ log ""
 
 # Run the runner startup script which as a final step runs this
 # unit tests run.sh as it was symlinked
-../../../runner/startup.sh 2> >(startup_log)
+cd ../../../runner
+export PATH=${PATH}:$(pwd)
+./startup.sh 2> >(startup_log)
 
 if [ "$?" != "2" ]; then
   error "========================================="

test/startup/should_work_non_ephemeral/test.sh

@@ -15,7 +15,7 @@ startup_log() {
 }
 
 log "Setting up test area"
-export RUNNER_HOME=testarea
+export RUNNER_HOME=$(pwd)/testarea
 mkdir -p ${RUNNER_HOME}
 
 log "Setting up the test"
@@ -49,7 +49,9 @@ log ""
 
 # Run the runner entrypstartupoint script which as a final step runs this
 # unit tests run.sh as it was symlinked
-../../../runner/startup.sh 2> >(startup_log)
+cd ../../../runner
+export PATH=${PATH}:$(pwd)
+./startup.sh 2> >(startup_log)
 
 if [ "$?" != "0" ]; then
   error "==========================================="

test/startup/should_work_normally/test.sh

@@ -15,7 +15,7 @@ startup_log() {
 }
 
 log "Setting up test area"
-export RUNNER_HOME=testarea
+export RUNNER_HOME=$(pwd)/testarea
 mkdir -p ${RUNNER_HOME}
 
 log "Setting up the test"
@@ -47,7 +47,9 @@ log ""
 
 # Run the runner startup script which as a final step runs this
 # unit tests run.sh as it was symlinked
-../../../runner/startup.sh 2> >(startup_log)
+cd ../../../runner
+export PATH=${PATH}:$(pwd)
+./startup.sh 2> >(startup_log)
 
 if [ "$?" != "0" ]; then
   error "=========================="

test/startup/should_work_use_disable_update_switch/test.sh

@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-
-# UNITTEST: should work disable update
-# Will simulate a scneario where disableupdate=true. expects:
-# - the configuration step to be run exactly once
-# - the startup script to exit with no error
-# - the config.sh script to run with the --disableupdate flag set to 'true'.
-
-source ../assets/logging.sh
-
-startup_log() {
-  while read I; do
-    printf "\tstartup.sh: $I\n"
-  done
-}
-
-log "Setting up test area"
-export RUNNER_HOME=testarea
-mkdir -p ${RUNNER_HOME}
-
-log "Setting up the test"
-export UNITTEST=true
-export RUNNER_NAME="example_runner_name"
-export RUNNER_REPO="myorg/myrepo"
-export RUNNER_TOKEN="xxxxxxxxxxxxx"
-export DISABLE_RUNNER_UPDATE="true"
-
-# run.sh and config.sh get used by the runner's real entrypoint.sh and are part of actions/runner.
-# We change symlink dummy versions so the entrypoint.sh can run allowing us to test the real entrypoint.sh
-log "Symlink dummy config.sh and run.sh"
-ln -s ../../assets/config.sh ${RUNNER_HOME}/config.sh
-ln -s ../../assets/run.sh ${RUNNER_HOME}/run.sh
-
-cleanup() {
-  rm -rf ${RUNNER_HOME}
-  unset UNITTEST
-  unset RUNNERHOME
-  unset RUNNER_NAME
-  unset RUNNER_REPO
-  unset RUNNER_TOKEN
-}
-
-# Always run cleanup when test ends regardless of how it ends
-trap cleanup SIGINT SIGTERM SIGQUIT EXIT
-
-log "Running the startup script"
-log ""
-
-# run.sh and config.sh get used by the runner's real startup.sh and are part of actions/runner.
-# We change symlink dummy versions so the startup.sh can run allowing us to test the real entrypoint.sh
-../../../runner/startup.sh 2> >(startup_log)
-
-if [ "$?" != "0" ]; then
-  error "=========================="
-  error "FAIL | Test completed with errors"
-  exit 1
-fi
-
-log "Testing if the configuration step was run only once"
-count=`cat ${RUNNER_HOME}/counter || echo "not_found"`
-if [ ${count} != "1" ]; then
-  error "==============================================="
-  error "FAIL | The configuration step was not run exactly once"
-  exit 1
-fi
-success "PASS | The configuration ran ${count} time(s)"
-
-log "Testing if the configuration included the --disableupdate flag"
-if ! grep -q -- '--disableupdate' ${RUNNER_HOME}/runner_config; then
-  error "==============================================="
-  error "FAIL | The configuration should not include the --disableupdate flag"
-  exit 1
-fi
-
-success "PASS | The --disableupdate switch was included in the configuration"
-
-log "Testing if run.sh ran"
-if [ ! -f "${RUNNER_HOME}/run_sh_ran" ]; then
-  error "=============================="
-  error "FAIL | The runner service has not run"
-  exit 1
-fi
-
-success "PASS | run.sh ran"
-success ""
-success "==========================="
-success "Test completed successfully"