diff --git a/Makefile b/Makefile index 5a2ba48a..684f13e7 100644 --- a/Makefile +++ b/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.316.0 +RUNNER_VERSION ?= 2.316.1 TARGETPLATFORM ?= $(shell arch) RUNNER_NAME ?= ${DOCKER_USER}/actions-runner RUNNER_TAG ?= ${VERSION} diff --git a/main.go b/main.go index 284920da..cfe14c6c 100644 --- a/main.go +++ b/main.go @@ -256,7 +256,7 @@ func main() { if err = (&actionsgithubcom.AutoscalingRunnerSetReconciler{ Client: mgr.GetClient(), - Log: log.WithName("AutoscalingRunnerSet"), + Log: log.WithName("AutoscalingRunnerSet").WithValues("version", build.Version), Scheme: mgr.GetScheme(), ControllerNamespace: managerNamespace, DefaultRunnerScaleSetListenerImage: managerImage, @@ -270,7 +270,7 @@ func main() { if err = (&actionsgithubcom.EphemeralRunnerReconciler{ Client: mgr.GetClient(), - Log: log.WithName("EphemeralRunner"), + Log: log.WithName("EphemeralRunner").WithValues("version", build.Version), Scheme: mgr.GetScheme(), ActionsClient: actionsMultiClient, }).SetupWithManager(mgr); err != nil { @@ -280,7 +280,7 @@ func main() { if err = (&actionsgithubcom.EphemeralRunnerSetReconciler{ Client: mgr.GetClient(), - Log: log.WithName("EphemeralRunnerSet"), + Log: log.WithName("EphemeralRunnerSet").WithValues("version", build.Version), Scheme: mgr.GetScheme(), ActionsClient: actionsMultiClient, PublishMetrics: metricsAddr != "0", @@ -291,7 +291,7 @@ func main() { if err = (&actionsgithubcom.AutoscalingListenerReconciler{ Client: mgr.GetClient(), - Log: log.WithName("AutoscalingListener"), + Log: log.WithName("AutoscalingListener").WithValues("version", build.Version), Scheme: mgr.GetScheme(), ListenerMetricsAddr: listenerMetricsAddr, ListenerMetricsEndpoint: listenerMetricsEndpoint, @@ -441,7 +441,7 @@ func main() { } } - log.Info("starting manager") + log.Info("starting manager", "version", build.Version) if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil { log.Error(err, "problem running manager") os.Exit(1) diff --git a/runner/Makefile b/runner/Makefile index 7e835dfc..26ece35c 100644 --- a/runner/Makefile +++ b/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.316.0 +RUNNER_VERSION ?= 2.316.1 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.6.0 DOCKER_VERSION ?= 24.0.7 diff --git a/runner/VERSION b/runner/VERSION index ffba9673..f62551d8 100644 --- a/runner/VERSION +++ b/runner/VERSION @@ -1,2 +1,2 @@ -RUNNER_VERSION=2.316.0 +RUNNER_VERSION=2.316.1 RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 \ No newline at end of file diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index f0773bf3..12173fa5 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -36,7 +36,7 @@ var ( testResultCMNamePrefix = "test-result-" - RunnerVersion = "2.316.0" + RunnerVersion = "2.316.1" RunnerContainerHooksVersion = "0.6.0" )