DevFW-CICD/forgejo-helm
16
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename value to forgejo.runner

Browse source
This commit is contained in:
Stefan Bethke 2024-09-11 13:37:54 +02:00
parent ea0df61a98
commit 7004fb8271
6 changed files with 52 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -1122,14 +1122,14 @@ blocks, while the keys themselves remain in all caps.
The chart can deploy an [Actions Runner](https://forgejo.org/docs/latest/admin/actions/#forgejo-runner). The chart can deploy an [Actions Runner](https://forgejo.org/docs/latest/admin/actions/#forgejo-runner).
The **Runner Configuration** `forgejo_runner.config` is simply the contents of the The **Runner Configuration** `forgejo.runner.config` is simply the contents of the
[runner config file](https://forgejo.codeberg.page/docs/v1.20/admin/actions/#configuration). [runner config file](https://forgejo.codeberg.page/docs/v1.20/admin/actions/#configuration).
Make sure to specify at least one label so that workflows can find the runner. Make sure to specify at least one label so that workflows can find the runner.
Default runner config: Default runner config:
```yaml ```yaml
forgejo_runner: forgejo.runner:
__config: __config:
____runner: ____runner:
______labels: ______labels:
@ -1138,14 +1138,14 @@ ________- docker:docker://node:16-bullseye
| Name | Description | Value | | Name | Description | Value |
| --------------------------------------- | ------------------------------------------------------------------------------------------ | ------------------ | | --------------------------------------- | ------------------------------------------------------------------------------------------ | ------------------ |
| `forgejo_runner.config` | contents of runner's config.yaml | `{}` | | `forgejo.runner.config` | contents of runner's config.yaml | `{}` |
| `forgejo_runner.enabled` | Enable automatic deployment of a runner | `false` | | `forgejo.runner.enabled` | Enable automatic deployment of a runner | `false` |
| `forgejo_runner.image.registry` | Image registry, e.g. gcr.io,docker.io | `code.forgejo.org` | | `forgejo.runner.image.registry` | Image registry, e.g. gcr.io,docker.io | `code.forgejo.org` |
| `forgejo_runner.image.repository` | Image to start for this pod | `forgejo/runner` | | `forgejo.runner.image.repository` | Image to start for this pod | `forgejo/runner` |
| `forgejo_runner.image.tag` | Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/runner/versions). | `3.5.1` | | `forgejo.runner.image.tag` | Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/runner/versions). | `3.5.1` |
| `forgejo_runner.image.pullPolicy` | Overrides the pull policy set globally for actions runners | `IfNotPresent` | | `forgejo.runner.image.pullPolicy` | Overrides the pull policy set globally for actions runners | `IfNotPresent` |
| `forgejo_runner.registrationSecretName` | Name of secret containing the registration secret. If unset, the chart will create one | `nil` | | `forgejo.runner.registrationSecretName` | Name of secret containing the registration secret. If unset, the chart will create one | `nil` |
| `forgejo_runner.replicas` | Number of replicas to automatically deploy | `1` | | `forgejo.runner.replicas` | Number of replicas to automatically deploy | `1` |
### Redis® Cluster ### Redis® Cluster

16
templates/_helpers.tpl
View file

