actions/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions/actions-runner-controller.git synced 2026-01-17 17:28:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

better coverage but still more to do

Browse Source
This commit is contained in:
Nikola Jokic
2026-01-16 16:12:39 +01:00
parent a7a4eb481a
commit 600b45b598
3 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
charts/gha-runner-scale-set-dev/templates/_helpers.tpl
View File

@@ -29,8 +29,8 @@ Create the labels for the autoscaling runner set.
{{- define "autoscaling-runner-set.labels" -}} {{- define "autoscaling-runner-set.labels" -}}
{{- $resourceLabels := dict "app.kubernetes.io/component" "autoscaling-runner-set" -}} {{- $resourceLabels := dict "app.kubernetes.io/component" "autoscaling-runner-set" -}}
{{- $commonLabels := include "gha-common-labels" . | fromYaml -}} {{- $commonLabels := include "gha-common-labels" . | fromYaml -}}
{{- $userLabels := include "gha-process-labels" (.Values.resource.autoscalingRunnerSet.metadata.labels | default (dict)) | fromYaml -}} {{- $userLabels := include "apply-non-reserved-gha-labels-and-annotations" (.Values.resource.autoscalingRunnerSet.metadata.labels | default (dict)) | fromYaml -}}
{{- $global := include "gha-process-labels" (.Values.resource.all.metadata.labels | default (dict)) | fromYaml -}} {{- $global := include "apply-non-reserved-gha-labels-and-annotations" (.Values.resource.all.metadata.labels | default (dict)) | fromYaml -}}
{{- toYaml (mergeOverwrite $global $userLabels $resourceLabels $commonLabels) }} {{- toYaml (mergeOverwrite $global $userLabels $resourceLabels $commonLabels) }}
{{- end }} {{- end }}
@@ -52,33 +52,17 @@ actions.github.com/scale-set-namespace: {{ include "autoscaling-runner-set.names
{{/* {{/*
Takes a map of user labels and removes the ones with "actions.github.com/" prefix Takes a map of user labels and removes the ones with "actions.github.com/" prefix
*/}} */}}
{{- define "gha-process-labels" -}} {{- define "apply-non-reserved-gha-labels-and-annotations" -}}
{{- $userLabels := . -}} {{- $userLabels := . -}}
{{- $processed := dict -}} {{- $processed := dict -}}
{{- range $key, $value := $userLabels -}} {{- range $key, $value := $userLabels -}}
{{- if not (hasPrefix $key "actions.github.com/") -}} {{- if not (hasPrefix "actions.github.com/" $key) -}}
{{- $_ := set $processed $key $value -}} {{- $_ := set $processed $key $value -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- $processed | toYaml -}} {{- if not (empty $processed) -}}
{{- $processed | toYaml }}
{{- end }} {{- end }}
{{/*
Takes a map of user annotations and removes reserved ones.
Reserved annotations are managed by ARC/controllers and should not be set by users:
- actions.github.com/cleanup-*
- actions.github.com/values-hash
*/}}
{{- define "gha-process-annotations" -}}
{{- $userAnnotations := . -}}
{{- $processed := dict -}}
{{- range $key, $value := $userAnnotations -}}
{{- if not (or (hasPrefix "actions.github.com/cleanup-" $key) (eq $key "actions.github.com/values-hash")) -}}
{{- $_ := set $processed $key $value -}}
{{- end -}}
{{- end -}}
{{- $processed | toYaml -}}
{{- end }} {{- end }}
{{/* {{/*
@@ -90,11 +74,11 @@ Order of precedence:
Reserved annotations are excluded from both levels. Reserved annotations are excluded from both levels.
*/}} */}}
{{- define "autoscaling-runner-set.annotations" -}} {{- define "autoscaling-runner-set.annotations" -}}
{{- $global := include "gha-process-annotations" (.Values.resource.all.metadata.annotations | default (dict)) | fromYaml -}} {{- $global := (include "apply-non-reserved-gha-labels-and-annotations" (.Values.resource.all.metadata.annotations | default (dict))) | fromYaml -}}
{{- $resource := include "gha-process-annotations" (.Values.resource.autoscalingRunnerSet.metadata.annotations | default (dict)) | fromYaml -}} {{- $resource := (include "apply-non-reserved-gha-labels-and-annotations" (.Values.resource.autoscalingRunnerSet.metadata.annotations | default (dict))) | fromYaml -}}
{{- $annotations := mergeOverwrite $global $resource -}} {{- $annotations := mergeOverwrite $global $resource -}}
{{- range $k, $v := $annotations }} {{- if not (empty $annotations) -}}
{{ $k }}: {{ $v | quote }} {{- toYaml $annotations }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
charts/gha-runner-scale-set-dev/templates/autoscalingrunnserset.yaml
View File

@@ -97,3 +97,6 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: runner
image: {{ .Values.runner.container.image | default "ghcr.io/actions/actions-runner:latest" | quote }}
command: {{ toJson (default (list "/home/runner/run.sh") .Values.runner.container.command) }}

6
charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_labels_test.yaml
View File

@@ -260,9 +260,8 @@ tests:
- equal: - equal:
path: metadata.labels["team"] path: metadata.labels["team"]
value: "backend" value: "backend"
- equal: - notExists:
path: metadata.labels["actions.github.com/custom-label"] path: metadata.labels["actions.github.com/custom-label"]
value: "user-value"
- equal: - equal:
path: metadata.labels["actions.github.com/scale-set-name"] path: metadata.labels["actions.github.com/scale-set-name"]
value: "test-name" value: "test-name"
@@ -287,9 +286,8 @@ tests:
- equal: - equal:
path: metadata.labels["owner"] path: metadata.labels["owner"]
value: "devops" value: "devops"
- equal: - notExists:
path: metadata.labels["actions.github.com/global-custom"] path: metadata.labels["actions.github.com/global-custom"]
value: "global-value"
- equal: - equal:
path: metadata.labels["actions.github.com/scale-set-name"] path: metadata.labels["actions.github.com/scale-set-name"]
value: "test-name" value: "test-name"