fix
This commit is contained in:
@@ -42,6 +42,9 @@ data "kustomization_overlay" "data" {
|
||||
value: ${var.domain_name}
|
||||
- op: add
|
||||
path: /spec/params/3/default
|
||||
value: ${var.domain}
|
||||
- op: add
|
||||
path: /spec/params/4/default
|
||||
value: ${jsonencode(var.stages)}
|
||||
EOF
|
||||
}
|
||||
@@ -59,6 +62,9 @@ data "kustomization_overlay" "data" {
|
||||
value: ${var.domain_name}
|
||||
- op: add
|
||||
path: /spec/params/3/default
|
||||
value: ${var.domain}
|
||||
- op: add
|
||||
path: /spec/params/4/default
|
||||
value: ${jsonencode(var.stages)}
|
||||
EOF
|
||||
}
|
||||
@@ -76,6 +82,9 @@ data "kustomization_overlay" "data" {
|
||||
value: ${var.domain_name}
|
||||
- op: add
|
||||
path: /spec/params/3/default
|
||||
value: ${var.domain}
|
||||
- op: add
|
||||
path: /spec/params/4/default
|
||||
value: ${jsonencode(var.stages)}
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@ spec:
|
||||
type: string
|
||||
- name: domain-name
|
||||
type: string
|
||||
- name: domain
|
||||
type: string
|
||||
- name: stages
|
||||
type: array
|
||||
- name: artifactory-url
|
||||
@@ -34,6 +36,8 @@ spec:
|
||||
env:
|
||||
- name: ARTIFACTORY_URL
|
||||
value: $(params.artifactory-url)
|
||||
- name: DOMAIN
|
||||
value: $(params.domain)
|
||||
- name: DOMAIN_NAME
|
||||
value: $(params.domain-name)
|
||||
- name: ISSUER_NAME
|
||||
|
||||
@@ -13,6 +13,8 @@ spec:
|
||||
type: string
|
||||
- name: domain-name
|
||||
type: string
|
||||
- name: domain
|
||||
type: string
|
||||
- name: stages
|
||||
type: array
|
||||
- name: artifactory-url
|
||||
@@ -34,6 +36,8 @@ spec:
|
||||
env:
|
||||
- name: ARTIFACTORY_URL
|
||||
value: $(params.artifactory-url)
|
||||
- name: DOMAIN
|
||||
value: $(params.domain)
|
||||
- name: DOMAIN_NAME
|
||||
value: $(params.domain-name)
|
||||
- name: ISSUER_NAME
|
||||
|
||||
@@ -13,6 +13,8 @@ spec:
|
||||
type: string
|
||||
- name: domain-name
|
||||
type: string
|
||||
- name: domain
|
||||
type: string
|
||||
- name: stages
|
||||
type: array
|
||||
- name: artifactory-url
|
||||
@@ -34,6 +36,8 @@ spec:
|
||||
env:
|
||||
- name: ARTIFACTORY_URL
|
||||
value: $(params.artifactory-url)
|
||||
- name: DOMAIN
|
||||
value: $(params.domain)
|
||||
- name: DOMAIN_NAME
|
||||
value: $(params.domain-name)
|
||||
- name: ISSUER_NAME
|
||||
|
||||
@@ -16,7 +16,7 @@ data:
|
||||
template() {
|
||||
local src=${TEMPLATE_ROOT}/$1 dest=$2
|
||||
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"
|
||||
added=$(($added+1))
|
||||
fi
|
||||
@@ -213,7 +213,7 @@ data:
|
||||
name: install
|
||||
spec:
|
||||
path: "./stages/${STAGE}/${PROJECT_NAME}"
|
||||
targetNamespace: "${DOMAIN_NAME}-org-${ORG_NAME}-${STAGE}"
|
||||
targetNamespace: "${DOMAIN}-org-${ORG_NAME}-${STAGE}"
|
||||
- target:
|
||||
kind: ImageUpdateAutomation
|
||||
name: update
|
||||
|
||||
Reference in New Issue
Block a user