@ -67,9 +67,9 @@ Create image name and tag used by the deployment.
Create image name and tag used by the actions runner. Create image name and tag used by the actions runner.
*/}} */}}
{{- define "gitea.actions-image" -}} {{- define "gitea.actions-image" -}}
{{- $registry := .Values.forgejo_runner.image.registry | default (.Values.global.imageRegistry | default .Values.image.registry) -}} {{- $registry := .Values.forgejo.runner.image.registry | default (.Values.global.imageRegistry | default .Values.image.registry) -}}
{{- $name := .Values.forgejo_runner.image.repository -}} {{- $name := .Values.forgejo.runner.image.repository -}}
{{- $tag := .Values.forgejo_runner.image.tag -}} {{- $tag := .Values.forgejo.runner.image.tag -}}
{{- if $registry -}} {{- if $registry -}}
{{- printf "%s/%s:%s" $registry $name $tag -}} {{- printf "%s/%s:%s" $registry $name $tag -}}
{{- else -}} {{- else -}}
@ -125,19 +125,19 @@ app.kubernetes.io/instance: {{ .Release.Name }}
{{/* {{/*
Actions runner labels Actions runner labels
*/}} */}}
{{- define "forgejo_runner.labels" -}} {{- define "forgejo.runner.labels" -}}
helm.sh/chart: {{ include "gitea.chart" . }} helm.sh/chart: {{ include "gitea.chart" . }}
app: actions-runner app: actions-runner
{{ include "forgejo_runner.selectorLabels" . }} {{ include "forgejo.runner.selectorLabels" . }}
app.kubernetes.io/version: {{ .Values.forgejo_runner.image.tag | quote }} app.kubernetes.io/version: {{ .Values.forgejo.runner.image.tag | quote }}
version: {{ .Values.forgejo_runner.image.tag | quote }} version: {{ .Values.forgejo.runner.image.tag | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}} {{- end -}}
{{/* {{/*
Actions runner selector labels Actions runner selector labels
*/}} */}}
{{- define "forgejo_runner.selectorLabels" -}} {{- define "forgejo.runner.selectorLabels" -}}
app.kubernetes.io/name: actions-runner app.kubernetes.io/name: actions-runner
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}} {{- end -}}

4
templates/gitea/runner-config.yaml
View file

@ -1,9 +1,9 @@
{{- if .Values.forgejo_runner.enabled -}} {{- if .Values.forgejo.runner.enabled -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "gitea.fullname" . }}-runner name: {{ include "gitea.fullname" . }}-runner
data: data:
config.yaml: | config.yaml: |
{{ toYaml .Values.forgejo_runner.config | indent 4 }} {{ toYaml .Values.forgejo.runner.config | indent 4 }}
{{- end }} {{- end }}

2
templates/gitea/runner-secret.yaml
View file

@ -9,7 +9,7 @@ while the rest is the actual secret. It is possible to update the
secret of an existing runner by running the command again on the secret of an existing runner by running the command again on the
Forgejo machine, with the last 24 characters updated. Forgejo machine, with the last 24 characters updated.
*/}} */}}
{{- if and (.Values.forgejo_runner.enabled) (not .Values.forgejo_runner.registrationSecretName) -}} {{- if and (.Values.forgejo.runner.enabled) (not .Values.forgejo.runner.registrationSecretName) -}}
{{- $secretName := printf "%s-%s" (include "gitea.fullname" .) "runner-registration" -}} {{- $secretName := printf "%s-%s" (include "gitea.fullname" .) "runner-registration" -}}
{{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName -}} {{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
{{- if not $secret }} {{- if not $secret }}

14
templates/gitea/runner.yaml
View file

@ -1,20 +1,20 @@
{{- if .Values.forgejo_runner.enabled -}} {{- if .Values.forgejo.runner.enabled -}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "gitea.fullname" . }}-runner name: {{ include "gitea.fullname" . }}-runner
labels: labels:
{{- include "forgejo_runner.labels" . | nindent 4 }} {{- include "forgejo.runner.labels" . | nindent 4 }}
spec: spec:
replicas: {{ .Values.forgejo_runner.replicas }} replicas: {{ .Values.forgejo.runner.replicas }}
selector: selector:
matchLabels: matchLabels:
{{- include "forgejo_runner.selectorLabels" . | nindent 6 }} {{- include "forgejo.runner.selectorLabels" . | nindent 6 }}
serviceName: {{ include "gitea.fullname" . }}-runner serviceName: {{ include "gitea.fullname" . }}-runner
template: template:
metadata: metadata:
labels: labels:
{{- include "forgejo_runner.labels" . | nindent 8 }} {{- include "forgejo.runner.labels" . | nindent 8 }}
spec: spec:
{{- if .Values.schedulerName }} {{- if .Values.schedulerName }}
schedulerName: "{{ .Values.schedulerName }}" schedulerName: "{{ .Values.schedulerName }}"
@ -28,7 +28,7 @@ spec:
initContainers: initContainers:
- name: configure-runner - name: configure-runner
image: "{{ include "gitea.actions-image" . }}" image: "{{ include "gitea.actions-image" . }}"
imagePullPolicy: {{ default .Values.image.pullPolicy .Values.forgejo_runner.image.pullPolicy }} imagePullPolicy: {{ default .Values.image.pullPolicy .Values.forgejo.runner.image.pullPolicy }}
command: [ "forgejo-runner" ] command: [ "forgejo-runner" ]
args: args:
- "create-runner-file" - "create-runner-file"
@ -45,7 +45,7 @@ spec:
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ include "gitea.actions-image" . }}" image: "{{ include "gitea.actions-image" . }}"
imagePullPolicy: {{ default .Values.image.pullPolicy .Values.forgejo_runner.image.pullPolicy }} imagePullPolicy: {{ default .Values.image.pullPolicy .Values.forgejo.runner.image.pullPolicy }}
env: env:
- name: DOCKER_HOST - name: DOCKER_HOST
value: tcp://localhost:2376 value: tcp://localhost:2376

