diff --git a/agent-common/real_project/cmii-iot-dispatcher.yaml b/agent-common/real_project/cmii-iot-dispatcher.yaml new file mode 100644 index 0000000..2323609 --- /dev/null +++ b/agent-common/real_project/cmii-iot-dispatcher.yaml @@ -0,0 +1,130 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: cmii-uav-iot-dispatcher + namespace: jsntejpt + labels: + app.kubernetes.io/app-version: 5.7.0 + app.kubernetes.io/managed-by: octopus-control + cmii.app: cmii-uav-iot-dispatcher + cmii.type: backend + octopus/control: backend-app-1.0.0 +spec: + replicas: 1 + selector: + matchLabels: + cmii.app: cmii-uav-iot-dispatcher + cmii.type: backend + template: + metadata: + creationTimestamp: null + labels: + cmii.app: cmii-uav-iot-dispatcher + cmii.type: backend + spec: + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc + containers: + - name: cmii-uav-iot-dispatcher + image: '10.40.51.5:8033/cmii/cmii-uav-iot-dispatcher:5.7.0' + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + env: + - name: ENV + value: develop + - name: VERSION + value: 5.7.0 + - name: NACOS_SYSTEM_CONFIG_NAME + value: cmii-backend-system + - name: NACOS_SERVICE_CONFIG_NAME + value: cmii-uav-iot-dispatcher + - name: NACOS_SERVER_ADDRESS + value: 'helm-nacos:8848' + - name: NACOS_NAMESPACE_ID + value: public + - name: NACOS_USERNAME + value: nacos + - name: NACOS_PASSWORD + value: KingKong@95461234 + - name: SVC_NAME + value: cmlc-uav-iot-dispatcher-svc + - name: K8S_NAMESPACE + value: xmyd + - name: APPLICATION_NAME + value: cmii-uav-iot-dispatcher + - name: CUST_JAVA_OPTS + value: '-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true' + - name: NACOS_REGISTRY + value: 'helm-nacos:8848' + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: '8080' + - name: BIZ_CONFIG_GROUP + value: 5.7.0 + - name: SYS_CONFIG_GROUP + value: 5.7.0 + - name: IMAGE_VERSION + value: 5.7.0 + resources: + limits: + cpu: '2' + memory: 3Gi + requests: + cpu: 200m + memory: 500Gi + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + subPath: xmyd/cmii-uav-iot-dispatcher + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: { } + imagePullSecrets: + - name: harborsecret + affinity: { } + schedulerName: default-scheduler + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + maxSurge: 25% + revisionHistoryLimit: 10 + progressDeadlineSeconds: 600 +--- +kind: Service +apiVersion: v1 +metadata: + name: cmii-uav-iot-dispatcher + namespace: jsntejpt + labels: + app.kubernetes.io/app-version: 5.7.0 + app.kubernetes.io/managed-by: octopus-control + cmii.app: cmii-uav-iot-dispatcher + cmii.type: backend + octopus/control: backend-app-1.0.0 +spec: + ports: + - name: backend-tcp + protocol: TCP + port: 8080 + targetPort: 8080 + selector: + cmii.app: cmii-uav-iot-dispatcher + cmii.type: backend + type: ClusterIP + sessionAffinity: None + + + diff --git a/agent-common/real_project/jsntejpt/k8s-backend.yaml b/agent-common/real_project/jsntejpt/k8s-backend.yaml index a7b4665..4ddb356 100644 --- a/agent-common/real_project/jsntejpt/k8s-backend.yaml +++ b/agent-common/real_project/jsntejpt/k8s-backend.yaml @@ -46,7 +46,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-cms - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -62,19 +62,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -185,7 +185,7 @@ spec: - name: APPLICATION_NAME value: cmii-open-gateway - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -201,19 +201,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -324,7 +324,7 @@ spec: - name: APPLICATION_NAME value: cmii-admin-user - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -340,19 +340,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -463,7 +463,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-airspace - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -479,19 +479,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -602,7 +602,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-logger - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -618,19 +618,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -741,7 +741,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-mission - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -757,19 +757,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -880,7 +880,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-gis-server - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -896,19 +896,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1019,7 +1019,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-mqtthandler - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1035,19 +1035,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1158,7 +1158,7 @@ spec: - name: APPLICATION_NAME value: cmii-uas-gateway - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1174,19 +1174,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1297,7 +1297,7 @@ spec: - name: APPLICATION_NAME value: cmii-app-release - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1313,19 +1313,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1436,7 +1436,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-industrial-portfolio - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1452,19 +1452,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1575,7 +1575,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-clusters - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1591,19 +1591,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1714,7 +1714,7 @@ spec: - name: APPLICATION_NAME value: cmii-uas-lifecycle - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1730,19 +1730,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1853,7 +1853,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-multilink - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -1869,19 +1869,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -1992,7 +1992,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-surveillance - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2008,19 +2008,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2131,7 +2131,7 @@ spec: - name: APPLICATION_NAME value: cmii-admin-gateway - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2147,19 +2147,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2270,7 +2270,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-depotautoreturn - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2286,19 +2286,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2409,7 +2409,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-tower - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2425,19 +2425,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2548,7 +2548,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-integration - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2564,19 +2564,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2687,7 +2687,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-brain - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2703,19 +2703,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2826,7 +2826,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-alarm - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2842,19 +2842,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -2965,7 +2965,7 @@ spec: - name: APPLICATION_NAME value: cmii-iam-gateway - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -2981,19 +2981,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3104,7 +3104,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-waypoint - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3120,19 +3120,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3243,7 +3243,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-developer - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3259,19 +3259,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3382,7 +3382,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-kpi-monitor - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3398,19 +3398,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3521,7 +3521,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-gateway - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3537,19 +3537,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3660,7 +3660,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-autowaypoint - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3676,19 +3676,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3799,7 +3799,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-device - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3815,19 +3815,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -3938,7 +3938,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-process - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -3954,19 +3954,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4077,7 +4077,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-oauth - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4093,19 +4093,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4216,7 +4216,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-cloud-live - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4232,19 +4232,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4355,7 +4355,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-user - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4371,19 +4371,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4494,7 +4494,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-data-post-process - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4510,19 +4510,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4633,7 +4633,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-grid-engine - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4649,19 +4649,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4772,7 +4772,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-threedsimulation - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4788,19 +4788,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -4911,7 +4911,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-emergency - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -4927,19 +4927,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5050,7 +5050,7 @@ spec: - name: APPLICATION_NAME value: cmii-suav-supervision - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5066,19 +5066,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5189,7 +5189,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-material-warehouse - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5205,19 +5205,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5328,7 +5328,7 @@ spec: - name: APPLICATION_NAME value: cmii-admin-data - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5344,19 +5344,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5467,7 +5467,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-grid-datasource - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5483,19 +5483,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5606,7 +5606,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-grid-manage - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5622,19 +5622,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5745,7 +5745,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-sense-adapter - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5761,19 +5761,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: @@ -5884,7 +5884,7 @@ spec: - name: APPLICATION_NAME value: cmii-uav-notice - name: CUST_JAVA_OPTS - value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + value: "-Xms500m -Xmx2500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY value: "helm-nacos:8848" - name: NACOS_DISCOVERY_IP @@ -5900,19 +5900,19 @@ spec: - name: IMAGE_VERSION value: 5.7.0 - name: NACOS_USERNAME - value: "developer" + value: "nacos" - name: NACOS_PASSWORD - value: "Deve@9128201" + value: "KingKong@95461234" ports: - name: pod-port containerPort: 8080 protocol: TCP resources: limits: - memory: 2Gi + memory: 3Gi cpu: "2" requests: - memory: 200Mi + memory: 500Mi cpu: 200m livenessProbe: httpGet: diff --git a/agent-common/real_project/jsntejpt/k8s-nfs.zip b/agent-common/real_project/jsntejpt/k8s-nfs.zip new file mode 100644 index 0000000..9cc9139 Binary files /dev/null and b/agent-common/real_project/jsntejpt/k8s-nfs.zip differ diff --git a/agent-operator/image/CmiiImageOperator.go b/agent-operator/image/CmiiImageOperator.go index e2a38e5..8834df1 100755 --- a/agent-operator/image/CmiiImageOperator.go +++ b/agent-operator/image/CmiiImageOperator.go @@ -17,6 +17,7 @@ import ( "regexp" "strconv" "strings" + "time" image2 "wdd.io/agent-common/image" "wdd.io/agent-common/logger" "wdd.io/agent-common/utils" @@ -321,7 +322,15 @@ func PullCmiiFromFileJson(filePathName string) { // PullFromFullNameList 根据镜像名列表拉取全部的镜像 func PullFromFullNameList(fullImageNameList []string) (errorPullImageList []string) { + start := time.Now() for _, fullImageName := range fullImageNameList { + if strings.HasPrefix(fullImageName, "harbor.cdcyy.com.cn") { + since := time.Since(start) + if since < 60*time.Second { + time.Sleep(60*time.Second - since) + start = time.Now() + } + } log.DebugF("start to pull => [%s]", fullImageName) pullResult := PullFromCmiiHarbor(fullImageName) if pullResult == nil { diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java index f8e86ee..8846994 100755 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -42,16 +42,16 @@ public class TestImageSyncScheduler { )); ArrayList ImageFullNameList = new ArrayList<>(List.of( - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.5.0-26810-071201" + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.7.0-31369-yunnan-082301" )); Boolean downloadAndCompressOnly = false; // String projectNamespace = "wdd"; // wdd - String projectNamespace = "cqlyj"; // 重庆林业局 +// String projectNamespace = "cqlyj"; // 重庆林业局 // String projectNamespace = "jlyd"; // 吉林移动 // String projectNamespace = "jxyd"; // 吉林移动 -// String projectNamespace = "xmyd"; // 厦门移动 + String projectNamespace = "xmyd"; // 厦门移动 // String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod