Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve the Jenkins readiness setting #2075

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Improve the Jenkins readiness setting #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/cluster-configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file removed roles/ks-devops/files/ks-devops/charts/ks-devops-0.1.10.tgz
View file
Open in desktop
Binary file not shown.
Binary file added roles/ks-devops/files/ks-devops/charts/ks-devops-0.1.13.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion roles/ks-devops/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions roles/ks-devops/templates/ks-devops-values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down