From d0431f319352d686913aa201717ae6fe530a9a36 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 4 Dec 2024 18:37:39 +0000 Subject: [PATCH] feat: latest CI, switch Jenkins to LTS image --- charts/kubezero-ci/README.md | 13 ++++++------- charts/kubezero-ci/charts/jenkins/CHANGELOG.md | 12 ++++++++++++ charts/kubezero-ci/charts/jenkins/Chart.yaml | 8 ++++---- charts/kubezero-ci/charts/jenkins/VALUES.md | 2 +- charts/kubezero-ci/charts/jenkins/values.yaml | 4 ++-- charts/kubezero-ci/values.yaml | 8 ++++---- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 60f14a5e..34e69239 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.8.18](https://img.shields.io/badge/Version-0.8.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.8.19](https://img.shields.io/badge/Version-0.8.19-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,11 +18,11 @@ Kubernetes: `>= 1.25.0` | Repository | Name | Version | |------------|------|---------| -| https://aquasecurity.github.io/helm-charts/ | trivy | 0.8.0 | +| https://aquasecurity.github.io/helm-charts/ | trivy | 0.9.0 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jenkins.io | jenkins | 5.7.12 | +| https://charts.jenkins.io | jenkins | 5.7.15 | | https://dl.gitea.io/charts/ | gitea | 10.6.0 | -| https://docs.renovatebot.com/helm-charts | renovate | 38.142.6 | +| https://docs.renovatebot.com/helm-charts | renovate | 39.33.1 | # Jenkins - default build retention 10 builds, 32days @@ -92,7 +92,7 @@ Kubernetes: `>= 1.25.0` | jenkins.agent.defaultsProviderTemplate | string | `"podman-aws"` | | | jenkins.agent.idleMinutes | int | `30` | | | jenkins.agent.image.repository | string | `"public.ecr.aws/zero-downtime/jenkins-podman"` | | -| jenkins.agent.image.tag | string | `"v0.6.2"` | | +| jenkins.agent.image.tag | string | `"v0.7.0"` | | | jenkins.agent.inheritYamlMergeStrategy | bool | `true` | | | jenkins.agent.podName | string | `"podman-aws"` | | | jenkins.agent.podRetention | string | `"Default"` | | @@ -113,7 +113,7 @@ Kubernetes: `>= 1.25.0` | jenkins.controller.containerEnv[1].value | string | `"none"` | | | jenkins.controller.disableRememberMe | bool | `true` | | | jenkins.controller.enableRawHtmlMarkupFormatter | bool | `true` | | -| jenkins.controller.image.tag | string | `"alpine-jdk21"` | | +| jenkins.controller.image.tag | string | `"lts-alpine-jdk21"` | | | jenkins.controller.initContainerResources.limits.memory | string | `"1024Mi"` | | | jenkins.controller.initContainerResources.requests.cpu | string | `"50m"` | | | jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` | | @@ -162,7 +162,6 @@ Kubernetes: `>= 1.25.0` | renovate.env.LOG_FORMAT | string | `"json"` | | | renovate.securityContext.fsGroup | int | `1000` | | | trivy.enabled | bool | `false` | | -| trivy.image.tag | string | `"0.56.2"` | | | trivy.persistence.enabled | bool | `true` | | | trivy.persistence.size | string | `"1Gi"` | | | trivy.rbac.create | bool | `false` | | diff --git a/charts/kubezero-ci/charts/jenkins/CHANGELOG.md b/charts/kubezero-ci/charts/jenkins/CHANGELOG.md index 0b7f45dd..726db7f4 100644 --- a/charts/kubezero-ci/charts/jenkins/CHANGELOG.md +++ b/charts/kubezero-ci/charts/jenkins/CHANGELOG.md @@ -12,6 +12,18 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0. The changelog until v1.5.7 was auto-generated based on git commits. Those entries include a reference to the git commit to be able to get more details. +## 5.7.15 + +Update `jenkins/jenkins` to version `2.479.2-jdk17` + +## 5.7.14 + +Update `kubernetes` to version `4296.v20a_7e4d77cf6` + +## 5.7.13 + +Update `configuration-as-code` to version `1897.v79281e066ea_7` + ## 5.7.12 Update `configuration-as-code` to version `1887.v9e47623cb_043` diff --git a/charts/kubezero-ci/charts/jenkins/Chart.yaml b/charts/kubezero-ci/charts/jenkins/Chart.yaml index 7a6fcf29..baa39f69 100644 --- a/charts/kubezero-ci/charts/jenkins/Chart.yaml +++ b/charts/kubezero-ci/charts/jenkins/Chart.yaml @@ -1,10 +1,10 @@ annotations: artifacthub.io/category: integration-delivery artifacthub.io/changes: | - - Update `configuration-as-code` to version `1887.v9e47623cb_043` + - Update `jenkins/jenkins` to version `2.479.2-jdk17` artifacthub.io/images: | - name: jenkins - image: docker.io/jenkins/jenkins:2.479.1-jdk17 + image: docker.io/jenkins/jenkins:2.479.2-jdk17 - name: k8s-sidecar image: docker.io/kiwigrid/k8s-sidecar:1.28.0 - name: inbound-agent @@ -18,7 +18,7 @@ annotations: - name: support url: https://github.com/jenkinsci/helm-charts/issues apiVersion: v2 -appVersion: 2.479.1 +appVersion: 2.479.2 description: 'Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project. ' @@ -46,4 +46,4 @@ sources: - https://github.com/maorfr/kube-tasks - https://github.com/jenkinsci/configuration-as-code-plugin type: application -version: 5.7.12 +version: 5.7.15 diff --git a/charts/kubezero-ci/charts/jenkins/VALUES.md b/charts/kubezero-ci/charts/jenkins/VALUES.md index 3949ee8e..4bf71b60 100644 --- a/charts/kubezero-ci/charts/jenkins/VALUES.md +++ b/charts/kubezero-ci/charts/jenkins/VALUES.md @@ -165,7 +165,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.initializeOnce](./values.yaml#L420) | bool | Initialize only on first installation. Ensures plugins do not get updated inadvertently. Requires `persistence.enabled` to be set to `true` | `false` | | [controller.installLatestPlugins](./values.yaml#L409) | bool | Download the minimum required version or latest version of all dependencies | `true` | | [controller.installLatestSpecifiedPlugins](./values.yaml#L412) | bool | Set to true to download the latest version of any plugin that is requested to have the latest version | `false` | -| [controller.installPlugins](./values.yaml#L401) | list | List of Jenkins plugins to install. If you don't want to install plugins, set it to `false` | `["kubernetes:4295.v7fa_01b_309c95","workflow-aggregator:600.vb_57cdd26fdd7","git:5.6.0","configuration-as-code:1887.v9e47623cb_043"]` | +| [controller.installPlugins](./values.yaml#L401) | list | List of Jenkins plugins to install. If you don't want to install plugins, set it to `false` | `["kubernetes:4296.v20a_7e4d77cf6","workflow-aggregator:600.vb_57cdd26fdd7","git:5.6.0","configuration-as-code:1897.v79281e066ea_7"]` | | [controller.javaOpts](./values.yaml#L162) | string | Append to `JAVA_OPTS` env var | `nil` | | [controller.jenkinsAdminEmail](./values.yaml#L96) | string | Email address for the administrator of the Jenkins instance | `nil` | | [controller.jenkinsHome](./values.yaml#L101) | string | Custom Jenkins home path | `"/var/jenkins_home"` | diff --git a/charts/kubezero-ci/charts/jenkins/values.yaml b/charts/kubezero-ci/charts/jenkins/values.yaml index e525da60..60752f9b 100644 --- a/charts/kubezero-ci/charts/jenkins/values.yaml +++ b/charts/kubezero-ci/charts/jenkins/values.yaml @@ -399,10 +399,10 @@ controller: # Plugins will be installed during Jenkins controller start # -- List of Jenkins plugins to install. If you don't want to install plugins, set it to `false` installPlugins: - - kubernetes:4295.v7fa_01b_309c95 + - kubernetes:4296.v20a_7e4d77cf6 - workflow-aggregator:600.vb_57cdd26fdd7 - git:5.6.0 - - configuration-as-code:1887.v9e47623cb_043 + - configuration-as-code:1897.v79281e066ea_7 # If set to false, Jenkins will download the minimum required version of all dependencies. # -- Download the minimum required version or latest version of all dependencies diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index cce38e28..6f584507 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -2,7 +2,7 @@ gitea: enabled: false image: - tag: 1.22.3 + tag: 1.22.4 rootless: true repliaCount: 1 @@ -90,7 +90,7 @@ jenkins: controller: image: - tag: alpine-jdk21 + tag: lts-alpine-jdk21 #tagLabel: alpine disableRememberMe: true prometheus: @@ -276,8 +276,8 @@ jenkins: trivy: enabled: false - image: - tag: 0.57.0 + #image: + #tag: 0.57.0 persistence: enabled: true size: 1Gi