diff --git a/apps/woodpecker/apps_v1_StatefulSet_woodpecker-server.yaml b/apps/woodpecker/apps_v1_StatefulSet_woodpecker-server.yaml index 0570d29..7dce673 100644 --- a/apps/woodpecker/apps_v1_StatefulSet_woodpecker-server.yaml +++ b/apps/woodpecker/apps_v1_StatefulSet_woodpecker-server.yaml @@ -64,8 +64,6 @@ spec: - name: WOODPECKER_HOST value: "https://xxxxxxx" envFrom: - - secretRef: - name: woodpecker-secret volumeClaimTemplates: - metadata: name: data diff --git a/apps/woodpecker/datas.tf b/apps/woodpecker/datas.tf index 09a43bd..66fc855 100644 --- a/apps/woodpecker/datas.tf +++ b/apps/woodpecker/datas.tf @@ -127,9 +127,11 @@ data "kustomization_overlay" "data" { value: "https://${var.sub-domain}.${var.domain-name}" envFrom: - secretRef: - name: "${var.component}-${var.instance}-gitea" + name: woodpecker-secret + - secretRef: + name: "${var.component}-${var.instance}-gitea" - configMapRef: - name: "${var.instance}-${var.component}-server" + name: "${var.instance}-${var.component}-server" volumeClaimTemplates: - metadata: name: data diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index c26bc56..a19e71d 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -103,11 +103,6 @@ options: type: string type: object type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string storage-agent: default: size: 10Gi @@ -138,6 +133,11 @@ options: examples: - your-company type: string + sub-domain: + default: ci + examples: + - ci + type: string storage-server: default: accessMode: ReadWriteOnce @@ -157,16 +157,16 @@ options: default: 10Gi type: string type: object - sub-domain: - default: ci - examples: - - ci - type: string domain-name: default: your_company.com examples: - your_company.com type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string dependencies: [] providers: kubernetes: true