From f793b9bd1a3af3a5d2bb75ad2f323d61a7cf70da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 31 Jul 2023 07:19:28 +0200 Subject: [PATCH] fix --- apps/woodpecker/datas.tf | 4 ++-- apps/woodpecker/index.yaml | 42 ++++++++++++++++++------------------ apps/woodpecker/providers.tf | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/woodpecker/datas.tf b/apps/woodpecker/datas.tf index 2a2420c..4be0152 100644 --- a/apps/woodpecker/datas.tf +++ b/apps/woodpecker/datas.tf @@ -40,8 +40,8 @@ data "kustomization_overlay" "data" { serviceAccountName: woodpecker-agent containers: - name: agent - image: "${var.images.nextcloud.registry}/${var.images.nextcloud.repository}:${var.images.nextcloud.tag}" - imagePullPolicy: "${var.images.nextcloud.pullPolicy}" + image: "${var.images.agent.registry}/${var.images.agent.repository}:${var.images.agent.tag}" + imagePullPolicy: "${var.images.agent.pullPolicy}" env: - name: WOODPECKER_BACKEND_K8S_NAMESPACE value: "${var.namespace}" diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index f3577b8..95a297c 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -6,10 +6,15 @@ metadata: name: woodpecker description: null options: - issuer: - default: letsencrypt-prod + ingress-class: + default: traefik examples: - - letsencrypt-prod + - traefik + type: string + sub-domain: + default: ci + examples: + - ci type: string images: default: @@ -108,6 +113,11 @@ options: type: string type: object type: object + domain: + default: your-company + examples: + - your-company + type: string storage-server: default: accessMode: ReadWriteOnce @@ -127,25 +137,10 @@ options: default: 10Gi type: string type: object - domain: - default: your-company + issuer: + default: letsencrypt-prod examples: - - your-company - type: string - sub-domain: - default: ci - examples: - - ci - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - ingress-class: - default: traefik - examples: - - traefik + - letsencrypt-prod type: string storage-agent: default: @@ -167,6 +162,11 @@ options: default: 'false' type: string type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string dependencies: [] providers: kubernetes: true diff --git a/apps/woodpecker/providers.tf b/apps/woodpecker/providers.tf index d91795a..5f8f20b 100644 --- a/apps/woodpecker/providers.tf +++ b/apps/woodpecker/providers.tf @@ -25,7 +25,7 @@ terraform { } provider "gitea" { - base_url = "http://gitea-http.${var.domain}-ci.svc" + base_url = "http://gitea-http.${var.domain}-ci.svc:3000/" username = data.kubernetes_secret_v1.gitea.data["username"] password = data.kubernetes_secret_v1.gitea.data["password"] }