fix
This commit is contained in:
@@ -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,$NAMESPACE' <"$src" >"$dest"
|
envsubst '$ARTIFACTORY_URL,$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
|
||||||
@@ -183,6 +183,10 @@ data:
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
namePrefix: ${PROJECT_NAME}-
|
namePrefix: ${PROJECT_NAME}-
|
||||||
|
commonLabels:
|
||||||
|
app.kubernetes.io/name: ${ORG_NAME}
|
||||||
|
app.kubernetes.io/component: ${PROJECT_NAME}
|
||||||
|
component: ${PROJECT_NAME}
|
||||||
resources:
|
resources:
|
||||||
- ../../../../bases/install
|
- ../../../../bases/install
|
||||||
- ../../../../bases/images
|
- ../../../../bases/images
|
||||||
@@ -224,6 +228,10 @@ data:
|
|||||||
kind: ImagePolicy
|
kind: ImagePolicy
|
||||||
metadata:
|
metadata:
|
||||||
name: ${PROJECT_NAME}-policy
|
name: ${PROJECT_NAME}-policy
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: ${PROJECT_NAME}
|
||||||
|
app.kubernetes.io/name: ${ORG_NAME}
|
||||||
|
component: ${PROJECT_NAME}
|
||||||
spec:
|
spec:
|
||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: ${PROJECT_NAME}-repo
|
name: ${PROJECT_NAME}-repo
|
||||||
@@ -238,6 +246,10 @@ data:
|
|||||||
kind: ImagePolicy
|
kind: ImagePolicy
|
||||||
metadata:
|
metadata:
|
||||||
name: ${PROJECT_NAME}-policy
|
name: ${PROJECT_NAME}-policy
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: ${PROJECT_NAME}
|
||||||
|
app.kubernetes.io/name: ${ORG_NAME}
|
||||||
|
component: ${PROJECT_NAME}
|
||||||
spec:
|
spec:
|
||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: ${PROJECT_NAME}-repo
|
name: ${PROJECT_NAME}-repo
|
||||||
@@ -486,6 +498,10 @@ data:
|
|||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: ${PROJECT_NAME}-web
|
name: ${PROJECT_NAME}-web
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: ${PROJECT_NAME}
|
||||||
|
app.kubernetes.io/name: ${ORG_NAME}
|
||||||
|
component: ${PROJECT_NAME}
|
||||||
spec:
|
spec:
|
||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
|
|||||||
Reference in New Issue
Block a user