diff --git a/projects/woodpecker/project.yml b/projects/woodpecker/project.yml index b172f960..cb27da5c 100644 --- a/projects/woodpecker/project.yml +++ b/projects/woodpecker/project.yml @@ -1,7 +1,7 @@ config: description: Woodpecker-CI - repoURL: https://woodpecker-ci.org - targetRevision: v0.15.5 + repoURL: https://github.com/woodpecker-ci/helm + targetRevision: main networkPolicy: groups: @@ -13,7 +13,7 @@ config: apps: - name: woodpecker-server - chart: woodpecker-server + path: charts/server secrets: - name: github-oauth keys: @@ -25,9 +25,9 @@ apps: - name: woodpecker-agent namespace: woodpecker-agent - chart: woodpecker-agent + path: charts/agent secrets: - name: woodpecker-secret fromApp: woodpecker-server keys: - - WOODPECKER_AGENT_SECRET + - WOODPECKER_AGENT_SECRET diff --git a/projects/woodpecker/values/woodpecker-agent.yaml b/projects/woodpecker/values/woodpecker-agent.yaml index 43dc0d3c..3e512560 100644 --- a/projects/woodpecker/values/woodpecker-agent.yaml +++ b/projects/woodpecker/values/woodpecker-agent.yaml @@ -1,10 +1,9 @@ -replicaCount: 3 +replicaCount: 2 image: registry: docker.io repository: woodpeckerci/woodpecker-agent pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. tag: "next" env: diff --git a/projects/woodpecker/values/woodpecker-server.yaml b/projects/woodpecker/values/woodpecker-server.yaml index da150f9e..8e0e3cc2 100644 --- a/projects/woodpecker/values/woodpecker-server.yaml +++ b/projects/woodpecker/values/woodpecker-server.yaml @@ -7,6 +7,9 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: "next" +dind: + enabled: false + env: WOODPECKER_OPEN: "false" WOODPECKER_ADMIN: "Nold360" @@ -18,8 +21,8 @@ env: HTTPS_PROXY: http://proxy-squid.proxy.svc.cluster.local:3128 http_proxy: http://proxy-squid.proxy.svc.cluster.local:3128 https_proxy: http://proxy-squid.proxy.svc.cluster.local:3128 - NO_PROXY: localhost,.cluster.local - no_proxy: localhost,.cluster.local + NO_PROXY: localhost,.cluster.local,10.43.0.1 + no_proxy: localhost,.cluster.local,10.43.0.1 extraSecretNamesForEnvFrom: @@ -32,8 +35,6 @@ persistentVolume: mountPath: "/var/lib/woodpecker" storageClass: "local-path" -podAnnotations: {} - podSecurityContext: fsGroup: 2000 @@ -51,13 +52,11 @@ service: ingress: enabled: true - ingressClassName: ingress-external-traefik + ingressClassName: ingress-external labels: environment: external annotations: kubernetes.io/tls-acme: "true" - kubernetes.io/ingress.class: ingress-external - traefik.ingress.kubernetes.io/router.tls: 'true' cert-manager.io/cluster-issuer: letsencrypt external-dns.alpha.kubernetes.io/hostname: ci.nold.in external-dns.alpha.kubernetes.io/target: nold.in