Merge branch 'master' into bug-8971

TencentBlueKing · Jun 29, 2023 · f05fa98 · f05fa98
2 parents a72e617 + 1de1b12
commit f05fa98
Show file tree

Hide file tree

Showing 241 changed files with 5,042 additions and 2,059 deletions.
diff --git a/docker-images/core/ci/dockerfile/backend.bkci.sh b/docker-images/core/ci/dockerfile/backend.bkci.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
+JAVA_TOOL_OPTIONS_TMP=$JAVA_TOOL_OPTIONS
 echo "source env files..."
 source service.env
-MEM_OPTS="-XX:+UseContainerSupport -XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0 -XX:MetaspaceSize=500m -XX:MaxMetaspaceSize=500m -XX:-UseAdaptiveSizePolicy"
+export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS $JAVA_TOOL_OPTIONS_TMP"
+
+MEM_OPTS="-XX:+UseContainerSupport -Xss512k -XX:MaxMetaspaceSize=500m -XX:CompressedClassSpaceSize=100m -XX:ReservedCodeCacheSize=400m -XX:-UseAdaptiveSizePolicy -XX:MaxGCPauseMillis=100"
 GC_LOG="-Xloggc:/data/workspace/$MS_NAME/jvm/gc-%t.log -XX:+PrintTenuringDistribution -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
 API_PORT=80
 

diff --git a/helm-charts/core/ci/base/values.yaml b/helm-charts/core/ci/base/values.yaml
@@ -484,6 +484,9 @@ log:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -522,82 +525,9 @@ auth:
     limits:
       cpu: 500m
       memory: 1500Mi
-  hostAliases: []
-  containerSecurityContext:
-    enabled: false
-    runAsUser: 1001
-    runAsNonRoot: true
-  podSecurityContext:
-    enabled: false
-    fsGroup: 1001
-  podAffinityPreset: ""
-  podAntiAffinityPreset: soft
-  nodeAffinityPreset:
-    type: ""
-    key: ""
-    values: []
-  affinity: {}
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  priorityClassName: ""
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 3
-    targetCPU: 80
-    targetMemory: 80
-
-# agentless Deployment
-agentless:
-  enabled: true
-  replicas: 1
-  podLabels: {}
-  resources:
-    requests:
-      cpu: 100m
-      memory: 1000Mi
-    limits:
-      cpu: 500m
-      memory: 1500Mi
-  hostAliases: []
-  containerSecurityContext:
-    enabled: false
-    runAsUser: 1001
-    runAsNonRoot: true
-  podSecurityContext:
-    enabled: false
-    fsGroup: 1001
-  podAffinityPreset: ""
-  podAntiAffinityPreset: soft
-  nodeAffinityPreset:
-    type: ""
-    key: ""
-    values: []
-  affinity: {}
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  priorityClassName: ""
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 3
-    targetCPU: 80
-    targetMemory: 80
-
-# dockerhost Deployment
-dockerhost:
-  enabled: true
-  replicas: 1
-  podLabels: {}
-  resources:
-    requests:
-      cpu: 100m
-      memory: 1000Mi
-    limits:
-      cpu: 500m
-      memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -636,6 +566,9 @@ artifactory:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -674,6 +607,9 @@ dispatch:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -712,6 +648,9 @@ dispatchDocker:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -750,6 +689,9 @@ dispatchKubernetes:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -788,6 +730,9 @@ environment:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -826,6 +771,9 @@ image:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -864,6 +812,9 @@ misc:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -902,6 +853,9 @@ metrics:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -940,6 +894,9 @@ monitoring:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -978,6 +935,9 @@ notify:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1019,6 +979,9 @@ openapi:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1057,6 +1020,9 @@ plugin:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1095,6 +1061,9 @@ process:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1133,6 +1102,9 @@ project:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1171,6 +1143,9 @@ quality:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1209,44 +1184,9 @@ repository:
     limits:
       cpu: 500m
       memory: 1500Mi
-  hostAliases: []
-  containerSecurityContext:
-    enabled: false
-    runAsUser: 1001
-    runAsNonRoot: true
-  podSecurityContext:
-    enabled: false
-    fsGroup: 1001
-  podAffinityPreset: ""
-  podAntiAffinityPreset: soft
-  nodeAffinityPreset:
-    type: ""
-    key: ""
-    values: []
-  affinity: {}
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  priorityClassName: ""
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 3
-    targetCPU: 80
-    targetMemory: 80
-
-# sign Deployment
-sign:
-  enabled: true
-  replicas: 1
-  podLabels: {}
-  resources:
-    requests:
-      cpu: 100m
-      memory: 1000Mi
-    limits:
-      cpu: 500m
-      memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1285,6 +1225,9 @@ store:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1323,6 +1266,9 @@ ticket:
     limits:
       cpu: 500m
       memory: 1500Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1361,44 +1307,9 @@ websocket:
     limits:
       cpu: 500m
       memory: 1500Mi
-  hostAliases: []
-  containerSecurityContext:
-    enabled: false
-    runAsUser: 1001
-    runAsNonRoot: true
-  podSecurityContext:
-    enabled: false
-    fsGroup: 1001
-  podAffinityPreset: ""
-  podAntiAffinityPreset: soft
-  nodeAffinityPreset:
-    type: ""
-    key: ""
-    values: []
-  affinity: {}
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  priorityClassName: ""
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 3
-    targetCPU: 80
-    targetMemory: 80
-
-# angetless Deployment
-angetless:
-  enabled: true
-  replicas: 1
-  podLabels: {}
-  resources:
-    requests:
-      cpu: 100m
-      memory: 1000Mi
-    limits:
-      cpu: 500m
-      memory: 3000Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false
@@ -1516,7 +1427,7 @@ gateway:
 
 # stream Deployment
 stream:
-  enabled: true
+  enabled: false
   replicas: 1
   podLabels: {}
   resources:
@@ -1526,6 +1437,9 @@ stream:
     limits:
       cpu: 500m
       memory: 3000Mi
+  jvm:
+    heapPct: "70.0"
+    initSecs: 50
   hostAliases: []
   containerSecurityContext:
     enabled: false