From 1de45eecafc931c4eb0f743702db617a48e655c3 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 25 Apr 2024 14:36:22 +0000 Subject: [PATCH] chore: version bump CI tools --- charts/kubezero-ci/README.md | 12 +++++++----- charts/kubezero-ci/values.yaml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 814c228d..74032a56 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things CI @@ -20,9 +20,9 @@ Kubernetes: `>= 1.25.0` |------------|------|---------| | https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jenkins.io | jenkins | 5.1.3 | -| https://dl.gitea.io/charts/ | gitea | 10.1.3 | -| https://docs.renovatebot.com/helm-charts | renovate | 37.267.1 | +| https://charts.jenkins.io | jenkins | 5.1.6 | +| https://dl.gitea.io/charts/ | gitea | 10.1.4 | +| https://docs.renovatebot.com/helm-charts | renovate | 37.321.1 | # Jenkins - default build retention 10 builds, 32days @@ -58,6 +58,7 @@ Kubernetes: `>= 1.25.0` | gitea.gitea.admin.existingSecret | string | `"gitea-admin-secret"` | | | gitea.gitea.config.cache.ADAPTER | string | `"memory"` | | | gitea.gitea.config.database.DB_TYPE | string | `"sqlite3"` | | +| gitea.gitea.config.log.LEVEL | string | `"warn"` | | | gitea.gitea.config.queue.TYPE | string | `"level"` | | | gitea.gitea.config.session.PROVIDER | string | `"memory"` | | | gitea.gitea.config.ui.DEFAULT_THEME | string | `"github-dark"` | | @@ -98,9 +99,10 @@ Kubernetes: `>= 1.25.0` | jenkins.agent.resources.limits.memory | string | `""` | | | jenkins.agent.resources.requests.cpu | string | `""` | | | jenkins.agent.resources.requests.memory | string | `""` | | +| jenkins.agent.serviceAccount | string | `"jenkins-podman-aws"` | | | jenkins.agent.showRawYaml | bool | `false` | | | jenkins.agent.yamlMergeStrategy | string | `"merge"` | | -| jenkins.agent.yamlTemplate | string | `"apiVersion: v1\nkind: Pod\nspec:\n securityContext:\n fsGroup: 1000\n serviceAccountName: jenkins-podman-aws\n containers:\n - name: jnlp\n resources:\n requests:\n cpu: \"512m\"\n memory: \"1024Mi\"\n limits:\n cpu: \"4\"\n memory: \"6144Mi\"\n github.com/fuse: 1\n volumeMounts:\n - name: aws-token\n mountPath: \"/var/run/secrets/sts.amazonaws.com/serviceaccount/\"\n readOnly: true\n - name: host-registries-conf\n mountPath: \"/home/jenkins/.config/containers/registries.conf\"\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\"\n - name: host-registries-conf\n hostPath:\n path: /etc/containers/registries.conf\n type: File"` | | +| jenkins.agent.yamlTemplate | string | `"apiVersion: v1\nkind: Pod\nspec:\n securityContext:\n fsGroup: 1000\n containers:\n - name: jnlp\n resources:\n requests:\n cpu: \"512m\"\n memory: \"1024Mi\"\n limits:\n cpu: \"4\"\n memory: \"6144Mi\"\n github.com/fuse: 1\n volumeMounts:\n - name: aws-token\n mountPath: \"/var/run/secrets/sts.amazonaws.com/serviceaccount/\"\n readOnly: true\n - name: host-registries-conf\n mountPath: \"/home/jenkins/.config/containers/registries.conf\"\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\"\n - name: host-registries-conf\n hostPath:\n path: /etc/containers/registries.conf\n type: File"` | | | jenkins.controller.JCasC.configScripts.zdt-settings | string | `"jenkins:\n noUsageStatistics: true\n disabledAdministrativeMonitors:\n - \"jenkins.security.ResourceDomainRecommendation\"\nappearance:\n themeManager:\n disableUserThemes: true\n theme: \"dark\"\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"` | | | jenkins.controller.disableRememberMe | bool | `true` | | | jenkins.controller.enableRawHtmlMarkupFormatter | bool | `true` | | diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index 5f6fadb6..88b9c5ad 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -171,6 +171,7 @@ jenkins: podRetention: "Default" showRawYaml: false podName: "podman-aws" + serviceAccount: jenkins-podman-aws annotations: container.apparmor.security.beta.kubernetes.io/jnlp: unconfined customJenkinsLabels: @@ -198,7 +199,6 @@ jenkins: spec: securityContext: fsGroup: 1000 - serviceAccountName: jenkins-podman-aws containers: - name: jnlp resources: