@xfe-repo/web-app 1.0.10 → 1.0.11

package/deploy/helm/templates/template.yaml

@@ -1,3 +1,3 @@
 {{- define "template.namespace" -}}
-{{ if eq $.Values.envType "dev" }} deployment-dev {{ else if eq $.Values.envType "test" }} deployment-test {{ else if eq $.Values.envType "stage" }} deployment-stage {{ else if eq $.Values.envType "beta" }} deployment-beta {{ else if eq $.Values.envType "prod" }} deployment-prod {{ else if eq $.Values.envType "apitest" }} ci-apitest {{ else }} deployment-test {{ end }}
+{{ if not (empty .Values.namespace) }}{{ .Values.namespace }}{{ else }}deployment-{{ .Values.envType }}{{ end }}
 {{- end -}}

package/deploy/helm/templates/virtualService.yaml

@@ -1,26 +1,27 @@
+{{- if .Values.virtualService.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: {{ $.Values.app }}-vs
+  name: {{ .Values.app }}-vs
   namespace: {{ include "template.namespace" . }}
 spec:
   hosts:
-    {{- $host := (get $.Values.hosts $.Values.envType) }}
-    {{- range $host }}
-    - "{{ . }}"
-    {{- end }}
+    {{- $host := (get .Values.virtualService.hosts .Values.envType) }}
+      {{- range $host }}
+      - "{{ . }}"
+      {{- end }}
   gateways:
-    {{- $gateways := $.Values.gateways }}
-    {{- range $gateways }}
-    - "{{ . }}"
-    {{- end }}
+    {{- $gateways := .Values.virtualService.gateways }}
+      {{- range $gateways }}
+      - "{{ . }}"
+      {{- end }}
   http:
     - match:
         - uri:
             prefix: /
       route:
         - destination:
-            host: {{ $.Values.app }}
+            host: {{ .Values.app }}
             port:
               number: 80
           corsPolicy:
@@ -28,4 +29,4 @@ spec:
               - "*"
             allowMethods:
               - "*"
----
+{{- end }}

package/deploy/helm/values.yaml

@@ -5,14 +5,17 @@ tagContent: '<<TAG_CONTENT>>'
 commitSHA: '<<CI_COMMIT_SHA>>'
 envType: '<<ENV_TYPE>>'
 hostPrefix: '<<HOST_PREFIX>>'
-hosts:
-  test:
-    - 'test.template.com'
-  stage:
-    - 'stage.template.com'
-  prod:
-    - 'template.com'
-gateways:
-  - 'common-gateway-eshetang'
+namespace: ''
+virtualService:
+  enabled: false
+  hosts:
+    test:
+      - 'test.template.com'
+    stage:
+      - 'stage.template.com'
+    prod:
+      - 'template.com'
+  gateways:
+    - 'common-gateway-eshetang'
 # 目标集群 默认发布到saas集群 可选值: saas, infra
 targetK8s: 'saas'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "bin": {
     "xfe-web": "./bin/index.js"
   },
@@ -73,7 +73,7 @@
     "webpack-manifest-plugin": "^4.0.2",
     "workbox-webpack-plugin": "^7.0.0",
     "yaml": "^2.3.4",
-    "@xfe-repo/typescript-config": "0.0.3",
-    "@xfe-repo/eslint-config": "0.0.2"
+    "@xfe-repo/eslint-config": "0.0.2",
+    "@xfe-repo/typescript-config": "0.0.3"
   }
 }

package/scripts/config.js

@@ -21,11 +21,15 @@ const configDeploy = () => {
   const valuesYamlFile = fs.readFileSync(valuesYamlFilePath, 'utf8')
   const valuesYaml = yaml.parse(valuesYamlFile)
 
-  if(!valuesYaml.hosts) valuesYaml.hosts = { test: [], stage: [], prod: [] }
+  if(!valuesYaml.virtualService) valuesYaml.virtualService = {}
 
-  valuesYaml.hosts.prod = xfeConfig.deploy.hostsProd || []
-  valuesYaml.hosts.stage = xfeConfig.deploy.hostsStage || []
-  valuesYaml.hosts.test = xfeConfig.deploy.hostsTest || []
+  if(!valuesYaml.virtualService.hosts) valuesYaml.virtualService.hosts = { test: [], stage: [], prod: [] }
+
+  valuesYaml.virtualService.enabled = xfeConfig.deploy.virtualServiceEnabled || true
+
+  valuesYaml.virtualService.hosts.prod = xfeConfig.deploy.hostsProd || []
+  valuesYaml.virtualService.hosts.stage = xfeConfig.deploy.hostsStage || []
+  valuesYaml.virtualService.hosts.test = xfeConfig.deploy.hostsTest || []
 
   // gateways 默认为 common-gateway-eshetang
   valuesYaml.gateways = xfeConfig.deploy.gateways || ["common-gateway-eshetang"]
@@ -33,6 +37,9 @@ const configDeploy = () => {
   // 修改目标集群
   valuesYaml.targetK8s = xfeConfig.deploy.targetK8s || "saas"
 
+  // 修改目标命名空间
+  valuesYaml.namespace = xfeConfig.deploy.targetNamespace || ''
+
   // 写入values.yaml
   const valuesYamlStr = yaml.stringify(valuesYaml, { defaultStringType: 'QUOTE_SINGLE', defaultKeyType: 'PLAIN' })
   fs.writeFileSync(valuesYamlFilePath, valuesYamlStr, 'utf8')