diff --git a/forgejo-runner/templates/deployment.yaml b/forgejo-runner/templates/deployment.yaml index 0134e8f..1fe156e 100644 --- a/forgejo-runner/templates/deployment.yaml +++ b/forgejo-runner/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: initContainers: - name: runner-register image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - command: ["forgejo-runner", "register", "--no-interactive", "--token", $(RUNNER_SECRET), "--name", $(RUNNER_NAME), "--instance", $(FORGEJO_INSTANCE_URL)] + command: ["forgejo-runner", "register", "--no-interactive", "--token", $(RUNNER_SECRET), "--name", $(RUNNER_NAME), "--instance", $(FORGEJO_INSTANCE_URL), "--labels", $(RUNNER_LABELS)] env: - name: RUNNER_NAME valueFrom: @@ -49,6 +49,8 @@ spec: key: token - name: FORGEJO_INSTANCE_URL value: {{ .Values.forgejoUrl }} + - name: RUNNER_LABELS + value: {{ join "," .Values.runnerLabels }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/forgejo-runner/templates/secret.yaml b/forgejo-runner/templates/secret.yaml index c07bbaf..d10b785 100644 --- a/forgejo-runner/templates/secret.yaml +++ b/forgejo-runner/templates/secret.yaml @@ -10,7 +10,8 @@ kind: Secret metadata: name: {{ include "forgejo-runner.fullname" . }}-token namespace: {{ .Release.Namespace }} - metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false + # TODO: RIRE should this be enabled? + #metadata: + # annotations: + # argocd.argoproj.io/sync-options: Prune=false {{- end }} diff --git a/forgejo-runner/values.yaml b/forgejo-runner/values.yaml index 84751be..7807d23 100644 --- a/forgejo-runner/values.yaml +++ b/forgejo-runner/values.yaml @@ -42,4 +42,9 @@ registration: enabled: false token: "" -forgejoUrl: http://forgejo-http.forgejo.svc.cluster.local:3000 +forgejoUrl: https://my.forgejo.server + +runnerLabels: + - docker:docker://node:20-bullseye + - ubuntu-latest:docker://node:20-bullseye +