volker.raschek/helm-actions
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

refactor: use gitea.actions for global defines (#10)

Browse Source 
### Description of the change

Just moves all defines under a new gitea.actions prefix.

### Additional information

Reduce possibility to cause a name clash with the helm-gitea chart if both would be included in a single helm chart installation.

Reviewed-on: https://gitea.com/gitea/helm-actions/pulls/10
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Christopher Homberger <christopher.homberger@web.de>
Co-committed-by: Christopher Homberger <christopher.homberger@web.de>
This commit is contained in:
Christopher Homberger
2025-04-09 19:33:45 +00:00
committed by Lunny Xiao
parent 490e690e09
commit 41c4bf1bc7
9 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
templates/_helpers.tpl
View File

@ -3,7 +3,7 @@
Expand the name of the chart. Expand the name of the chart.
*/}} */}}
{{- define "gitea.name" -}} {{- define "gitea.actions.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
@ -12,7 +12,7 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name. If release name contains chart name it will be used as a full name.
*/}} */}}
{{- define "gitea.fullname" -}} {{- define "gitea.actions.fullname" -}}
{{- if .Values.fullnameOverride -}} {{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}} {{- else -}}
@ -28,21 +28,21 @@ If release name contains chart name it will be used as a full name.
{{/* {{/*
Create a default worker name. Create a default worker name.
*/}} */}}
{{- define "gitea.workername" -}} {{- define "gitea.actions.workername" -}}
{{- printf "%s-%s" .global.Release.Name .worker | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .global.Release.Name .worker | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/* {{/*
Create chart name and version as used by the chart label. Create chart name and version as used by the chart label.
*/}} */}}
{{- define "gitea.chart" -}} {{- define "gitea.actions.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/* {{/*
Create image name and tag used by the deployment. Create image name and tag used by the deployment.
*/}} */}}
{{- define "gitea.image" -}} {{- define "gitea.actions.image" -}}
{{- $fullOverride := .Values.image.fullOverride | default "" -}} {{- $fullOverride := .Values.image.fullOverride | default "" -}}
{{- $registry := .Values.global.imageRegistry | default .Values.image.registry -}} {{- $registry := .Values.global.imageRegistry | default .Values.image.registry -}}
{{- $repository := .Values.image.repository -}} {{- $repository := .Values.image.repository -}}
@ -65,7 +65,7 @@ Create image name and tag used by the deployment.
{{/* {{/*
Storage Class Storage Class
*/}} */}}
{{- define "gitea.persistence.storageClass" -}} {{- define "gitea.actions.persistence.storageClass" -}}
{{- $storageClass := (tpl ( default "" .Values.persistence.storageClass) .) | default (tpl ( default "" .Values.global.storageClass) .) }} {{- $storageClass := (tpl ( default "" .Values.persistence.storageClass) .) | default (tpl ( default "" .Values.global.storageClass) .) }}
{{- if $storageClass }} {{- if $storageClass }}
storageClassName: {{ $storageClass | quote }} storageClassName: {{ $storageClass | quote }}
@ -75,19 +75,19 @@ storageClassName: {{ $storageClass | quote }}
{{/* {{/*
Common labels Common labels
*/}} */}}
{{- define "gitea.labels" -}} {{- define "gitea.actions.labels" -}}
helm.sh/chart: {{ include "gitea.chart" . }} helm.sh/chart: {{ include "gitea.actions.chart" . }}
app: {{ include "gitea.name" . }} app: {{ include "gitea.actions.name" . }}
{{ include "gitea.selectorLabels" . }} {{ include "gitea.actions.selectorLabels" . }}
app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}} {{- end -}}
{{- define "gitea.labels.actRunner" -}} {{- define "gitea.actions.labels.actRunner" -}}
helm.sh/chart: {{ include "gitea.chart" . }} helm.sh/chart: {{ include "gitea.actions.chart" . }}
app: {{ include "gitea.name" . }}-act-runner app: {{ include "gitea.actions.name" . }}-act-runner
{{ include "gitea.selectorLabels.actRunner" . }} {{ include "gitea.actions.selectorLabels.actRunner" . }}
app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
@ -96,25 +96,25 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{/* {{/*
Selector labels Selector labels
*/}} */}}
{{- define "gitea.selectorLabels" -}} {{- define "gitea.actions.selectorLabels" -}}
app.kubernetes.io/name: {{ include "gitea.name" . }} app.kubernetes.io/name: {{ include "gitea.actions.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}} {{- end -}}
{{- define "gitea.selectorLabels.actRunner" -}} {{- define "gitea.actions.selectorLabels.actRunner" -}}
app.kubernetes.io/name: {{ include "gitea.name" . }}-act-runner app.kubernetes.io/name: {{ include "gitea.actions.name" . }}-act-runner
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}} {{- end -}}
{{- define "gitea.act_runner.local_root_url" -}} {{- define "gitea.actions.local_root_url" -}}
{{- .Values.giteaRootURL -}} {{- .Values.giteaRootURL -}}
{{- end -}} {{- end -}}
{{/* {{/*
Parse the http url to hostname + port separated by space for the nc command Parse the http url to hostname + port separated by space for the nc command
*/}} */}}
{{- define "gitea.act_runner.nc" -}} {{- define "gitea.actions.nc" -}}
{{- $url := include "gitea.act_runner.local_root_url" . | urlParse -}} {{- $url := include "gitea.actions.local_root_url" . | urlParse -}}
{{- $host := get $url "host" -}} {{- $host := get $url "host" -}}
{{- $scheme := get $url "scheme" -}} {{- $scheme := get $url "scheme" -}}
{{- $port := "80" -}} {{- $port := "80" -}}

