Merge pull request #2076 from ks-ci-bot/cherry-pick-2075-to-release-3.3

[release-3.3] Improve the Jenkins readiness setting

deploy/cluster-configuration.yaml

@@ -80,8 +80,8 @@ spec:
   devops:                  # (CPU: 0.47 Core, Memory: 8.6 G) Provide an out-of-the-box CI/CD system based on Jenkins, and automated workflow tools including Source-to-Image & Binary-to-Image.
     enabled: false             # Enable or disable the KubeSphere DevOps System.
     # resources: {}
-    jenkinsMemoryLim: 4Gi      # Jenkins memory limit.
-    jenkinsMemoryReq: 1500Mi   # Jenkins memory request.
+    jenkinsMemoryLim: 8Gi      # Jenkins memory limit.
+    jenkinsMemoryReq: 4Gi   # Jenkins memory request.
     jenkinsVolumeSize: 8Gi     # Jenkins volume size.
   events:                  # Provide a graphical web console for Kubernetes Events exporting, filtering and alerting in multi-tenant Kubernetes clusters.
     enabled: false         # Enable or disable the KubeSphere Events System.

roles/ks-devops/tasks/main.yaml

@@ -195,7 +195,7 @@
     # Delete Job migrate because 'helm upgrade' will try to update immutable fields of Job, which is not allowed. 
     {{ bin_dir }}/kubectl delete job -n kubesphere-devops-system migrate --ignore-not-found
     
-    ks_devops_chart_version=0.1.10
+    ks_devops_chart_version=0.1.13
     charts_folder={{ kubesphere_dir }}/ks-devops/charts
     ks_devops_chart=$charts_folder/ks-devops-$ks_devops_chart_version.tgz
     

roles/ks-devops/templates/ks-devops-values.yaml.j2

@@ -75,10 +75,10 @@ jenkins:
     ImagePullPolicy: {{ ks_image_pull_policy }}
     resources:
       requests:
-        cpu: "0.1"
+        cpu: "2"
         memory: "{{ devops.jenkinsMemoryReq }}"
       limits:
-        cpu: "2"
+        cpu: "4"
         memory: "{{ devops.jenkinsMemoryLim }}"
     JavaOpts: "{{ JavaOpts }}"
   Agent: