diff --git a/clusters/cl01tl/platform/gitea/Chart.yaml b/clusters/cl01tl/platform/gitea/Chart.yaml index ca0754fef..22df38fc3 100644 --- a/clusters/cl01tl/platform/gitea/Chart.yaml +++ b/clusters/cl01tl/platform/gitea/Chart.yaml @@ -26,10 +26,6 @@ dependencies: - name: gitea version: 11.0.0 repository: https://dl.gitea.io/charts/ - - name: app-template - alias: act-runners - repository: https://bjw-s.github.io/helm-charts/ - version: 3.7.2 - name: app-template alias: renovate repository: https://bjw-s.github.io/helm-charts/ diff --git a/clusters/cl01tl/platform/gitea/templates/external-secret.yaml b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml index 181f38766..8f2a7ddb4 100644 --- a/clusters/cl01tl/platform/gitea/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml @@ -78,13 +78,13 @@ spec: kind: ClusterSecretStore name: vault data: - - secretKey: token-1 + - secretKey: token remoteRef: conversionStrategy: Default decodingStrategy: None key: /cl01tl/gitea/runner metadataPolicy: None - property: token-1 + property: token --- apiVersion: external-secrets.io/v1beta1 diff --git a/clusters/cl01tl/platform/gitea/values.yaml b/clusters/cl01tl/platform/gitea/values.yaml index d05222519..edc273155 100644 --- a/clusters/cl01tl/platform/gitea/values.yaml +++ b/clusters/cl01tl/platform/gitea/values.yaml @@ -34,6 +34,24 @@ gitea: - mountPath: /opt/backup name: gitea-nfs-storage-backup readOnly: false + actions: + enabled: true + statefulset: + resources: + requests: + cpu: 100m + memory: 256Mi + actRunner: + # See full example here: https://gitea.com/gitea/act_runner/src/branch/main/internal/pkg/config/config.example.yaml + config: | + log: + level: debug + cache: + enabled: false + provisioning: + enabled: true + existingSecret: gitea-runner-secret + existingSecretKey: token gitea: metrics: enabled: true @@ -130,54 +148,56 @@ gitea: enabled: false mariadb: enabled: false -act-runners: - global: - nameOverride: gitea-runners - controllers: - runners: - type: deployment - replicas: 1 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - # alexlebens/helm-charts - runner-1: - image: - repository: gitea/act_runner - tag: 0.2.10-dind-rootless - pullPolicy: IfNotPresent - env: - - name: DOCKER_HOST - value: tcp://localhost:2376 - - name: DOCKER_CERT_PATH - value: /certs/client - - name: DOCKER_TLS_VERIFY - value: "1" - - name: GITEA_INSTANCE_URL - value: http://gitea-http.gitea.svc.cluster.local:3000 - - name: GITEA_RUNNER_REGISTRATION_TOKEN - valueFrom: - secretKeyRef: - name: gitea-runner-secret - key: token-1 - resources: - requests: - cpu: 100m - memory: 256Mi - securityContext: - privileged: true - serviceAccount: - create: true - persistence: - data-1: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 1Gi - advancedMounts: - runners: - runner-1: - - path: /data - readOnly: false +# act-runners: +# global: +# nameOverride: gitea-runners +# defaultPodOptions: +# securityContext: +# fsGroup: 1000 +# privileged: true +# controllers: +# runners: +# type: deployment +# replicas: 1 +# strategy: Recreate +# revisionHistoryLimit: 3 +# containers: +# # alexlebens/helm-charts +# runner-1: +# image: +# repository: gitea/act_runner +# tag: 0.2.11-dind-rootless +# pullPolicy: IfNotPresent +# env: +# - name: DOCKER_HOST +# value: tcp://localhost:2376 +# - name: DOCKER_CERT_PATH +# value: /certs/client +# - name: DOCKER_TLS_VERIFY +# value: "0" +# - name: GITEA_INSTANCE_URL +# value: http://gitea-http.gitea.svc.cluster.local:3000 +# - name: GITEA_RUNNER_REGISTRATION_TOKEN +# valueFrom: +# secretKeyRef: +# name: gitea-runner-secret +# key: token-1 +# resources: +# requests: +# cpu: 100m +# memory: 256Mi +# serviceAccount: +# create: true +# persistence: +# data-1: +# storageClass: ceph-block +# accessMode: ReadWriteOnce +# size: 1Gi +# advancedMounts: +# runners: +# runner-1: +# - path: /data +# readOnly: false renovate: global: fullnameOverride: gitea-renovate