4
templates/config-act-runner.yaml
View File

@ -3,10 +3,10 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "gitea.fullname" . }}-act-runner-config name: {{ include "gitea.actions.fullname" . }}-act-runner-config
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
data: data:
config.yaml: | config.yaml: |
{{- with .Values.statefulset.actRunner.config -}} {{- with .Values.statefulset.actRunner.config -}}

4
templates/config-scripts.yaml
View File

@ -4,10 +4,10 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "gitea.fullname" . }}-scripts name: {{ include "gitea.actions.fullname" . }}-scripts
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
data: data:
{{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }} {{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }}
{{- end }} {{- end }}

14
templates/job.yaml
View File

@ -1,7 +1,7 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }} {{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }}
{{- $name := include "gitea.workername" (dict "global" . "worker" "actions-token-job") }} {{- $name := include "gitea.actions.workername" (dict "global" . "worker" "actions-token-job") }}
{{- $secretName := include "gitea.workername" (dict "global" . "worker" "actions-token") }} {{- $secretName := include "gitea.actions.workername" (dict "global" . "worker" "actions-token") }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
@ -9,7 +9,7 @@ metadata:
name: {{ $name }} name: {{ $name }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
{{- with .Values.provisioning.labels }} {{- with .Values.provisioning.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@ -23,7 +23,7 @@ spec:
template: template:
metadata: metadata:
labels: labels:
{{- include "gitea.labels" . | nindent 8 }} {{- include "gitea.actions.labels" . | nindent 8 }}
{{- with .Values.provisioning.labels }} {{- with .Values.provisioning.labels }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
@ -36,12 +36,12 @@ spec:
- sh - sh
- -c - -c
- | - |
while ! nc -z {{ include "gitea.act_runner.nc" . }}; do while ! nc -z {{ include "gitea.actions.nc" . }}; do
sleep 5 sleep 5
done done
containers: containers:
- name: actions-token-create - name: actions-token-create
image: "{{ include "gitea.image" . }}" image: "{{ include "gitea.actions.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
env: env:
- name: GITEA_APP_INI - name: GITEA_APP_INI
@ -103,7 +103,7 @@ spec:
volumes: volumes:
- name: scripts - name: scripts
configMap: configMap:
name: {{ include "gitea.fullname" . }}-scripts name: {{ include "gitea.actions.fullname" . }}-scripts
defaultMode: 0755 defaultMode: 0755
- name: data - name: data
persistentVolumeClaim: persistentVolumeClaim:

6
templates/role-job.yaml
View File

@ -1,7 +1,7 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }} {{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }}
{{- $name := include "gitea.workername" (dict "global" . "worker" "actions-token-job") }} {{- $name := include "gitea.actions.workername" (dict "global" . "worker" "actions-token-job") }}
{{- $secretName := include "gitea.workername" (dict "global" . "worker" "actions-token") }} {{- $secretName := include "gitea.actions.workername" (dict "global" . "worker" "actions-token") }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
@ -9,7 +9,7 @@ metadata:
name: {{ $name }} name: {{ $name }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
app.kubernetes.io/component: token-job app.kubernetes.io/component: token-job
rules: rules:
- apiGroups: - apiGroups:

4
templates/rolebinding-job.yaml
View File

@ -1,6 +1,6 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }} {{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }}
{{- $name := include "gitea.workername" (dict "global" . "worker" "actions-token-job") }} {{- $name := include "gitea.actions.workername" (dict "global" . "worker" "actions-token-job") }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
@ -8,7 +8,7 @@ metadata:
name: {{ $name }} name: {{ $name }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
app.kubernetes.io/component: token-job app.kubernetes.io/component: token-job
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

6
templates/secret-token.yaml
View File

@ -1,7 +1,7 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }} {{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }}
{{- $name := include "gitea.workername" (dict "global" . "worker" "actions-token-job") }} {{- $name := include "gitea.actions.workername" (dict "global" . "worker" "actions-token-job") }}
{{- $secretName := include "gitea.workername" (dict "global" . "worker" "actions-token") }} {{- $secretName := include "gitea.actions.workername" (dict "global" . "worker" "actions-token") }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
@ -9,7 +9,7 @@ metadata:
name: {{ $secretName }} name: {{ $secretName }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
app.kubernetes.io/component: token-job app.kubernetes.io/component: token-job
{{ $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}} {{ $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
{{ if $secret -}} {{ if $secret -}}

4
templates/serviceaccount-job.yaml
View File

@ -1,6 +1,6 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }} {{- if and (and .Values.provisioning.enabled .Values.persistence.enabled) .Values.persistence.mount }}
{{- $name := include "gitea.workername" (dict "global" . "worker" "actions-token-job") }} {{- $name := include "gitea.actions.workername" (dict "global" . "worker" "actions-token-job") }}
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
@ -8,7 +8,7 @@ metadata:
name: {{ $name }} name: {{ $name }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
labels: labels:
{{- include "gitea.labels" . | nindent 4 }} {{- include "gitea.actions.labels" . | nindent 4 }}
app.kubernetes.io/component: token-job app.kubernetes.io/component: token-job
{{- end }} {{- end }}
{{- end }} {{- end }}

18
templates/statefulset.yaml
View File

@ -1,11 +1,11 @@
{{- if .Values.enabled }} {{- if .Values.enabled }}
{{- $secretName := include "gitea.workername" (dict "global" . "worker" "actions-token") }} {{- $secretName := include "gitea.actions.workername" (dict "global" . "worker" "actions-token") }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
labels: labels:
{{- include "gitea.labels.actRunner" . | nindent 4 }} {{- include "gitea.actions.labels.actRunner" . | nindent 4 }}
{{- with .Values.statefulset.labels }} {{- with .Values.statefulset.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@ -13,18 +13,18 @@ metadata:
{{- with .Values.statefulset.annotations }} {{- with .Values.statefulset.annotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "gitea.fullname" . }}-act-runner name: {{ include "gitea.actions.fullname" . }}-act-runner
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "gitea.selectorLabels.actRunner" . | nindent 6 }} {{- include "gitea.actions.selectorLabels.actRunner" . | nindent 6 }}
template: template:
metadata: metadata:
annotations: annotations:
checksum/config: {{ include (print $.Template.BasePath "/config-act-runner.yaml") . | sha256sum }} checksum/config: {{ include (print $.Template.BasePath "/config-act-runner.yaml") . | sha256sum }}
labels: labels:
{{- include "gitea.labels.actRunner" . | nindent 8 }} {{- include "gitea.actions.labels.actRunner" . | nindent 8 }}
{{- with .Values.statefulset.labels }} {{- with .Values.statefulset.labels }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
@ -36,7 +36,7 @@ spec:
- sh - sh
- -c - -c
- | - |
while ! nc -z {{ include "gitea.act_runner.nc" . }}; do while ! nc -z {{ include "gitea.actions.nc" . }}; do
sleep 5 sleep 5
done done
containers: containers:
@ -57,7 +57,7 @@ spec:
name: "{{ .Values.existingSecret | default $secretName }}" name: "{{ .Values.existingSecret | default $secretName }}"
key: "{{ .Values.existingSecretKey | default "token" }}" key: "{{ .Values.existingSecretKey | default "token" }}"
- name: GITEA_INSTANCE_URL - name: GITEA_INSTANCE_URL
value: {{ include "gitea.act_runner.local_root_url" . }} value: {{ include "gitea.actions.local_root_url" . }}
- name: CONFIG_FILE - name: CONFIG_FILE
value: /actrunner/config.yaml value: /actrunner/config.yaml
resources: resources:
@ -111,7 +111,7 @@ spec:
volumes: volumes:
- name: act-runner-config - name: act-runner-config
configMap: configMap:
name: {{ include "gitea.fullname" . }}-act-runner-config name: {{ include "gitea.actions.fullname" . }}-act-runner-config
- name: docker-certs - name: docker-certs
emptyDir: {} emptyDir: {}
{{- with .Values.statefulset.extraVolumes }} {{- with .Values.statefulset.extraVolumes }}
@ -122,7 +122,7 @@ spec:
name: data-act-runner name: data-act-runner
spec: spec:
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
{{- include "gitea.persistence.storageClass" . | nindent 8 }} {{- include "gitea.actions.persistence.storageClass" . | nindent 8 }}
resources: resources:
requests: requests:
storage: {{ .Values.statefulset.persistence.size }} storage: {{ .Values.statefulset.persistence.size }}