From 7f17410283e3738b28b4df56b1b1c29eb8a8a556 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 23 Aug 2022 16:32:33 +0200 Subject: [PATCH] feat: user worker registries.conf for jenkins-agent-pod --- charts/kubezero-ci/Chart.yaml | 4 ++-- charts/kubezero-ci/values.yaml | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml index bb91885c..7adebfb3 100644 --- a/charts/kubezero-ci/Chart.yaml +++ b/charts/kubezero-ci/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-ci description: KubeZero umbrella chart for all things CI type: application -version: 0.5.11 +version: 0.5.12 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -26,7 +26,7 @@ dependencies: repository: https://dl.gitea.io/charts/ condition: gitea.enabled - name: jenkins - version: 4.1.14 + version: 4.1.16 repository: https://charts.jenkins.io condition: jenkins.enabled - name: trivy diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index c45fcb90..8a56261d 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -17,7 +17,7 @@ gitea: enabled: false image: - tag: 1.17.0 + tag: 1.17.1 rootless: true securityContext: @@ -174,6 +174,9 @@ jenkins: - name: aws-token mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" readOnly: true + - name: host-registries-conf + mountPath: "/home/jenkins/.config/containers/registries.conf" + readOnly: true volumes: - name: aws-token projected: @@ -182,6 +185,10 @@ jenkins: path: token expirationSeconds: 86400 audience: "sts.amazonaws.com" + - name: host-registries-conf + hostPath: + path: /etc/containers/registries.conf + type: File rbac: readSecrets: true