From 815bd66acdedbc6feb0785df2404327439353080 Mon Sep 17 00:00:00 2001
From: Med Mouine <mohamed.mouine.2@ulaval.ca>
Date: Thu, 5 Sep 2024 22:24:12 -0400
Subject: [PATCH] feat: Update Woodpecker configuration

---
 applications/woodpecker/helmfile.yaml |   6 +-
 applications/woodpecker/values.yaml   | 122 +++++++-------------------
 helmfile.yaml                         |   4 +-
 3 files changed, 38 insertions(+), 94 deletions(-)

diff --git a/applications/woodpecker/helmfile.yaml b/applications/woodpecker/helmfile.yaml
index e19de95..2709a74 100644
--- a/applications/woodpecker/helmfile.yaml
+++ b/applications/woodpecker/helmfile.yaml
@@ -1,12 +1,12 @@
 ---
 repositories:
   - name: woodpecker
-    url: https://woodpecker-ci.org/helm-charts
+    url: https://woodpecker-ci.org/
 
 releases:
   - name: woodpecker
-    namespace: ci
+    namespace: woodpecker
     chart: woodpecker/woodpecker
-    version: 1.0.3
+    version: 1.5.1
     values:
       - values.yaml
diff --git a/applications/woodpecker/values.yaml b/applications/woodpecker/values.yaml
index 6da9100..197a9e2 100644
--- a/applications/woodpecker/values.yaml
+++ b/applications/woodpecker/values.yaml
@@ -1,111 +1,55 @@
 ---
 server:
-  image:
-    repository: woodpeckerci/woodpecker-server
-    tag: v2.3.0
-  replicaCount: 2
-  service:
-    type: ClusterIP
-    port: 8000
+  host: "ci.nationtech.io"
   ingress:
     enabled: true
-    ingressClassName: "nginx"
     annotations:
       kubernetes.io/ingress.class: nginx
+      cert-manager.io/issuer: letsencrypt-prod
       kubernetes.io/tls-acme: "true"
-      cert-manager.io/issuer: "letsencrypt-prod"
     hosts:
-      - host: ci.nationtech.io
+      - host: "ci.nationtech.io"
         paths:
-          - path: /
+          - path: "/"
+            pathType: Prefix
+            backend:
+              service:
+                name: woodpecker-server
+                port:
+                  number: 80
     tls:
-      - secretName: ci.nationtech.io-tls
+      - secretName: "ci.nationtech.io-tls"
         hosts:
-          - ci.nationtech.io
-  secrets:
-    - name: woodpecker-secret
-  serviceAccount:
-    # -- Specifies whether a service account should be created
-    create: true
-
+          - "ci.nationtech.io"
   env:
-    WOODPECKER_OPEN: "false"
+    WOODPECKER_OPEN: "true"
+    WOODPECKER_ADMIN: "woodpecker,admin,ci,nationtech,med"
     WOODPECKER_HOST: "https://ci.nationtech.io"
-    WOODPECKER_AGENT_SECRET: "woodpecker_agent_secret"
-    WOODPECKER_GRPC_SECRET: "woodpecker_grpc_secret"
+    WOODPECKER_AGENT_SECRET: "woodpecker-secret"
     WOODPECKER_GRPC_ADDR: ":9000"
-    WOODPECKER_SERVER_ADDR: ":8000"
-    WOODPECKER_METRICS_SERVER_ADDR: "prometheus-kube-prometheus-prometheus.monitoring.svc:9090"
-    # WOODPECKER_ADMIN: "woodpecker_admin"
-    # WOODPECKER_DATABASE_DRIVER: "postgres"
-    # WOODPECKER_DATABASE_DATASOURCE: "postgres://woodpecker_admin:woodpecker_admin@postgresql:5432/woodpecker?sslmode=require"
-  resources:
-    requests:
-      cpu: 200m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 512Mi
+    WOODPECKER_GITEA: "true"
+    WOODPECKER_GITEA_URL: "https://git.nationtech.io"
+    WOODPECKER_GITEA_CLIENT: "2a17849f-7747-44b9-a0d4-c79bc4aeff3d"
+    WOODPECKER_GITEA_SECRET: "gto_5zpyckcvuawq6l2zaja4mt3mptigpyc5o7nibmbd76jd2e5tu3fa"
 
