From 78639b623acc8f8720b711498525fa9951cd6458 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sun, 24 Mar 2024 18:49:08 +0000 Subject: [PATCH] feat: version bump cert-manager, gitea and Jenkins --- Dockerfile | 2 +- charts/kubezero-cert-manager/README.md | 5 +- .../jsonnetfile.lock.json | 72 ++++++++++++------- charts/kubezero-ci/README.md | 9 +-- charts/kubezero-ci/values.yaml | 6 +- 5 files changed, 59 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index 41bff95..5e4e304 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG ALPINE_VERSION=3.19 FROM docker.io/alpine:${ALPINE_VERSION} ARG ALPINE_VERSION -ARG KUBE_VERSION=1.28 +ARG KUBE_VERSION=1.28.8 RUN cd /etc/apk/keys && \ wget "https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub" && \ diff --git a/charts/kubezero-cert-manager/README.md b/charts/kubezero-cert-manager/README.md index 05da174..103f113 100644 --- a/charts/kubezero-cert-manager/README.md +++ b/charts/kubezero-cert-manager/README.md @@ -1,6 +1,6 @@ # kubezero-cert-manager -![Version: 0.9.6](https://img.shields.io/badge/Version-0.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.9.7](https://img.shields.io/badge/Version-0.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for cert-manager @@ -19,7 +19,7 @@ Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jetstack.io | cert-manager | v1.13.2 | +| https://charts.jetstack.io | cert-manager | v1.14.4 | ## AWS - OIDC IAM roles @@ -37,6 +37,7 @@ If your resolvers need additional sercrets like CloudFlare API tokens etc. make | cert-manager.cainjector.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | | cert-manager.cainjector.tolerations[0].effect | string | `"NoSchedule"` | | | cert-manager.cainjector.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | +| cert-manager.enableCertificateOwnerRef | bool | `true` | | | cert-manager.enabled | bool | `true` | | | cert-manager.extraArgs[0] | string | `"--logging-format=json"` | | | cert-manager.extraArgs[1] | string | `"--leader-elect=false"` | | diff --git a/charts/kubezero-cert-manager/jsonnetfile.lock.json b/charts/kubezero-cert-manager/jsonnetfile.lock.json index 662f215..da77c08 100644 --- a/charts/kubezero-cert-manager/jsonnetfile.lock.json +++ b/charts/kubezero-cert-manager/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "f0708d350e4fc95e95338fb54af7b571e5bce7a8", + "version": "5a53a708d8ab9ef936ac5b8062ffc66c77a2c18f", "sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU=" }, { @@ -51,6 +51,16 @@ "version": "a1d61cce1da59c71409b99b5c7568511fec661ea", "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM=" }, + { + "source": { + "git": { + "remote": "https://github.com/grafana/grafonnet.git", + "subdir": "gen/grafonnet-latest" + } + }, + "version": "6ac1593ca787638da223380ff4a3fd0f96e953e1", + "sum": "GxEO83uxgsDclLp/fmlUJZDbSGpeUZY6Ap3G2cgdL1g=" + }, { "source": { "git": { @@ -58,8 +68,18 @@ "subdir": "gen/grafonnet-v10.0.0" } }, - "version": "bb2afaffbcefeae1035cd691ab06a486e0022002", - "sum": "gj/20VIGucG2vDGjG7YdHLC4yUUfrpuaneUYaRmymOM=" + "version": "6ac1593ca787638da223380ff4a3fd0f96e953e1", + "sum": "W7sLuAvMSJPkC7Oo31t45Nz/cUdJV7jzNSJTd3F1daM=" + }, + { + "source": { + "git": { + "remote": "https://github.com/grafana/grafonnet.git", + "subdir": "gen/grafonnet-v10.4.0" + } + }, + "version": "6ac1593ca787638da223380ff4a3fd0f96e953e1", + "sum": "ZSmDT7i/qU9P8ggmuPuJT+jonq1ZEsBRCXycW/H5L/A=" }, { "source": { @@ -68,8 +88,8 @@ "subdir": "grafana-builder" } }, - "version": "eb731883044fc58f255d79c2a8d78a5854084e05", - "sum": "VmOxvg9FuY9UYr3lN6ZJe2HhuIErJoWimPybQr3S3yQ=" + "version": "7561fd330312538d22b00e0c7caecb4ba66321ea", + "sum": "+z5VY+bPBNqXcmNAV8xbJcbsRA+pro1R3IM7aIY8OlU=" }, { "source": { @@ -88,8 +108,8 @@ "subdir": "doc-util" } }, - "version": "503e5c8fe96d6b55775037713ac10b184709ad93", - "sum": "BY4u0kLF3Qf/4IB4HnX9S5kEQIpHb4MUrppp6WLDtlU=" + "version": "6ac6c69685b8c29c54515448eaca583da2d88150", + "sum": "BrAL/k23jq+xy9oA7TWIhUx07dsA/QLm3g7ktCwe//U=" }, { "source": { @@ -98,8 +118,8 @@ "subdir": "" } }, - "version": "c1a315a7dbead0335a5e0486acc5583395b22a24", - "sum": "UVdL+uuFI8BSQgLfMJEJk2WDKsQXNT3dRHcr2Ti9rLI=" + "version": "fc2e57a8839902ed4ba6cab5a99d642500f7102b", + "sum": "43waffw1QzvpY4rKcWoo3L7Vpee+DCYexwLDd5cPG0M=" }, { "source": { @@ -108,8 +128,8 @@ "subdir": "" } }, - "version": "2dbe4f9625a811b8b89f0495e74509c74779da82", - "sum": "Fe7bN9E6qeKNUdENjQvYttgf4S1DDqXRVB80wdmQgHQ=" + "version": "a1c276d7a46c4b06fa5d8b4a64441939d398efe5", + "sum": "b/mEai1MvVnZ22YvZlXEO4jWDZledrtJg8eOS1ZUj0M=" }, { "source": { @@ -118,8 +138,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "98b38ba9bbfdff27b359c58adecab30cc1311a78", - "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g=" + "version": "9ba1c3702142918e09e8eb5ca530e15198624259", + "sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0=" }, { "source": { @@ -128,7 +148,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "98b38ba9bbfdff27b359c58adecab30cc1311a78", + "version": "9ba1c3702142918e09e8eb5ca530e15198624259", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -138,8 +158,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "80ab54b66a88cd40fc935d17abbd7b50b12cc3f7", - "sum": "w35hpzjA5b+xr9dXnpudKRsdTheO9YO1SESoG4oyyL8=" + "version": "76f2e1ef95be0df752037baa040781c5219e1fb3", + "sum": "IgpAgyyBZ7VT2vr9kSYQP/lkZUNQnbqpGh2sYCtUKs0=" }, { "source": { @@ -148,8 +168,8 @@ "subdir": "jsonnet/mixin" } }, - "version": "88e86c5caf84dc85338c904e13b0656bf1b56a67", - "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=", + "version": "71d9433ba612f4b826ffa38520b23a7985b50db3", + "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, { @@ -159,8 +179,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "88e86c5caf84dc85338c904e13b0656bf1b56a67", - "sum": "3tRcbCxuH5piaixkvwe4UdVVWlxkxKz8eBgbgYqvbRk=" + "version": "71d9433ba612f4b826ffa38520b23a7985b50db3", + "sum": "S4LFa0h1AzANixqGMowtwVswVP+y6f+fXloxpO7hMes=" }, { "source": { @@ -169,7 +189,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "4494abfce419d1bbd3cb1a2c0b6584da88ac9b64", + "version": "14cbe6301c732658d6fe877ec55ad5b738abcf06", "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=", "name": "alertmanager" }, @@ -180,8 +200,8 @@ "subdir": "docs/node-mixin" } }, - "version": "12f1744e799e04373c7a29b42bf8b8a332c82790", - "sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg=" + "version": "3accd4cf8286e69d70516abdced6bf186274322a", + "sum": "vWhHvFqV7+fxrQddTeGVKi1e4EzB3VWtNyD8TjSmevY=" }, { "source": { @@ -190,8 +210,8 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "5dbbadf59823aea6e9daa5e6c7877f1572b93941", - "sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=", + "version": "773170f372e0a57949854b74231ee3e09185f728", + "sum": "u/Fpz2MPkezy71/q+c7mF0vc3hE9fWt2W/YbvF0LP/8=", "name": "prometheus" }, { @@ -212,7 +232,7 @@ "subdir": "mixin" } }, - "version": "463dd481cc740194cc9504cd6aeb48f342afe020", + "version": "93c79b61825ec00889188e35a58635eee247bc36", "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=", "name": "thanos-mixin" } diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 541aff9..814c228 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.8.7](https://img.shields.io/badge/Version-0.8.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![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) 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.0 | +| 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.236.0 | +| https://docs.renovatebot.com/helm-charts | renovate | 37.267.1 | # Jenkins - default build retention 10 builds, 32days @@ -66,6 +66,7 @@ Kubernetes: `>= 1.25.0` | gitea.gitea.metrics.enabled | bool | `false` | | | gitea.gitea.metrics.serviceMonitor.enabled | bool | `true` | | | gitea.image.rootless | bool | `true` | | +| gitea.image.tag | string | `"1.21.9"` | | | gitea.istio.enabled | bool | `false` | | | gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | gitea.istio.url | string | `"git.example.com"` | | @@ -90,7 +91,7 @@ Kubernetes: `>= 1.25.0` | jenkins.agent.customJenkinsLabels[0] | string | `"podman-aws-trivy"` | | | jenkins.agent.idleMinutes | int | `30` | | | jenkins.agent.image.repository | string | `"public.ecr.aws/zero-downtime/jenkins-podman"` | | -| jenkins.agent.image.tag | string | `"v0.4.6"` | | +| jenkins.agent.image.tag | string | `"v0.5.0"` | | | jenkins.agent.podName | string | `"podman-aws"` | | | jenkins.agent.podRetention | string | `"Default"` | | | jenkins.agent.resources.limits.cpu | string | `""` | | diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index d9f8a0c..5f6fadb 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -2,7 +2,7 @@ gitea: enabled: false image: - #tag: 1.21.4 + tag: 1.21.9 rootless: true repliaCount: 1 @@ -42,7 +42,7 @@ gitea: extraVolumeMounts: - name: gitea-themes readOnly: true - mountPath: "/data/gitea/public/assets/css" + mountPath: "/data/gitea/public/assets/css" checkDeprecation: false test: @@ -72,6 +72,8 @@ gitea: ui: THEMES: "gitea,github-dark" DEFAULT_THEME: "github-dark" + log: + LEVEL: warn redis-cluster: enabled: false