mirror of
https://github.com/actions/actions-runner-controller.git
synced 2025-12-11 12:06:57 +00:00
Compare commits
6 Commits
gha-runner
...
nikola-jok
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c29cd65f4 | ||
|
|
dbac55ca9e | ||
|
|
91d45d870a | ||
|
|
4d22089978 | ||
|
|
8007b8af25 | ||
|
|
0baa4f6b09 |
2
.github/workflows/arc-release-runners.yaml
vendored
2
.github/workflows/arc-release-runners.yaml
vendored
@@ -1,4 +1,6 @@
|
|||||||
name: Release ARC Runner Images
|
name: Release ARC Runner Images
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
# Revert to https://github.com/actions-runner-controller/releases#releases
|
# Revert to https://github.com/actions-runner-controller/releases#releases
|
||||||
# for details on why we use this approach
|
# for details on why we use this approach
|
||||||
|
|||||||
6
.github/workflows/global-run-codeql.yaml
vendored
6
.github/workflows/global-run-codeql.yaml
vendored
@@ -33,12 +33,12 @@ jobs:
|
|||||||
go-version-file: go.mod
|
go-version-file: go.mod
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@v3
|
uses: github/codeql-action/init@v4
|
||||||
with:
|
with:
|
||||||
languages: go, actions
|
languages: go, actions
|
||||||
|
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@v3
|
uses: github/codeql-action/autobuild@v4
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@v3
|
uses: github/codeql-action/analyze@v4
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions/first-interaction@main
|
- uses: actions/first-interaction@v3
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
issue-message: |
|
issue_message: |
|
||||||
Hello! Thank you for filing an issue.
|
Hello! Thank you for filing an issue.
|
||||||
|
|
||||||
The maintainers will triage your issue shortly.
|
The maintainers will triage your issue shortly.
|
||||||
@@ -28,7 +28,7 @@ jobs:
|
|||||||
In the meantime, please take a look at the [troubleshooting guide](https://github.com/actions/actions-runner-controller/blob/master/TROUBLESHOOTING.md) for bug reports.
|
In the meantime, please take a look at the [troubleshooting guide](https://github.com/actions/actions-runner-controller/blob/master/TROUBLESHOOTING.md) for bug reports.
|
||||||
|
|
||||||
If this is a feature request, please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md).
|
If this is a feature request, please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md).
|
||||||
pr-message: |
|
pr_message: |
|
||||||
Hello! Thank you for your contribution.
|
Hello! Thank you for your contribution.
|
||||||
|
|
||||||
Please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md) to understand the project's testing and code conventions.
|
Please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md) to understand the project's testing and code conventions.
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -6,7 +6,7 @@ endif
|
|||||||
DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
|
DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
|
||||||
VERSION ?= dev
|
VERSION ?= dev
|
||||||
COMMIT_SHA = $(shell git rev-parse HEAD)
|
COMMIT_SHA = $(shell git rev-parse HEAD)
|
||||||
RUNNER_VERSION ?= 2.328.0
|
RUNNER_VERSION ?= 2.329.0
|
||||||
TARGETPLATFORM ?= $(shell arch)
|
TARGETPLATFORM ?= $(shell arch)
|
||||||
RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
||||||
RUNNER_TAG ?= ${VERSION}
|
RUNNER_TAG ?= ${VERSION}
|
||||||
@@ -307,7 +307,7 @@ github-release: release
|
|||||||
# Otherwise we get errors like the below:
|
# Otherwise we get errors like the below:
|
||||||
# Error: failed to install CRD crds/actions.summerwind.dev_runnersets.yaml: CustomResourceDefinition.apiextensions.k8s.io "runnersets.actions.summerwind.dev" is invalid: [spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[containers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property, spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[initContainers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property]
|
# Error: failed to install CRD crds/actions.summerwind.dev_runnersets.yaml: CustomResourceDefinition.apiextensions.k8s.io "runnersets.actions.summerwind.dev" is invalid: [spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[containers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property, spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[initContainers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property]
|
||||||
#
|
#
|
||||||
# Note that controller-gen newer than 0.7.0 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
|
# Note that controller-gen newer than 0.8.0 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
|
||||||
# Otherwise ObjectMeta embedded in Spec results in empty on the storage.
|
# Otherwise ObjectMeta embedded in Spec results in empty on the storage.
|
||||||
controller-gen:
|
controller-gen:
|
||||||
ifeq (, $(shell which controller-gen))
|
ifeq (, $(shell which controller-gen))
|
||||||
|
|||||||
33
charts/dev/Chart.yaml
Normal file
33
charts/dev/Chart.yaml
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
apiVersion: v2
|
||||||
|
name: gha-runner-scale-set
|
||||||
|
description: A Helm chart for deploying an AutoScalingRunnerSet
|
||||||
|
|
||||||
|
# A chart can be either an 'application' or a 'library' chart.
|
||||||
|
#
|
||||||
|
# Application charts are a collection of templates that can be packaged into versioned archives
|
||||||
|
# to be deployed.
|
||||||
|
#
|
||||||
|
# Library charts provide useful utilities or functions for the chart developer. They're included as
|
||||||
|
# a dependency of application charts to inject those utilities and functions into the rendering
|
||||||
|
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
|
||||||
|
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.13.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.13.0"
|
||||||
|
|
||||||
|
home: https://github.com/actions/actions-runner-controller
|
||||||
|
|
||||||
|
sources:
|
||||||
|
- "https://github.com/actions/actions-runner-controller"
|
||||||
|
|
||||||
|
maintainers:
|
||||||
|
- name: actions
|
||||||
|
url: https://github.com/actions
|
||||||
20
charts/dev/templates/_helpers.tpl
Normal file
20
charts/dev/templates/_helpers.tpl
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{{- define "autoscaling-runner-set.name" -}}
|
||||||
|
{{- $name := .Values.runnerScaleSetName | default .Release.Name | replace "_" "-" | trimSuffix "-" }}
|
||||||
|
{{- if or (empty $name) (gt (len $name) 45) }}
|
||||||
|
{{ fail "Autoscaling runner set name must have up to 45 characters" }}
|
||||||
|
{{- end }}
|
||||||
|
{{- $name }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- define "autoscaling-runner-set.namespace" -}}
|
||||||
|
{{- .Values.namespaceOverride | default .Release.Namespace -}}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
|
||||||
|
{{- define "githubsecret.name" -}}
|
||||||
|
{{- if not (empty .Values.auth.secretName) }}
|
||||||
|
{{- quote .Values.auth.secretName }}
|
||||||
|
{{- else }}
|
||||||
|
{{- include "autoscaling-runner-set.name" . }}-github-secret
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
94
charts/dev/templates/autoscalingrunnserset.yaml
Normal file
94
charts/dev/templates/autoscalingrunnserset.yaml
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
apiVersion: actions.github.com/v1alpha1
|
||||||
|
kind: AutoscalingRunnerSet
|
||||||
|
metadata:
|
||||||
|
name: {{ include "autoscaling-runner-set.name" . | quote }}
|
||||||
|
namespace: {{ include "autoscaling-runner-set.namespace" . | quote }}
|
||||||
|
spec:
|
||||||
|
githubConfigUrl: {{ required ".Values.auth.url is required" (trimSuffix "/" .Values.auth.url) | quote }}
|
||||||
|
githubConfigSecret: {{ include "githubsecret.name" . | quote }}
|
||||||
|
runnerGroup: {{ .Values.scaleset.runnerGroup | quote }}
|
||||||
|
|
||||||
|
{{- if .Values.githubServerTLS }}
|
||||||
|
githubServerTLS:
|
||||||
|
{{- with .Values.githubServerTLS.certificateFrom }}
|
||||||
|
certificateFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: {{ .configMapKeyRef.name }}
|
||||||
|
key: {{ .configMapKeyRef.key }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if and .Values.keyVault .Values.keyVault.type }}
|
||||||
|
vaultConfig:
|
||||||
|
type: {{ .Values.keyVault.type }}
|
||||||
|
{{- if .Values.keyVault.proxy }}
|
||||||
|
proxy: {{- toYaml .Values.keyVault.proxy | nindent 6 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if eq .Values.keyVault.type "azure_key_vault" }}
|
||||||
|
azureKeyVault:
|
||||||
|
url: {{ .Values.keyVault.azureKeyVault.url }}
|
||||||
|
tenantId: {{ .Values.keyVault.azureKeyVault.tenantId }}
|
||||||
|
clientId: {{ .Values.keyVault.azureKeyVault.clientId }}
|
||||||
|
certificatePath: {{ .Values.keyVault.azureKeyVault.certificatePath }}
|
||||||
|
secretKey: {{ .Values.keyVault.azureKeyVault.secretKey }}
|
||||||
|
{{- else }}
|
||||||
|
{{- fail "Unsupported keyVault type: " .Values.keyVault.type }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if .Values.proxy }}
|
||||||
|
proxy:
|
||||||
|
{{- if .Values.proxy.http }}
|
||||||
|
http:
|
||||||
|
url: {{ .Values.proxy.http.url }}
|
||||||
|
{{- if .Values.proxy.http.credentialSecretRef }}
|
||||||
|
credentialSecretRef: {{ .Values.proxy.http.credentialSecretRef }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.proxy.https }}
|
||||||
|
https:
|
||||||
|
url: {{ .Values.proxy.https.url }}
|
||||||
|
{{- if .Values.proxy.https.credentialSecretRef }}
|
||||||
|
credentialSecretRef: {{ .Values.proxy.https.credentialSecretRef }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if and .Values.proxy.noProxy (kindIs "slice" .Values.proxy.noProxy) }}
|
||||||
|
noProxy: {{ .Values.proxy.noProxy | toYaml | nindent 6}}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if and (or (kindIs "int64" .Values.scaleset.minRunners) (kindIs "float64" .Values.scaleset.minRunners)) (or (kindIs "int64" .Values.scaleset.maxRunners) (kindIs "float64" .Values.scaleset.maxRunners)) }}
|
||||||
|
{{- if gt .Values.scaleset.minRunners .Values.scaleset.maxRunners }}
|
||||||
|
{{- fail "maxRunners has to be greater or equal to minRunners" }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if or (kindIs "int64" .Values.scaleset.maxRunners) (kindIs "float64" .Values.scaleset.maxRunners)}}
|
||||||
|
{{- if lt (.Values.scaleset.maxRunners | int) 0 }}
|
||||||
|
{{- fail "maxRunners has to be greater or equal to 0" }}
|
||||||
|
{{- end }}
|
||||||
|
maxRunners: {{ .Values.scaleset.maxRunners | int }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if or (kindIs "int64" .Values.scaleset.minRunners) (kindIs "float64" .Values.scaleset.minRunners) }}
|
||||||
|
{{- if lt (.Values.scaleset.minRunners | int) 0 }}
|
||||||
|
{{- fail "minRunners has to be greater or equal to 0" }}
|
||||||
|
{{- end }}
|
||||||
|
minRunners: {{ .Values.scaleset.minRunners | int }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- with .Values.listenerPodTemplate }}
|
||||||
|
listenerTemplate:
|
||||||
|
{{- toYaml . | nindent 4}}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- with .Values.listenerMetrics }}
|
||||||
|
listenerMetrics:
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: runner
|
||||||
|
{{- include "runner-container-spec" . | nindent 10 }}
|
||||||
276
charts/dev/values.yaml
Normal file
276
charts/dev/values.yaml
Normal file
@@ -0,0 +1,276 @@
|
|||||||
|
## By default .Release.namespace is used
|
||||||
|
namespaceOverride: ""
|
||||||
|
# Name of the scaleset
|
||||||
|
scaleset:
|
||||||
|
name: ""
|
||||||
|
runnerGroup: "default"
|
||||||
|
## minRunners is the min number of idle runners. The target number of runners created will be
|
||||||
|
## calculated as a sum of minRunners and the number of jobs assigned to the scale set.
|
||||||
|
# min_runners: 0
|
||||||
|
## maxRunners is the max number of runners the autoscaling runner set will scale up to.
|
||||||
|
# max_runners: 5
|
||||||
|
|
||||||
|
# Auth object provides authorization parameters.
|
||||||
|
# You should apply either:
|
||||||
|
# 1) secretName referencing the secret containing authorization parameters in the same namespace where the scale set is being installed in
|
||||||
|
# 2) app object parameters
|
||||||
|
# 3) github_tokne
|
||||||
|
#
|
||||||
|
# If multiple of them are set, only single one will be applied based on the above mentioned order.
|
||||||
|
auth:
|
||||||
|
url: "" # Required
|
||||||
|
githubToken: ""
|
||||||
|
secretName: ""
|
||||||
|
app:
|
||||||
|
clientId: ""
|
||||||
|
installationId: ""
|
||||||
|
privateKey: ""
|
||||||
|
#
|
||||||
|
## proxy can be used to define proxy settings that will be used by the
|
||||||
|
## controller, the listener and the runner of this scale set.
|
||||||
|
#
|
||||||
|
# proxy:
|
||||||
|
# http:
|
||||||
|
# url: http://proxy.com:1234
|
||||||
|
# credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
|
||||||
|
# https:
|
||||||
|
# url: http://proxy.com:1234
|
||||||
|
# credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
|
||||||
|
# noProxy:
|
||||||
|
# - example.com
|
||||||
|
# - example.org
|
||||||
|
|
||||||
|
## listenerTemplate is the PodSpec for each listener Pod
|
||||||
|
## For reference: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
|
||||||
|
# listenerPodTemplate:
|
||||||
|
# spec:
|
||||||
|
# containers:
|
||||||
|
# # Use this section to append additional configuration to the listener container.
|
||||||
|
# # If you change the name of the container, the configuration will not be applied to the listener,
|
||||||
|
# # and it will be treated as a side-car container.
|
||||||
|
# - name: listener
|
||||||
|
# securityContext:
|
||||||
|
# runAsUser: 1000
|
||||||
|
# # Use this section to add the configuration of a side-car container.
|
||||||
|
# # Comment it out or remove it if you don't need it.
|
||||||
|
# # Spec for this container will be applied as is without any modifications.
|
||||||
|
# - name: side-car
|
||||||
|
# image: example-sidecar
|
||||||
|
|
||||||
|
# Template applied for the runner container
|
||||||
|
runner:
|
||||||
|
# metadata:
|
||||||
|
# labels: []
|
||||||
|
# annotations: []
|
||||||
|
|
||||||
|
# container field is applied to the container named "runner". You cannot override the name of the runner container
|
||||||
|
container:
|
||||||
|
image: "ghcr.io/actions/actions-runner:latest"
|
||||||
|
command: ["/home/runner/run.sh"]
|
||||||
|
|
||||||
|
dind:
|
||||||
|
# If default is set to true, we will expand the default spec for the `dind` container, and you can provide fields to override them
|
||||||
|
default: true
|
||||||
|
|
||||||
|
kubernetesMode:
|
||||||
|
default: true
|
||||||
|
serviceAccountName: ""
|
||||||
|
extension: {}
|
||||||
|
## A self-signed CA certificate for communication with the GitHub server can be
|
||||||
|
## provided using a config map key selector. If `runnerMountPath` is set, for
|
||||||
|
## each runner pod ARC will:
|
||||||
|
## - create a `github-server-tls-cert` volume containing the certificate
|
||||||
|
## specified in `certificateFrom`
|
||||||
|
## - mount that volume on path `runnerMountPath`/{certificate name}
|
||||||
|
## - set NODE_EXTRA_CA_CERTS environment variable to that same path
|
||||||
|
## - set RUNNER_UPDATE_CA_CERTS environment variable to "1" (as of version
|
||||||
|
## 2.303.0 this will instruct the runner to reload certificates on the host)
|
||||||
|
##
|
||||||
|
## If any of the above had already been set by the user in the runner pod
|
||||||
|
## template, ARC will observe those and not overwrite them.
|
||||||
|
## Example configuration:
|
||||||
|
#
|
||||||
|
# githubServerTLS:
|
||||||
|
# certificateFrom:
|
||||||
|
# configMapKeyRef:
|
||||||
|
# name: config-map-name
|
||||||
|
# key: ca.crt
|
||||||
|
# runnerMountPath: /usr/local/share/ca-certificates/
|
||||||
|
|
||||||
|
## keyVault object if applied switches from the kubernetes secrets to the vault provider defined in `keyVault.type`
|
||||||
|
## Secret name is used to resolve the secret inside the vault
|
||||||
|
# keyVault:
|
||||||
|
# Available values: "azure_key_vault"
|
||||||
|
# type: ""
|
||||||
|
# Configuration related to azure key vault
|
||||||
|
# azure_key_vault:
|
||||||
|
# url: ""
|
||||||
|
# client_id: ""
|
||||||
|
# tenant_id: ""
|
||||||
|
# certificate_path: ""
|
||||||
|
# proxy:
|
||||||
|
# http:
|
||||||
|
# url: http://proxy.com:1234
|
||||||
|
# credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
|
||||||
|
# https:
|
||||||
|
# url: http://proxy.com:1234
|
||||||
|
# credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
|
||||||
|
# noProxy:
|
||||||
|
# - example.com
|
||||||
|
# - example.org
|
||||||
|
|
||||||
|
## listenerMetrics are configurable metrics applied to the listener.
|
||||||
|
## In order to avoid helm merging these fields, we left the metrics commented out.
|
||||||
|
## When configuring metrics, please uncomment the listenerMetrics object below.
|
||||||
|
## You can modify the configuration to remove the label or specify custom buckets for histogram.
|
||||||
|
##
|
||||||
|
## If the buckets field is not specified, the default buckets will be applied. Default buckets are
|
||||||
|
## provided here for documentation purposes
|
||||||
|
# listenerMetrics:
|
||||||
|
# counters:
|
||||||
|
# gha_started_jobs_total:
|
||||||
|
# labels:
|
||||||
|
# ["repository", "organization", "enterprise", "job_name", "event_name", "job_workflow_ref", "job_workflow_name", "job_workflow_target"]
|
||||||
|
# gha_completed_jobs_total:
|
||||||
|
# labels:
|
||||||
|
# [
|
||||||
|
# "repository",
|
||||||
|
# "organization",
|
||||||
|
# "enterprise",
|
||||||
|
# "job_name",
|
||||||
|
# "event_name",
|
||||||
|
# "job_result",
|
||||||
|
# "job_workflow_ref",
|
||||||
|
# "job_workflow_name",
|
||||||
|
# "job_workflow_target",
|
||||||
|
# ]
|
||||||
|
# gauges:
|
||||||
|
# gha_assigned_jobs:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_running_jobs:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_registered_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_busy_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_min_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_max_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_desired_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# gha_idle_runners:
|
||||||
|
# labels: ["name", "namespace", "repository", "organization", "enterprise"]
|
||||||
|
# histograms:
|
||||||
|
# gha_job_startup_duration_seconds:
|
||||||
|
# labels:
|
||||||
|
# ["repository", "organization", "enterprise", "job_name", "event_name","job_workflow_ref", "job_workflow_name", "job_workflow_target"]
|
||||||
|
# buckets:
|
||||||
|
# [
|
||||||
|
# 0.01,
|
||||||
|
# 0.05,
|
||||||
|
# 0.1,
|
||||||
|
# 0.5,
|
||||||
|
# 1.0,
|
||||||
|
# 2.0,
|
||||||
|
# 3.0,
|
||||||
|
# 4.0,
|
||||||
|
# 5.0,
|
||||||
|
# 6.0,
|
||||||
|
# 7.0,
|
||||||
|
# 8.0,
|
||||||
|
# 9.0,
|
||||||
|
# 10.0,
|
||||||
|
# 12.0,
|
||||||
|
# 15.0,
|
||||||
|
# 18.0,
|
||||||
|
# 20.0,
|
||||||
|
# 25.0,
|
||||||
|
# 30.0,
|
||||||
|
# 40.0,
|
||||||
|
# 50.0,
|
||||||
|
# 60.0,
|
||||||
|
# 70.0,
|
||||||
|
# 80.0,
|
||||||
|
# 90.0,
|
||||||
|
# 100.0,
|
||||||
|
# 110.0,
|
||||||
|
# 120.0,
|
||||||
|
# 150.0,
|
||||||
|
# 180.0,
|
||||||
|
# 210.0,
|
||||||
|
# 240.0,
|
||||||
|
# 300.0,
|
||||||
|
# 360.0,
|
||||||
|
# 420.0,
|
||||||
|
# 480.0,
|
||||||
|
# 540.0,
|
||||||
|
# 600.0,
|
||||||
|
# 900.0,
|
||||||
|
# 1200.0,
|
||||||
|
# 1800.0,
|
||||||
|
# 2400.0,
|
||||||
|
# 3000.0,
|
||||||
|
# 3600.0,
|
||||||
|
# ]
|
||||||
|
# gha_job_execution_duration_seconds:
|
||||||
|
# labels:
|
||||||
|
# [
|
||||||
|
# "repository",
|
||||||
|
# "organization",
|
||||||
|
# "enterprise",
|
||||||
|
# "job_name",
|
||||||
|
# "event_name",
|
||||||
|
# "job_result",
|
||||||
|
# "job_workflow_ref",
|
||||||
|
# "job_workflow_name",
|
||||||
|
# "job_workflow_target"
|
||||||
|
# ]
|
||||||
|
# buckets:
|
||||||
|
# [
|
||||||
|
# 0.01,
|
||||||
|
# 0.05,
|
||||||
|
# 0.1,
|
||||||
|
# 0.5,
|
||||||
|
# 1.0,
|
||||||
|
# 2.0,
|
||||||
|
# 3.0,
|
||||||
|
# 4.0,
|
||||||
|
# 5.0,
|
||||||
|
# 6.0,
|
||||||
|
# 7.0,
|
||||||
|
# 8.0,
|
||||||
|
# 9.0,
|
||||||
|
# 10.0,
|
||||||
|
# 12.0,
|
||||||
|
# 15.0,
|
||||||
|
# 18.0,
|
||||||
|
# 20.0,
|
||||||
|
# 25.0,
|
||||||
|
# 30.0,
|
||||||
|
# 40.0,
|
||||||
|
# 50.0,
|
||||||
|
# 60.0,
|
||||||
|
# 70.0,
|
||||||
|
# 80.0,
|
||||||
|
# 90.0,
|
||||||
|
# 100.0,
|
||||||
|
# 110.0,
|
||||||
|
# 120.0,
|
||||||
|
# 150.0,
|
||||||
|
# 180.0,
|
||||||
|
# 210.0,
|
||||||
|
# 240.0,
|
||||||
|
# 300.0,
|
||||||
|
# 360.0,
|
||||||
|
# 420.0,
|
||||||
|
# 480.0,
|
||||||
|
# 540.0,
|
||||||
|
# 600.0,
|
||||||
|
# 900.0,
|
||||||
|
# 1200.0,
|
||||||
|
# 1800.0,
|
||||||
|
# 2400.0,
|
||||||
|
# 3000.0,
|
||||||
|
# 3600.0,
|
||||||
|
# ]
|
||||||
@@ -19,6 +19,7 @@ package actionsgithubcom
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/go-logr/logr"
|
"github.com/go-logr/logr"
|
||||||
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
@@ -84,14 +85,14 @@ func (r *AutoscalingListenerReconciler) Reconcile(ctx context.Context, req ctrl.
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Deleting resources")
|
log.Info("Deleting resources")
|
||||||
done, err := r.cleanupResources(ctx, autoscalingListener, log)
|
requeue, err := r.cleanupResources(ctx, autoscalingListener, log)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err, "Failed to cleanup resources after deletion")
|
log.Error(err, "Failed to cleanup resources after deletion")
|
||||||
return ctrl.Result{}, err
|
return ctrl.Result{}, err
|
||||||
}
|
}
|
||||||
if !done {
|
if requeue {
|
||||||
log.Info("Waiting for resources to be deleted before removing finalizer")
|
log.Info("Waiting for resources to be deleted before removing finalizer")
|
||||||
return ctrl.Result{Requeue: true}, nil
|
return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Removing finalizer")
|
log.Info("Removing finalizer")
|
||||||
@@ -272,7 +273,7 @@ func (r *AutoscalingListenerReconciler) Reconcile(ctx context.Context, req ctrl.
|
|||||||
return ctrl.Result{}, nil
|
return ctrl.Result{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (done bool, err error) {
|
func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (requeue bool, err error) {
|
||||||
logger.Info("Cleaning up the listener pod")
|
logger.Info("Cleaning up the listener pod")
|
||||||
listenerPod := new(corev1.Pod)
|
listenerPod := new(corev1.Pod)
|
||||||
err = r.Get(ctx, types.NamespacedName{Name: autoscalingListener.Name, Namespace: autoscalingListener.Namespace}, listenerPod)
|
err = r.Get(ctx, types.NamespacedName{Name: autoscalingListener.Name, Namespace: autoscalingListener.Namespace}, listenerPod)
|
||||||
@@ -284,7 +285,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener pod: %w", err)
|
return false, fmt.Errorf("failed to delete listener pod: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case kerrors.IsNotFound(err):
|
case kerrors.IsNotFound(err):
|
||||||
_ = r.publishRunningListener(autoscalingListener, false) // If error is returned, we never published metrics so it is safe to ignore
|
_ = r.publishRunningListener(autoscalingListener, false) // If error is returned, we never published metrics so it is safe to ignore
|
||||||
default:
|
default:
|
||||||
@@ -302,7 +303,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener config secret: %w", err)
|
return false, fmt.Errorf("failed to delete listener config secret: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case !kerrors.IsNotFound(err):
|
case !kerrors.IsNotFound(err):
|
||||||
return false, fmt.Errorf("failed to get listener config secret: %w", err)
|
return false, fmt.Errorf("failed to get listener config secret: %w", err)
|
||||||
}
|
}
|
||||||
@@ -319,7 +320,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener proxy secret: %w", err)
|
return false, fmt.Errorf("failed to delete listener proxy secret: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case !kerrors.IsNotFound(err):
|
case !kerrors.IsNotFound(err):
|
||||||
return false, fmt.Errorf("failed to get listener proxy secret: %w", err)
|
return false, fmt.Errorf("failed to get listener proxy secret: %w", err)
|
||||||
}
|
}
|
||||||
@@ -336,7 +337,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener role binding: %w", err)
|
return false, fmt.Errorf("failed to delete listener role binding: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case !kerrors.IsNotFound(err):
|
case !kerrors.IsNotFound(err):
|
||||||
return false, fmt.Errorf("failed to get listener role binding: %w", err)
|
return false, fmt.Errorf("failed to get listener role binding: %w", err)
|
||||||
}
|
}
|
||||||
@@ -352,7 +353,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener role: %w", err)
|
return false, fmt.Errorf("failed to delete listener role: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case !kerrors.IsNotFound(err):
|
case !kerrors.IsNotFound(err):
|
||||||
return false, fmt.Errorf("failed to get listener role: %w", err)
|
return false, fmt.Errorf("failed to get listener role: %w", err)
|
||||||
}
|
}
|
||||||
@@ -369,13 +370,13 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
|
|||||||
return false, fmt.Errorf("failed to delete listener service account: %w", err)
|
return false, fmt.Errorf("failed to delete listener service account: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false, nil
|
requeue = true
|
||||||
case !kerrors.IsNotFound(err):
|
case !kerrors.IsNotFound(err):
|
||||||
return false, fmt.Errorf("failed to get listener service account: %w", err)
|
return false, fmt.Errorf("failed to get listener service account: %w", err)
|
||||||
}
|
}
|
||||||
logger.Info("Listener service account is deleted")
|
logger.Info("Listener service account is deleted")
|
||||||
|
|
||||||
return true, nil
|
return requeue, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *AutoscalingListenerReconciler) createServiceAccountForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) {
|
func (r *AutoscalingListenerReconciler) createServiceAccountForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
|
|||||||
OS_IMAGE ?= ubuntu-22.04
|
OS_IMAGE ?= ubuntu-22.04
|
||||||
TARGETPLATFORM ?= $(shell arch)
|
TARGETPLATFORM ?= $(shell arch)
|
||||||
|
|
||||||
RUNNER_VERSION ?= 2.328.0
|
RUNNER_VERSION ?= 2.329.0
|
||||||
RUNNER_CONTAINER_HOOKS_VERSION ?= 0.7.0
|
RUNNER_CONTAINER_HOOKS_VERSION ?= 0.8.0
|
||||||
DOCKER_VERSION ?= 24.0.7
|
DOCKER_VERSION ?= 24.0.7
|
||||||
|
|
||||||
# default list of platforms for which multiarch image is built
|
# default list of platforms for which multiarch image is built
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
RUNNER_VERSION=2.328.0
|
RUNNER_VERSION=2.329.0
|
||||||
RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
|
RUNNER_CONTAINER_HOOKS_VERSION=0.8.0
|
||||||
@@ -36,8 +36,8 @@ var (
|
|||||||
|
|
||||||
testResultCMNamePrefix = "test-result-"
|
testResultCMNamePrefix = "test-result-"
|
||||||
|
|
||||||
RunnerVersion = "2.328.0"
|
RunnerVersion = "2.329.0"
|
||||||
RunnerContainerHooksVersion = "0.7.0"
|
RunnerContainerHooksVersion = "0.8.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
// If you're willing to run this test via VS Code "run test" or "debug test",
|
// If you're willing to run this test via VS Code "run test" or "debug test",
|
||||||
|
|||||||
Reference in New Issue
Block a user