Updates: runner to v2.333.0 (#4412)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Makefile

@@ -6,7 +6,7 @@ endif
 DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
 VERSION ?= dev
 COMMIT_SHA = $(shell git rev-parse HEAD)
-RUNNER_VERSION ?= 2.332.0
+RUNNER_VERSION ?= 2.333.0
 TARGETPLATFORM ?= $(shell arch)
 RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
 RUNNER_TAG  ?= ${VERSION}

charts/gha-runner-scale-set-experimental/templates/autoscalingrunnserset.yaml

@@ -175,68 +175,44 @@ spec:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.autoscalingListener.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.autoscalingListener.metadata }}
   autoscalingListener:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.listenerServiceAccount.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.listenerServiceAccount.metadata }}
   listenerServiceAccountMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.listenerRole.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.listenerRole.metadata }}
   listenerRoleMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.listenerRoleBinding.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.listenerRoleBinding.metadata }}
   listenerRoleBindingMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.listenerConfigSecret.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.listenerConfigSecret.metadata }}
   listenerConfigSecretMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.ephemeralRunnerSet.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.ephemeralRunnerSet.metadata }}
   ephemeralRunnerSetMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.ephemeralRunner.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.ephemeralRunner.metadata }}
   ephemeralRunnerMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
-  {{- $meta := .Values.resource.ephemeralRunnerConfigSecret.metadata | default dict }}
-  {{- $lbls := $meta.labels | default dict }}
-  {{- $anns := $meta.annotations | default dict }}
-  {{- if or (not (empty $lbls)) (not (empty $anns)) }}
+  {{- with .Values.resource.ephemeralRunnerConfigSecret.metadata }}
   ephemeralRunnerConfigSecretMetadata:
-    {{- include "autoscaling-runner-set.spec-resource-metadata" $meta | nindent 4 }}
+    {{- include "autoscaling-runner-set.spec-resource-metadata" . | nindent 4 }}
   {{- end }}
 
   template:

charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_resource_meta_omission_test.yaml

