diff --git a/share/organisation/index.yaml b/share/organisation/index.yaml index 451f38c..74cfd4e 100644 --- a/share/organisation/index.yaml +++ b/share/organisation/index.yaml @@ -74,9 +74,9 @@ options: type: string type: object domain: - default: media + default: your-company examples: - - media + - your-company type: string domain_name: default: your_company.com diff --git a/share/organisation/postconfig.tf b/share/organisation/postconfig.tf index 8d515c2..c8b4d2d 100644 --- a/share/organisation/postconfig.tf +++ b/share/organisation/postconfig.tf @@ -4,10 +4,9 @@ resource "kubectl_manifest" "post_install_job_taiga" { apiVersion: batch/v1 kind: Job metadata: - name: "${var.instance}-${var.component}-config-taiga" + name: "${var.component}-${trimprefix(var.instance,"org-")}-config-taiga" namespace: "${var.domain}-ci" labels: ${jsonencode(local.common_labels)} - ownerReferences: ${jsonencode(var.install_owner)} spec: template: spec: @@ -41,6 +40,9 @@ resource "kubectl_manifest" "post_install_job_taiga" { if ! curl $JSON $BEAR "$API/projects"|jq -r '.[].name' |grep -E '^${trimprefix(var.instance,"org-")}$'; then curl -X POST $JSON $BEAR "http://taiga-taiga.${var.namespace}.svc/api/v1/projects" -d '{ "creation_template": 1, "description": "Organisation ${trimprefix(var.instance,"org-")} project", "is_backlog_activated": true, "is_issues_activated": true, "is_kanban_activated": true, "is_private": true, "is_wiki_activated": true, "name": "${trimprefix(var.instance,"org-")}", }' fi + env: + - name: garbage + value: "${jsonencode(var.install_owner)}" envFrom: - secretRef: name: taiga-taiga