-# Woodpecker agent configuration
 agent:
-  image:
-    repository: woodpeckerci/woodpecker-agent
-    tag: v2.3.0 # Use a specific version instead of 'latest'
-  replicaCount: 2 # Run multiple agents for better parallelism
+  replicaCount: 2
   env:
     WOODPECKER_SERVER: "woodpecker-server:9000"
-    WOODPECKER_AGENT_SECRET: "woodpecker_agent_secret"
+    WOODPECKER_AGENT_SECRET: "woodpecker-secret"
+    WOODPECKER_MAX_PROCS: "2"
     WOODPECKER_BACKEND: "kubernetes"
-    WOODPECKER_BACKEND_K8S_NAMESPACE: "ci"
-    WOODPECKER_BACKEND_K8S_VOLUME_SIZE: "5Gi"
+    WOODPECKER_BACKEND_K8S_NAMESPACE: "woodpecker"
     WOODPECKER_BACKEND_K8S_STORAGE_CLASS: "ceph-block"
+    WOODPECKER_BACKEND_K8S_VOLUME_SIZE: "10Gi"
     WOODPECKER_BACKEND_K8S_STORAGE_RWX: "true"
-    WOODPECKER_BACKEND_K8S_POD_LABELS: '{"app":"woodpecker-job"}'
-    WOODPECKER_BACKEND_K8S_POD_ANNOTATIONS: '{"prometheus.io/scrape":"true","prometheus.io/port":"9000"}'
-    WOODPECKER_BACKEND_K8S_POD_NODE_SELECTOR: '{"kubernetes.io/os":"linux"}'
-    WOODPECKER_BACKEND_K8S_SECCTX_NONROOT: "true"
-    WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES: "woodpecker-pull-secret"
-  resources:
-    requests:
-      cpu: 200m
-      memory: 256Mi
-    limits:
-      cpu: 1
-      memory: 1Gi
+    WOODPECKER_BACKEND_K8S_POD_LABELS: '{"app.kubernetes.io/name":"agent"}'
+    WOODPECKER_BACKEND_K8S_POD_ANNOTATIONS: ""
+    WOODPECKER_CONNECT_RETRY_COUNT: "3"
+    WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES: ""
 
-# PostgreSQL configuration
-postgresql:
-  enabled: true
-  auth:
-    username: "woodpecker_admin"
-    password: "woodpecker_admin"
-    database: "woodpecker"
-  persistence:
-    enabled: true
-    size: 5Gi
-  resources:
-    requests:
-      cpu: 100m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 1Gi
-
-# Prometheus integration
-metrics:
-  serviceMonitor:
-    enabled: true
-    namespace: monitoring
-    interval: 15s
-    scrapeTimeout: 14s
-    selector:
-      release: prometheus
-
-# Logging integration
-logging:
-  fluentd:
-    enabled: true
-    config:
-      logLevel: info
-      fluentdAddress: fluentd-headless.logging.svc:24224
+  image:
+    registry: docker.io
+    repository: woodpeckerci/woodpecker-agent
+    pullPolicy: IfNotPresent
+    tag: "latest"
diff --git a/helmfile.yaml b/helmfile.yaml
index 606f896..9add396 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -7,5 +7,5 @@ helmfiles:
   # - path: applications/vault/helmfile.yaml
   # - path: applications/logging/helmfile.yaml
   # - path: applications/gitea/helmfile.yaml
-  # - path: applications/woodpecker/helmfile.yaml
-  - path: applications/harbor/helmfile.yaml
+  - path: applications/woodpecker/helmfile.yaml
+#  - path: applications/harbor/helmfile.yaml