Merge remote-tracking branch 'origin/master'

Jenkinsfile

@@ -173,6 +173,7 @@ pipeline {
                             if( repo.dir == "BASE") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade base base-charts/ -n base -f project.yaml"
                             if( repo.dir == "BASE") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade base base-charts/ -n base -f project.yaml"
                             if( repo.dir == "CORE") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade core core-charts/ -n core -f project.yaml"
                             if( repo.dir == "CORE") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade core core-charts/ -n core -f project.yaml"
                             if( repo.dir == "HTJ") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade htj htj-charts/ -n htj -f project.yaml"
                             if( repo.dir == "HTJ") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade htj htj-charts/ -n htj -f project.yaml"
+                            if( repo.dir == "WEB") sh "KUBECONFIG=\$KUBECONFIG_FILE helm upgrade web qrcode-web/ -n dz-qrcode-web -f project.yaml"
                         }
                         }
                     }
                     }
                 }
                 }

project.yaml

@@ -154,5 +154,5 @@ web:
   type: "node"
   type: "node"
   url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
   url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
 #  isEncryption: false
 #  isEncryption: false
-  version: v24.09.23
-  isUpdate: false
+  version: v24.09.27
+  isUpdate: true
\ No newline at end of file

qrcode-web/templates/configmap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: web-config-map
+  namespace: {{ .Release.Namespace }}
+data:
+  default.conf: |
+    server_tokens off;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root   /usr/share/nginx/html/;
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+        #边侧前端到后端
+        location /prod-api/{
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://gateway.base.svc.cluster.local:8080/;
+        }
+
+        # 子系统访问厂级
+        location /sub-api/{
+             proxy_set_header Host $http_host;
+             proxy_set_header X-Real-IP $remote_addr;
+             proxy_set_header REMOTE-HOST $remote_addr;
+             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+             proxy_pass http://gateway.base.svc.cluster.local:8080/;
+         }
+
+        # 调控到边侧
+        location /dev-api/{
+             proxy_set_header Host $http_host;
+             proxy_set_header X-Real-IP $remote_addr;
+             proxy_set_header REMOTE-HOST $remote_addr;
+             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+             proxy_pass http://gateway.base.svc.cluster.local:8080/;
+             client_max_body_size 20m;
+         }
+
+        #调控系统对接
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
\ No newline at end of file

qrcode-web/templates/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: qrcode-web
+  name: {{ .Values.web.name }}-deployment
+  namespace: dz-qrcode-web
+spec:
+  progressDeadlineSeconds: 600
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: {{ .Values.web.name }}-deployment
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.web.name }}-deployment
+    spec:
+      containers:
+        - image: "{{ .Values.registry }}/{{ .Values.web.name }}:{{ .Values.web.version }}"
+          imagePullPolicy: IfNotPresent
+          name: {{ .Values.web.name }}-deployment
+          ports:
+            - containerPort: 80
+              name: web
+              protocol: TCP
+          resources:
+            limits:
+              cpu: "4"
+              memory: 8Gi
+            requests:
+              cpu: "1"
+              memory: 512Mi
+          volumeMounts:
+            - mountPath: /etc/nginx/conf.d
+              name: nginx-conf
+      dnsPolicy: ClusterFirst
+      nodeSelector:
+        dz-app: qrcode
+      restartPolicy: Always
+      volumes:
+        - configMap:
+            defaultMode: 420
+            name: web-config-map
+          name: nginx-conf
\ No newline at end of file

qrcode-web/values.yaml

+
+registry: 192.168.31.201/develop
+
+web:
+  dir: "WEB"
+  name: "qrcode-web"
+  type: "node"
+  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
+  #  isEncryption: false
+  version: v24.09.23
+  isUpdate: false
\ No newline at end of file