47
values.yaml
View file

@ -635,41 +635,42 @@ gitea:
## @section Forgejo Runner ## @section Forgejo Runner
## @descriptionStart The chart can deploy an [Actions Runner](https://forgejo.org/docs/latest/admin/actions/#forgejo-runner). ## @descriptionStart The chart can deploy an [Actions Runner](https://forgejo.org/docs/latest/admin/actions/#forgejo-runner).
## ##
## The **Runner Configuration** `forgejo_runner.config` is simply the contents of the ## The **Runner Configuration** `forgejo.runner.config` is simply the contents of the
## [runner config file](https://forgejo.codeberg.page/docs/v1.20/admin/actions/#configuration). ## [runner config file](https://forgejo.codeberg.page/docs/v1.20/admin/actions/#configuration).
## Make sure to specify at least one label so that workflows can find the runner. ## Make sure to specify at least one label so that workflows can find the runner.
## ##
## Default runner config: ## Default runner config:
## ##
## ```yaml ## ```yaml
## forgejo_runner: ## forgejo.runner:
## __config: ## __config:
## ____runner: ## ____runner:
## ______labels: ## ______labels:
## ________- docker:docker://node:16-bullseye ## ________- docker:docker://node:16-bullseye
## ``` ## ```
## @descriptionEnd ## @descriptionEnd
## @param forgejo_runner.config [object] contents of runner's config.yaml ## @param forgejo.runner.config [object] contents of runner's config.yaml
## @param forgejo_runner.enabled Enable automatic deployment of a runner ## @param forgejo.runner.enabled Enable automatic deployment of a runner
## @param forgejo_runner.image.registry Image registry, e.g. gcr.io,docker.io ## @param forgejo.runner.image.registry Image registry, e.g. gcr.io,docker.io
## @param forgejo_runner.image.repository Image to start for this pod ## @param forgejo.runner.image.repository Image to start for this pod
## @param forgejo_runner.image.tag Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/runner/versions). ## @param forgejo.runner.image.tag Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/runner/versions).
## @param forgejo_runner.image.pullPolicy Overrides the pull policy set globally for actions runners ## @param forgejo.runner.image.pullPolicy Overrides the pull policy set globally for actions runners
## @param forgejo_runner.registrationSecretName Name of secret containing the registration secret. If unset, the chart will create one ## @param forgejo.runner.registrationSecretName Name of secret containing the registration secret. If unset, the chart will create one
## @param forgejo_runner.replicas Number of replicas to automatically deploy ## @param forgejo.runner.replicas Number of replicas to automatically deploy
forgejo_runner: forgejo:
enabled: false runner:
config: enabled: false
runner: config:
labels: runner:
- docker:docker://node:16-bullseye labels:
image: - docker:docker://node:16-bullseye
registry: code.forgejo.org image:
repository: forgejo/runner registry: code.forgejo.org
tag: 3.5.1 repository: forgejo/runner
pullPolicy: IfNotPresent tag: 3.5.1
registrationSecretName: ~ pullPolicy: IfNotPresent
replicas: 1 registrationSecretName: ~
replicas: 1
## @section Redis® Cluster ## @section Redis® Cluster
## @descriptionStart ## @descriptionStart