@@ -1,432 +0,0 @@
-suite: "Test AutoscalingRunnerSet ResourceMeta Omission"
-templates:
-  - autoscalingrunnserset.yaml
-tests:
-  - it: should omit all ResourceMeta fields when metadata is empty
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - notExists:
-          path: spec.autoscalingListener
-      - notExists:
-          path: spec.listenerServiceAccountMetadata
-      - notExists:
-          path: spec.listenerRoleMetadata
-      - notExists:
-          path: spec.listenerRoleBindingMetadata
-      - notExists:
-          path: spec.listenerConfigSecretMetadata
-      - notExists:
-          path: spec.ephemeralRunnerSetMetadata
-      - notExists:
-          path: spec.ephemeralRunnerMetadata
-      - notExists:
-          path: spec.ephemeralRunnerConfigSecretMetadata
-
-  - it: should render autoscalingListener when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        autoscalingListener:
-          metadata:
-            labels:
-              listener-key: "listener-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.autoscalingListener.labels.listener-key
-          value: "listener-value"
-      - notExists:
-          path: spec.listenerServiceAccountMetadata
-
-  - it: should render autoscalingListener when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        autoscalingListener:
-          metadata:
-            annotations:
-              listener-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.autoscalingListener.annotations.listener-ann
-          value: "ann-value"
-      - notExists:
-          path: spec.listenerServiceAccountMetadata
-
-  - it: should render listenerServiceAccountMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerServiceAccount:
-          metadata:
-            labels:
-              sa-key: "sa-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerServiceAccountMetadata.labels.sa-key
-          value: "sa-value"
-      - notExists:
-          path: spec.autoscalingListener
-      - notExists:
-          path: spec.listenerRoleMetadata
-
-  - it: should render listenerServiceAccountMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerServiceAccount:
-          metadata:
-            annotations:
-              sa-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerServiceAccountMetadata.annotations.sa-ann
-          value: "ann-value"
-      - notExists:
-          path: spec.autoscalingListener
-
-  - it: should render listenerRoleMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerRole:
-          metadata:
-            labels:
-              role-key: "role-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerRoleMetadata.labels.role-key
-          value: "role-value"
-      - notExists:
-          path: spec.autoscalingListener
-
-  - it: should render listenerRoleMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerRole:
-          metadata:
-            annotations:
-              role-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerRoleMetadata.annotations.role-ann
-          value: "ann-value"
-
-  - it: should render listenerRoleBindingMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerRoleBinding:
-          metadata:
-            labels:
-              rolebinding-key: "rolebinding-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerRoleBindingMetadata.labels.rolebinding-key
-          value: "rolebinding-value"
-
-  - it: should render listenerRoleBindingMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerRoleBinding:
-          metadata:
-            annotations:
-              rolebinding-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerRoleBindingMetadata.annotations.rolebinding-ann
-          value: "ann-value"
-
-  - it: should render listenerConfigSecretMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerConfigSecret:
-          metadata:
-            labels:
-              secret-key: "secret-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerConfigSecretMetadata.labels.secret-key
-          value: "secret-value"
-
-  - it: should render listenerConfigSecretMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerConfigSecret:
-          metadata:
-            annotations:
-              secret-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerConfigSecretMetadata.annotations.secret-ann
-          value: "ann-value"
-
-  - it: should render ephemeralRunnerSetMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunnerSet:
-          metadata:
-            labels:
-              runner-set-key: "runner-set-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerSetMetadata.labels.runner-set-key
-          value: "runner-set-value"
-
-  - it: should render ephemeralRunnerSetMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunnerSet:
-          metadata:
-            annotations:
-              runner-set-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerSetMetadata.annotations.runner-set-ann
-          value: "ann-value"
-
-  - it: should render ephemeralRunnerMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunner:
-          metadata:
-            labels:
-              runner-key: "runner-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerMetadata.labels.runner-key
-          value: "runner-value"
-
-  - it: should render ephemeralRunnerMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunner:
-          metadata:
-            annotations:
-              runner-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerMetadata.annotations.runner-ann
-          value: "ann-value"
-
-  - it: should render ephemeralRunnerConfigSecretMetadata when labels are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunnerConfigSecret:
-          metadata:
-            labels:
-              runner-config-key: "runner-config-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerConfigSecretMetadata.labels.runner-config-key
-          value: "runner-config-value"
-
-  - it: should render ephemeralRunnerConfigSecretMetadata when annotations are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        ephemeralRunnerConfigSecret:
-          metadata:
-            annotations:
-              runner-config-ann: "ann-value"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.ephemeralRunnerConfigSecretMetadata.annotations.runner-config-ann
-          value: "ann-value"
-
-  - it: should render mixed populated and empty ResourceMeta fields correctly
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        autoscalingListener:
-          metadata:
-            labels:
-              listener: "true"
-        listenerServiceAccount:
-          metadata:
-            annotations:
-              sa-ann: "true"
-        ephemeralRunner:
-          metadata:
-            labels:
-              runner: "true"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.autoscalingListener.labels.listener
-          value: "true"
-      - equal:
-          path: spec.listenerServiceAccountMetadata.annotations.sa-ann
-          value: "true"
-      - equal:
-          path: spec.ephemeralRunnerMetadata.labels.runner
-          value: "true"
-      - notExists:
-          path: spec.listenerRoleMetadata
-      - notExists:
-          path: spec.listenerRoleBindingMetadata
-      - notExists:
-          path: spec.listenerConfigSecretMetadata
-      - notExists:
-          path: spec.ephemeralRunnerSetMetadata
-      - notExists:
-          path: spec.ephemeralRunnerConfigSecretMetadata
-
-  - it: should render both labels and annotations when both are populated
-    set:
-      scaleset.name: "test"
-      auth.url: "https://github.com/org"
-      auth.githubToken: "gh_token12345"
-      controllerServiceAccount.name: "arc"
-      controllerServiceAccount.namespace: "arc-system"
-      resource:
-        listenerServiceAccount:
-          metadata:
-            labels:
-              team: "platform"
-            annotations:
-              owner: "devops"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.listenerServiceAccountMetadata.labels.team
-          value: "platform"
-      - equal:
-          path: spec.listenerServiceAccountMetadata.annotations.owner
-          value: "devops"

docs/deploying-arc-runners.md

@@ -70,7 +70,7 @@ Fields like `volumeClaimTemplates` that originates from `StatefulSet` should als
 
 Pod-related fields like security contexts and volumes are written under `spec.template.spec` like `StatefulSet`.
 
-Similarly, container-related fields like resource requests and limits, container image names and tags, security context, and so on are written under `spec.template.spec.containers`. There are two reserved container `name`, `runner` and `docker`. The former is for the container that runs [actions runner](https://github.com/actions/runner) and the latter is for the container that runs a `dockerd`.
+Similarly, container-related fields like resource requests and limits, container image names and tags, security context, and so on are written under `spec.template.spec.containers`. There are two reserved container names, `runner` and `docker`. The former is for the container that runs [actions runner](https://github.com/actions/runner) and the latter is for the container that runs a `dockerd`.
 
 For a more complex example, see the below:
 

runner/Makefile

@@ -6,7 +6,7 @@ DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
 OS_IMAGE ?= ubuntu-22.04
 TARGETPLATFORM ?= $(shell arch)
 
-RUNNER_VERSION ?= 2.332.0
+RUNNER_VERSION ?= 2.333.0
 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.8.1
 DOCKER_VERSION ?= 28.0.4
 

runner/VERSION

@@ -1,2 +1,2 @@
-RUNNER_VERSION=2.332.0
+RUNNER_VERSION=2.333.0
 RUNNER_CONTAINER_HOOKS_VERSION=0.8.1

test/e2e/e2e_test.go

@@ -36,7 +36,7 @@ var (
 
 	testResultCMNamePrefix = "test-result-"
 
-	RunnerVersion               = "2.332.0"
+	RunnerVersion               = "2.333.0"
 	RunnerContainerHooksVersion = "0.8.1"
 )