From 1ebf187be30800b2aa5dd3fb71b36fe0298af8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 31 Jul 2023 11:34:15 +0200 Subject: [PATCH] fix --- apps/woodpecker/datas.tf | 16 ++++++++ apps/woodpecker/index.yaml | 78 +++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/apps/woodpecker/datas.tf b/apps/woodpecker/datas.tf index 66fc855..6027aee 100644 --- a/apps/woodpecker/datas.tf +++ b/apps/woodpecker/datas.tf @@ -93,6 +93,22 @@ data "kustomization_overlay" "data" { app.kubernetes.io/component: server EOF } + patches { + target { + kind = "RoleBinding" + name = "woodpecker-agent" + } + patch = <<-EOF + apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + metadata: + name: woodpecker-agent + subjects: + - kind: ServiceAccount + name: woodpecker-agent + namespace: ${var.namespace} + EOF + } patches { target { kind = "StatefulSet" diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index 110d4db..1ded011 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -6,6 +6,31 @@ metadata: name: woodpecker description: null options: + storage-agent: + default: + size: 10Gi + storageClass: '' + writeMany: 'false' + examples: + - size: 10Gi + storageClass: '' + writeMany: 'false' + properties: + size: + default: 10Gi + type: string + storageClass: + default: '' + type: string + writeMany: + default: 'false' + type: string + type: object + domain: + default: your-company + examples: + - your-company + type: string images: default: agent: @@ -15,7 +40,7 @@ options: tag: v1.0.0-alpine git: registry: docker.io - repository: wowoodpeckerci/plugin-git + repository: woodpeckerci/plugin-git tag: 2.1.0 server: pullPolicy: IfNotPresent @@ -30,7 +55,7 @@ options: tag: v1.0.0-alpine git: registry: docker.io - repository: wowoodpeckerci/plugin-git + repository: woodpeckerci/plugin-git tag: 2.1.0 server: pullPolicy: IfNotPresent @@ -65,14 +90,14 @@ options: git: default: registry: docker.io - repository: wowoodpeckerci/plugin-git + repository: woodpeckerci/plugin-git tag: 2.1.0 properties: registry: default: docker.io type: string repository: - default: wowoodpeckerci/plugin-git + default: woodpeckerci/plugin-git type: string tag: default: 2.1.0 @@ -103,6 +128,16 @@ options: type: string type: object type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + sub-domain: + default: ci + examples: + - ci + type: string domain-name: default: your_company.com examples: @@ -113,36 +148,6 @@ options: examples: - traefik type: string - sub-domain: - default: ci - examples: - - ci - type: string - storage-agent: - default: - size: 10Gi - storageClass: '' - writeMany: 'false' - examples: - - size: 10Gi - storageClass: '' - writeMany: 'false' - properties: - size: - default: 10Gi - type: string - storageClass: - default: '' - type: string - writeMany: - default: 'false' - type: string - type: object - domain: - default: your-company - examples: - - your-company - type: string storage-server: default: accessMode: ReadWriteOnce @@ -162,11 +167,6 @@ options: default: 10Gi type: string type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string dependencies: [] providers: kubernetes: true