vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-04-25 11:37:33 +02:00
parent 61ddc99465
commit b2dc02cf1c
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/gitea-tekton-org/datas.tf
View File

@@ -42,6 +42,9 @@ data "kustomization_overlay" "data" {
value: ${var.domain_name} value: ${var.domain_name}
- op: add - op: add
path: /spec/params/3/default path: /spec/params/3/default
value: ${var.domain}
- op: add
path: /spec/params/4/default
value: ${jsonencode(var.stages)} value: ${jsonencode(var.stages)}
EOF EOF
} }
@@ -59,6 +62,9 @@ data "kustomization_overlay" "data" {
value: ${var.domain_name} value: ${var.domain_name}
- op: add - op: add
path: /spec/params/3/default path: /spec/params/3/default
value: ${var.domain}
- op: add
path: /spec/params/4/default
value: ${jsonencode(var.stages)} value: ${jsonencode(var.stages)}
EOF EOF
} }
@@ -76,6 +82,9 @@ data "kustomization_overlay" "data" {
value: ${var.domain_name} value: ${var.domain_name}
- op: add - op: add
path: /spec/params/3/default path: /spec/params/3/default
value: ${var.domain}
- op: add
path: /spec/params/4/default
value: ${jsonencode(var.stages)} value: ${jsonencode(var.stages)}
EOF EOF
} }

4
share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-activate.yaml
View File

@@ -13,6 +13,8 @@ spec:
type: string type: string
- name: domain-name - name: domain-name
type: string type: string
- name: domain
type: string
- name: stages - name: stages
type: array type: array
- name: artifactory-url - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
env: env:
- name: ARTIFACTORY_URL - name: ARTIFACTORY_URL
value: $(params.artifactory-url) value: $(params.artifactory-url)
- name: DOMAIN
value: $(params.domain)
- name: DOMAIN_NAME - name: DOMAIN_NAME
value: $(params.domain-name) value: $(params.domain-name)
- name: ISSUER_NAME - name: ISSUER_NAME

4
share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-create.yaml
View File

@@ -13,6 +13,8 @@ spec:
type: string type: string
- name: domain-name - name: domain-name
type: string type: string
- name: domain
type: string
- name: stages - name: stages
type: array type: array
- name: artifactory-url - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
env: env:
- name: ARTIFACTORY_URL - name: ARTIFACTORY_URL
value: $(params.artifactory-url) value: $(params.artifactory-url)
- name: DOMAIN
value: $(params.domain)
- name: DOMAIN_NAME - name: DOMAIN_NAME
value: $(params.domain-name) value: $(params.domain-name)
- name: ISSUER_NAME - name: ISSUER_NAME

4
share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-delete.yaml
View File

@@ -13,6 +13,8 @@ spec:
type: string type: string
- name: domain-name - name: domain-name
type: string type: string
- name: domain
type: string
- name: stages - name: stages
type: array type: array
- name: artifactory-url - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
env: env:
- name: ARTIFACTORY_URL - name: ARTIFACTORY_URL
value: $(params.artifactory-url) value: $(params.artifactory-url)
- name: DOMAIN
value: $(params.domain)
- name: DOMAIN_NAME - name: DOMAIN_NAME
value: $(params.domain-name) value: $(params.domain-name)
- name: ISSUER_NAME - name: ISSUER_NAME

4
share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
View File

@@ -16,7 +16,7 @@ data:
template() { template() {
local src=${TEMPLATE_ROOT}/$1 dest=$2 local src=${TEMPLATE_ROOT}/$1 dest=$2
if [ ! -f $dest ];then if [ ! -f $dest ];then
envsubst '$ARTIFACTORY_URL,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$STAGE,$ORG_NAME,$NAMESPACE' <"$src" >"$dest" envsubst '$ARTIFACTORY_URL,$DOMAIN,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$STAGE,$ORG_NAME,$NAMESPACE' <"$src" >"$dest"
git add "$dest" git add "$dest"
added=$(($added+1)) added=$(($added+1))
fi fi
@@ -213,7 +213,7 @@ data:
name: install name: install
spec: spec:
path: "./stages/${STAGE}/${PROJECT_NAME}" path: "./stages/${STAGE}/${PROJECT_NAME}"
targetNamespace: "${DOMAIN_NAME}-org-${ORG_NAME}-${STAGE}" targetNamespace: "${DOMAIN}-org-${ORG_NAME}-${STAGE}"
- target: - target:
kind: ImageUpdateAutomation kind: ImageUpdateAutomation
name: update name: update