diff --git a/scripts/act_runner/token.sh b/scripts/act_runner/token.sh deleted file mode 100755 index cbb2ebd..0000000 --- a/scripts/act_runner/token.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -set -eu - -timeout_delay=15 - -check_token() { - set +e - - echo "Checking for existing token..." - token="$(kubectl get secret "$SECRET_NAME" -o jsonpath="{.data['token']}" 2> /dev/null)" - [ $? -ne 0 ] && return 1 - [ -z "$token" ] && return 2 - return 0 -} - -create_token() { - echo "Waiting for new token to be generated..." - begin=$(date +%s) - end=$((begin + timeout_delay)) - while true; do - [ -f /data/actions/token ] && return 0 - [ "$(date +%s)" -gt $end ] && return 1 - sleep 5 - done -} - -store_token() { - echo "Storing the token in Kubernetes secret..." - kubectl patch secret "$SECRET_NAME" -p "{\"data\":{\"token\":\"$(base64 /data/actions/token | tr -d '\n')\"}}" -} - -if check_token; then - echo "Key already in place, exiting." - exit -fi - -if ! create_token; then - echo "Checking for an existing act runner token in secret $SECRET_NAME timed out after $timeout_delay" - exit 1 -fi - -store_token diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index ab483ba..dc6aed8 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -166,15 +166,6 @@ version: {{ .Values.deployment.gitea.image.tag | default .Chart.AppVersion | quo app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} -{{- define "gitea.labels.actRunner" -}} -helm.sh/chart: {{ include "gitea.chart" . }} -app: {{ include "gitea.name" . }}-act-runner -{{ include "gitea.selectorLabels.actRunner" . }} -app.kubernetes.io/version: {{ .Values.deployment.gitea.image.tag | default .Chart.AppVersion | quote }} -version: {{ .Values.deployment.gitea.image.tag | default .Chart.AppVersion | quote }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - {{/* Selector labels */}} @@ -183,11 +174,6 @@ app.kubernetes.io/name: {{ include "gitea.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} -{{- define "gitea.selectorLabels.actRunner" -}} -app.kubernetes.io/name: {{ include "gitea.name" . }}-act-runner -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - {{- define "postgresql-ha.dns" -}} {{- if (index .Values "postgresql-ha").enabled -}} {{- printf "%s-postgresql-ha-pgpool.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain (index .Values "postgresql-ha" "service" "ports" "postgresql") -}}