From 0d9dea58173cc1cc7bd167e6ff5d9ac5a0470f69 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Mon, 26 Aug 2024 14:54:18 +0800 Subject: [PATCH] [agent][deploy] - image sync operator --- .../real_project/cmii-iot-dispatcher.yaml | 130 ++++++ .../real_project/jsntejpt/k8s-backend.yaml | 430 +++++++++--------- .../real_project/jsntejpt/k8s-nfs.zip | Bin 0 -> 28948 bytes agent-operator/image/CmiiImageOperator.go | 9 + .../server/func/TestImageSyncScheduler.java | 6 +- 5 files changed, 357 insertions(+), 218 deletions(-) create mode 100644 agent-common/real_project/cmii-iot-dispatcher.yaml create mode 100644 agent-common/real_project/jsntejpt/k8s-nfs.zip 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 0000000000000000000000000000000000000000..9cc913960ce58ff32cbc1a1fdde51ba314eff5a8 GIT binary patch literal 28948 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 literal 0 HcmV?d00001 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