ZeroDownTime
/
kubezero
3
0
Fork 0
Code Issues 1 Pull Requests 19 Releases Wiki Activity

feat: Version bump Jenkins in the CI module

This commit is contained in:
Stefan Reimer 2022-07-08 09:46:40 +02:00
parent 10f9fde087
commit 9d661c28e0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/kubezero-ci/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-ci
description: KubeZero umbrella chart for all things CI
type: application
version: 0.4.51
version: 0.5.0
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords:
@ -26,11 +26,11 @@ dependencies:
repository: https://dl.gitea.io/charts/
condition: gitea.enabled
- name: jenkins
version: 3.12.2
version: 4.1.10
repository: https://charts.jenkins.io
condition: jenkins.enabled
- name: trivy
version: 0.4.12
version: 0.4.15
repository: https://aquasecurity.github.io/helm-charts/
condition: trivy.enabled

12
charts/kubezero-ci/README.md
View File

@ -1,6 +1,6 @@
# kubezero-ci
![Version: 0.4.51](https://img.shields.io/badge/Version-0.4.51-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 0.4.54](https://img.shields.io/badge/Version-0.4.54-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
KubeZero umbrella chart for all things CI
@ -18,9 +18,9 @@ Kubernetes: `>= 1.20.0`
| Repository | Name | Version |
|------------|------|---------|
| https://aquasecurity.github.io/helm-charts/ | trivy | 0.4.12 |
| https://aquasecurity.github.io/helm-charts/ | trivy | 0.4.15 |
| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
| https://charts.jenkins.io | jenkins | 3.12.2 |
| https://charts.jenkins.io | jenkins | 4.1.10 |
| https://dl.gitea.io/charts/ | gitea | 5.0.5 |
| https://gocd.github.io/helm-chart | gocd | 1.40.8 |
@ -85,7 +85,7 @@ Kubernetes: `>= 1.20.0`
| jenkins.agent.resources.requests.cpu | string | `"512m"` | |
| jenkins.agent.resources.requests.memory | string | `"1024Mi"` | |
| jenkins.agent.showRawYaml | bool | `false` | |
| jenkins.agent.tag | string | `"v0.2.4-21"` | |
| jenkins.agent.tag | string | `"v0.2.5-1"` | |
| jenkins.agent.yamlMergeStrategy | string | `"merge"` | |
| jenkins.agent.yamlTemplate | string | `"apiVersion: v1\nkind: Pod\nspec:\n serviceAccountName: jenkins-podman-aws\n containers:\n - name: jnlp\n resources:\n limits:\n github.com/fuse: 1\n volumeMounts:\n - name: aws-token\n mountPath: \"/var/run/secrets/sts.amazonaws.com/serviceaccount/\"\n readOnly: true\n volumes:\n - name: aws-token\n projected:\n sources:\n - serviceAccountToken:\n path: token\n expirationSeconds: 86400\n audience: \"sts.amazonaws.com\""` | |
| jenkins.controller.JCasC.configScripts.zdt-settings | string | `"jenkins:\n noUsageStatistics: true\n disabledAdministrativeMonitors:\n - \"jenkins.security.ResourceDomainRecommendation\"\nunclassified:\n buildDiscarders:\n configuredBuildDiscarders:\n - \"jobBuildDiscarder\"\n - defaultBuildDiscarder:\n discarder:\n logRotator:\n artifactDaysToKeepStr: \"32\"\n artifactNumToKeepStr: \"10\"\n daysToKeepStr: \"100\"\n numToKeepStr: \"10\"\n"` | |
@ -95,7 +95,7 @@ Kubernetes: `>= 1.20.0`
| jenkins.controller.initContainerResources.limits.memory | string | `"1024Mi"` | |
| jenkins.controller.initContainerResources.requests.cpu | string | `"50m"` | |
| jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` | |
| jenkins.controller.installPlugins[0] | string | `"kubernetes:3600.v144b_cd192ca_a_"` | |
| jenkins.controller.installPlugins[0] | string | `"kubernetes:3651.v908e7db_10d06"` | |
| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:581.v0c46fa_697ffd"` | |
| jenkins.controller.installPlugins[2] | string | `"git:4.11.3"` | |
| jenkins.controller.installPlugins[3] | string | `"configuration-as-code:1429.v09b_044a_c93de"` | |
@ -111,7 +111,7 @@ Kubernetes: `>= 1.20.0`
| jenkins.controller.resources.limits.memory | string | `"4096Mi"` | |
| jenkins.controller.resources.requests.cpu | string | `"250m"` | |
| jenkins.controller.resources.requests.memory | string | `"1280Mi"` | |
| jenkins.controller.tag | string | `"2.332.3-lts-jdk17-preview"` | |
| jenkins.controller.tag | string | `"2.356-alpine-jdk17"` | |
| jenkins.controller.testEnabled | bool | `false` | |
| jenkins.enabled | bool | `false` | |
| jenkins.istio.agent.enabled | bool | `false` | |

10
charts/kubezero-ci/values.yaml
View File

@ -69,7 +69,7 @@ jenkins:
enabled: false
controller:
tag: 2.332.3-lts-jdk17-preview
tag: 2.356-alpine-jdk17
#tagLabel: alpine
disableRememberMe: true
prometheus:
@ -114,15 +114,15 @@ jenkins:
numToKeepStr: "10"
installPlugins:
- kubernetes:3600.v144b_cd192ca_a_
- kubernetes:3651.v908e7db_10d06
- workflow-aggregator:581.v0c46fa_697ffd
- git:4.11.3
- configuration-as-code:1429.v09b_044a_c93de
- configuration-as-code:1462.v069a_b_57ff5c8
- antisamy-markup-formatter:2.7
- prometheus:2.0.11
- htmlpublisher:1.30
- build-discarder:60.v1747b0eb632a
- dark-theme:156.v6cf16af6f9ef
- dark-theme:185.v276b_5a_8966a_e
serviceAccountAgent:
create: true
@ -131,7 +131,7 @@ jenkins:
# Preconfigure agents to use zdt podman requires fuse/overlayfs
agent:
image: public.ecr.aws/zero-downtime/jenkins-podman
tag: v0.2.4-21
tag: v0.2.5-1
resources:
requests:
cpu: "512m"