From 1d340d87f5095efa6e40c7cf8390c59789ff4bba Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 24 Sep 2024 20:06:32 +0000 Subject: [PATCH] robot: project jenkins chart upgrades from 0.4.3 to 0.4.4 Signed-off-by: robot --- charts/jenkins/config | 2 +- charts/jenkins/jenkins/Chart.yaml | 6 +- .../charts/jenkins/.relok8s-images.yaml | 56 +++++++++---------- .../jenkins/jenkins/charts/jenkins/Chart.yaml | 4 +- .../jenkins/charts/jenkins/values.yaml | 34 +++++------ charts/jenkins/jenkins/values.yaml | 34 +++++------ 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/charts/jenkins/config b/charts/jenkins/config index e6ccea81f..2c6e7d232 100644 --- a/charts/jenkins/config +++ b/charts/jenkins/config @@ -5,7 +5,7 @@ export USE_OPENSOURCE_CHART=false export REPO_URL=https://amamba-io.github.io/charts export REPO_NAME=amamba export CHART_NAME=jenkins -export VERSION=0.4.3 +export VERSION=0.4.4 # pr, issue, none diff --git a/charts/jenkins/jenkins/Chart.yaml b/charts/jenkins/jenkins/Chart.yaml index 917c285bf..ed878372e 100644 --- a/charts/jenkins/jenkins/Chart.yaml +++ b/charts/jenkins/jenkins/Chart.yaml @@ -2,7 +2,7 @@ annotations: addon.kpanda.io/repo: addon addon.kpanda.io/source: addon apiVersion: v2 -appVersion: 0.4.3 +appVersion: 0.4.4 description: jenkins charts of amamba. home: https://github.com/amamba-io/jenkins-agent icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg @@ -11,8 +11,8 @@ keywords: - ci - cd name: jenkins -version: 0.4.3 +version: 0.4.4 dependencies: - name: jenkins - version: "0.4.3" + version: "0.4.4" repository: "https://amamba-io.github.io/charts" diff --git a/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml b/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml index aa1e967a9..a13449171 100644 --- a/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml +++ b/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml @@ -4,10 +4,10 @@ - "{{ .image.registry }}/{{ .Agent.Builder.Base.Image }}:{{ .Agent.Builder.Base.ImageTag }}" - "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}-podman" - "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk1.8-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk1.8" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk8-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk8-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk1.8-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk1.8" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk8-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk8-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.Builder.Golang.ImageTag }}-ubuntu" - "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.Builder.Python.ImageTag }}-podman" @@ -16,27 +16,27 @@ - "{{ .eventProxy.image.registry }}/{{ .eventProxy.image.repository }}:{{ .eventProxy.image.tag }}" # The following content is generated from the Builder.{language}.Versions in values.yaml, see hack/update_agent_version.sh -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-18.20.4-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-20.17.0-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-18.20.4-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-20.17.0-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk11-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk17-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk21-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk11-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk17-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-jdk21-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.17.13" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.17.13-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.17.13-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.18.10-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.20.14-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.17.13-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.18.10-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-1.20.14-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-2.7.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-3.10.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-3.11.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-2.7.9-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-3.10.9-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.3-3.11.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-18.20.4-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-20.17.0-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-18.20.4-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-20.17.0-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk11-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk17-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk21-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk11-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk17-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk21-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.18.10-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.20.14-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.18.10-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.20.14-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-2.7.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.10.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.11.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-2.7.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.10.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.11.9-ubuntu-podman" diff --git a/charts/jenkins/jenkins/charts/jenkins/Chart.yaml b/charts/jenkins/jenkins/charts/jenkins/Chart.yaml index 6dd81d59c..6cd196b47 100644 --- a/charts/jenkins/jenkins/charts/jenkins/Chart.yaml +++ b/charts/jenkins/jenkins/charts/jenkins/Chart.yaml @@ -2,7 +2,7 @@ annotations: addon.kpanda.io/repo: addon addon.kpanda.io/source: addon apiVersion: v2 -appVersion: 0.4.3 +appVersion: 0.4.4 description: jenkins charts of amamba. home: https://github.com/amamba-io/jenkins-agent icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg @@ -11,4 +11,4 @@ keywords: - ci - cd name: jenkins -version: 0.4.3 +version: 0.4.4 diff --git a/charts/jenkins/jenkins/charts/jenkins/values.yaml b/charts/jenkins/jenkins/charts/jenkins/values.yaml index 866812dc5..556ae2ffa 100644 --- a/charts/jenkins/jenkins/charts/jenkins/values.yaml +++ b/charts/jenkins/jenkins/charts/jenkins/values.yaml @@ -20,7 +20,7 @@ Master: SchedulerName: "" Name: jenkins-master Image: "amambadev/jenkins" - ImageTag: "v0.4.3-2.413" + ImageTag: "v0.4.4-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -347,36 +347,36 @@ Agent: Builder: Base: Image: amambadev/jenkins-agent-base - ImageTag: v0.4.3 + ImageTag: v0.4.4 NodeJs: Image: amambadev/jenkins-agent-nodejs - ImageTag: v0.4.3-16.20.2 + ImageTag: v0.4.4-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Versions: - - v0.4.3-18.20.4 - - v0.4.3-20.17.0 + - v0.4.4-18.20.4 + - v0.4.4-20.17.0 Maven: Image: amambadev/jenkins-agent-maven - ImageTag: v0.4.3-jdk8 + ImageTag: v0.4.4-jdk8 Versions: - - v0.4.3-jdk11 - - v0.4.3-jdk17 - - v0.4.3-jdk21 + - v0.4.4-jdk11 + - v0.4.4-jdk17 + - v0.4.4-jdk21 Golang: Image: amambadev/jenkins-agent-go - ImageTag: v0.4.3-1.22.6 + ImageTag: v0.4.4-1.22.6 Versions: - - v0.4.3-1.17.13 - - v0.4.3-1.18.10 - - v0.4.3-1.20.14 + - v0.4.4-1.17.13 + - v0.4.4-1.18.10 + - v0.4.4-1.20.14 Python: Image: amambadev/jenkins-agent-python - ImageTag: v0.4.3-3.8.19 + ImageTag: v0.4.4-3.8.19 Versions: - - v0.4.3-2.7.9 - - v0.4.3-3.10.9 - - v0.4.3-3.11.9 + - v0.4.4-2.7.9 + - v0.4.4-3.10.9 + - v0.4.4-3.11.9 ContainerRuntime: podman # Available values: docker, podman Persistence: diff --git a/charts/jenkins/jenkins/values.yaml b/charts/jenkins/jenkins/values.yaml index bc9ff3c46..2b2f23429 100644 --- a/charts/jenkins/jenkins/values.yaml +++ b/charts/jenkins/jenkins/values.yaml @@ -21,7 +21,7 @@ jenkins: SchedulerName: "" Name: jenkins-master Image: "amambadev/jenkins" - ImageTag: "v0.4.3-2.413" + ImageTag: "v0.4.4-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -319,36 +319,36 @@ jenkins: Builder: Base: Image: amambadev/jenkins-agent-base - ImageTag: v0.4.3 + ImageTag: v0.4.4 NodeJs: Image: amambadev/jenkins-agent-nodejs - ImageTag: v0.4.3-16.20.2 + ImageTag: v0.4.4-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Versions: - - v0.4.3-18.20.4 - - v0.4.3-20.17.0 + - v0.4.4-18.20.4 + - v0.4.4-20.17.0 Maven: Image: amambadev/jenkins-agent-maven - ImageTag: v0.4.3-jdk8 + ImageTag: v0.4.4-jdk8 Versions: - - v0.4.3-jdk11 - - v0.4.3-jdk17 - - v0.4.3-jdk21 + - v0.4.4-jdk11 + - v0.4.4-jdk17 + - v0.4.4-jdk21 Golang: Image: amambadev/jenkins-agent-go - ImageTag: v0.4.3-1.22.6 + ImageTag: v0.4.4-1.22.6 Versions: - - v0.4.3-1.17.13 - - v0.4.3-1.18.10 - - v0.4.3-1.20.14 + - v0.4.4-1.17.13 + - v0.4.4-1.18.10 + - v0.4.4-1.20.14 Python: Image: amambadev/jenkins-agent-python - ImageTag: v0.4.3-3.8.19 + ImageTag: v0.4.4-3.8.19 Versions: - - v0.4.3-2.7.9 - - v0.4.3-3.10.9 - - v0.4.3-3.11.9 + - v0.4.4-2.7.9 + - v0.4.4-3.10.9 + - v0.4.4-3.11.9 ContainerRuntime: podman # Available values: docker, podman Persistence: Enabled: true