feat: CI module new Jenkins plugins, updates
This commit is contained in:
parent
3c430d7f57
commit
1c2f67524e
@ -2,7 +2,7 @@ apiVersion: v2
|
|||||||
name: kubezero-ci
|
name: kubezero-ci
|
||||||
description: KubeZero umbrella chart for all things CI
|
description: KubeZero umbrella chart for all things CI
|
||||||
type: application
|
type: application
|
||||||
version: 0.5.20
|
version: 0.5.23
|
||||||
home: https://kubezero.com
|
home: https://kubezero.com
|
||||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||||
keywords:
|
keywords:
|
||||||
@ -26,7 +26,7 @@ dependencies:
|
|||||||
repository: https://dl.gitea.io/charts/
|
repository: https://dl.gitea.io/charts/
|
||||||
condition: gitea.enabled
|
condition: gitea.enabled
|
||||||
- name: jenkins
|
- name: jenkins
|
||||||
version: 4.2.13
|
version: 4.2.17
|
||||||
repository: https://charts.jenkins.io
|
repository: https://charts.jenkins.io
|
||||||
condition: jenkins.enabled
|
condition: jenkins.enabled
|
||||||
- name: trivy
|
- name: trivy
|
||||||
|
@ -32,6 +32,13 @@ gitea:
|
|||||||
enabled: true
|
enabled: true
|
||||||
size: 4Gi
|
size: 4Gi
|
||||||
|
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: "150m"
|
||||||
|
memory: "320Mi"
|
||||||
|
limits:
|
||||||
|
memory: "2048Mi"
|
||||||
|
|
||||||
gitea:
|
gitea:
|
||||||
admin:
|
admin:
|
||||||
existingSecret: gitea-admin-secret
|
existingSecret: gitea-admin-secret
|
||||||
@ -84,14 +91,14 @@ jenkins:
|
|||||||
cpu: "250m"
|
cpu: "250m"
|
||||||
memory: "1280Mi"
|
memory: "1280Mi"
|
||||||
limits:
|
limits:
|
||||||
cpu: "2000m"
|
#cpu: "2000m"
|
||||||
memory: "4096Mi"
|
memory: "4096Mi"
|
||||||
initContainerResources:
|
initContainerResources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "50m"
|
cpu: "50m"
|
||||||
memory: "256Mi"
|
memory: "256Mi"
|
||||||
limits:
|
limits:
|
||||||
cpu: "1000m"
|
#cpu: "1000m"
|
||||||
memory: "1024Mi"
|
memory: "1024Mi"
|
||||||
|
|
||||||
JCasC:
|
JCasC:
|
||||||
@ -114,9 +121,12 @@ jenkins:
|
|||||||
numToKeepStr: "10"
|
numToKeepStr: "10"
|
||||||
|
|
||||||
installPlugins:
|
installPlugins:
|
||||||
- kubernetes:3734.v562b_b_a_627ea_c
|
- kubernetes:3743.v1fa_4c724c3b_7
|
||||||
- workflow-aggregator:581.v0c46fa_697ffd
|
- workflow-aggregator:581.v0c46fa_697ffd
|
||||||
- git:4.14.2
|
- git:4.14.3
|
||||||
|
- basic-branch-build-strategies:71.vc1421f89888e
|
||||||
|
- pipeline-graph-view:144.vf3924feb_7e35
|
||||||
|
- pipeline-stage-view:2.28
|
||||||
- configuration-as-code:1569.vb_72405b_80249
|
- configuration-as-code:1569.vb_72405b_80249
|
||||||
- antisamy-markup-formatter:155.v795fb_8702324
|
- antisamy-markup-formatter:155.v795fb_8702324
|
||||||
- prometheus:2.0.11
|
- prometheus:2.0.11
|
||||||
@ -133,20 +143,13 @@ jenkins:
|
|||||||
agent:
|
agent:
|
||||||
image: public.ecr.aws/zero-downtime/jenkins-podman
|
image: public.ecr.aws/zero-downtime/jenkins-podman
|
||||||
tag: v0.4.1
|
tag: v0.4.1
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: "512m"
|
|
||||||
memory: "1024Mi"
|
|
||||||
limits:
|
|
||||||
cpu: "4"
|
|
||||||
memory: "6144Mi"
|
|
||||||
#alwaysPullImage: true
|
#alwaysPullImage: true
|
||||||
podRetention: "Default"
|
podRetention: "Default"
|
||||||
showRawYaml: false
|
showRawYaml: false
|
||||||
podName: "podman-aws"
|
podName: "podman-aws"
|
||||||
customJenkinsLabels:
|
customJenkinsLabels:
|
||||||
- podman-aws-trivy
|
- podman-aws-trivy
|
||||||
idleMinutes: 10
|
idleMinutes: 15
|
||||||
containerCap: 2
|
containerCap: 2
|
||||||
annotations:
|
annotations:
|
||||||
container.apparmor.security.beta.kubernetes.io/jnlp: unconfined
|
container.apparmor.security.beta.kubernetes.io/jnlp: unconfined
|
||||||
@ -168,7 +171,12 @@ jenkins:
|
|||||||
containers:
|
containers:
|
||||||
- name: jnlp
|
- name: jnlp
|
||||||
resources:
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: "512m"
|
||||||
|
memory: "1024Mi"
|
||||||
limits:
|
limits:
|
||||||
|
cpu: "4"
|
||||||
|
memory: "6144Mi"
|
||||||
github.com/fuse: 1
|
github.com/fuse: 1
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: aws-token
|
- name: aws-token
|
||||||
@ -216,7 +224,7 @@ jenkins:
|
|||||||
trivy:
|
trivy:
|
||||||
enabled: false
|
enabled: false
|
||||||
image:
|
image:
|
||||||
tag: 0.34.0
|
tag: 0.35.0
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
size: 1Gi
|
size: 1Gi
|
||||||
|
Loading…
Reference in New Issue
Block a user