diff --git a/charts/jenkins-full/config b/charts/jenkins-full/config index 7295551ec..a700a575f 100644 --- a/charts/jenkins-full/config +++ b/charts/jenkins-full/config @@ -7,8 +7,8 @@ export REPO_NAME=amamba export CHART_NAME=jenkins-full # Notice: update relok8s file when upgrade, avoid hardcode version -export PREV_VERSION=0.4.10 -export VERSION=0.4.11 +export PREV_VERSION=0.4.11 +export VERSION=0.4.12 # pr, issue, none diff --git a/charts/jenkins-full/jenkins-full/.relok8s-images.yaml b/charts/jenkins-full/jenkins-full/.relok8s-images.yaml index 345dd6321..76ab8d59d 100644 --- a/charts/jenkins-full/jenkins-full/.relok8s-images.yaml +++ b/charts/jenkins-full/jenkins-full/.relok8s-images.yaml @@ -5,10 +5,10 @@ - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Base.Image }}:{{ .jenkins-full.Agent.Builder.Base.ImageTag }}" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.Builder.NodeJs.ImageTag }}" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk1.8-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk1.8" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk1.8-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk1.8" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.Builder.Golang.ImageTag }}-ubuntu" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.Builder.Python.ImageTag }}-ubuntu-podman" @@ -17,27 +17,27 @@ - "{{ .jenkins-full.eventProxy.image.registry }}/{{ .jenkins-full.eventProxy.image.repository }}:{{ .jenkins-full.eventProxy.image.tag }}" # The following content is generated from the Builder.{language}.Versions in values.yaml, see hack/update_agent_version.sh -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-18.20.4-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-18.20.4-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu-podman" diff --git a/charts/jenkins-full/jenkins-full/Chart.yaml b/charts/jenkins-full/jenkins-full/Chart.yaml index e30a997af..80d8dec1d 100644 --- a/charts/jenkins-full/jenkins-full/Chart.yaml +++ b/charts/jenkins-full/jenkins-full/Chart.yaml @@ -2,7 +2,7 @@ annotations: addon.kpanda.io/repo: addon addon.kpanda.io/source: addon apiVersion: v2 -appVersion: 0.4.11 +appVersion: 0.4.12 description: jenkins charts of amamba. contains all agents home: https://github.com/amamba-io/jenkins-agent icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg @@ -12,8 +12,8 @@ keywords: - ci - cd name: jenkins-full -version: 0.4.11 +version: 0.4.12 dependencies: - name: jenkins-full - version: "0.4.11" + version: "0.4.12" repository: "https://amamba-io.github.io/charts" diff --git a/charts/jenkins-full/jenkins-full/charts/jenkins-full/.relok8s-images.yaml b/charts/jenkins-full/jenkins-full/charts/jenkins-full/.relok8s-images.yaml index 5c46485ea..2560a6354 100644 --- a/charts/jenkins-full/jenkins-full/charts/jenkins-full/.relok8s-images.yaml +++ b/charts/jenkins-full/jenkins-full/charts/jenkins-full/.relok8s-images.yaml @@ -5,10 +5,10 @@ - "{{ .image.registry }}/{{ .Agent.Builder.Base.Image }}:{{ .Agent.Builder.Base.ImageTag }}" - "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk1.8-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk1.8" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk1.8-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk1.8" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-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 }}-ubuntu-podman" @@ -17,27 +17,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.11-18.20.4-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-18.20.4-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.17.13" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.17.13-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.17.13" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.17.13-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu-podman" diff --git a/charts/jenkins-full/jenkins-full/charts/jenkins-full/Chart.yaml b/charts/jenkins-full/jenkins-full/charts/jenkins-full/Chart.yaml index c9072c067..2dd1f0fe1 100644 --- a/charts/jenkins-full/jenkins-full/charts/jenkins-full/Chart.yaml +++ b/charts/jenkins-full/jenkins-full/charts/jenkins-full/Chart.yaml @@ -2,7 +2,7 @@ annotations: addon.kpanda.io/repo: addon addon.kpanda.io/source: addon apiVersion: v2 -appVersion: 0.4.11 +appVersion: 0.4.12 description: jenkins charts of amamba. contains all agents home: https://github.com/amamba-io/jenkins-agent icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg @@ -12,4 +12,4 @@ keywords: - ci - cd name: jenkins-full -version: 0.4.11 +version: 0.4.12 diff --git a/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.schema.json b/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.schema.json index 8e2e20ee8..520970785 100644 --- a/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.schema.json +++ b/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.schema.json @@ -193,7 +193,7 @@ "properties": { "registry": { "type": "string", - "default": "docker.m.daocloud.io" + "default": "ghcr.m.daocloud.io" } } } diff --git a/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.yaml b/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.yaml index 1dcfd7727..710d3f343 100644 --- a/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.yaml +++ b/charts/jenkins-full/jenkins-full/charts/jenkins-full/values.yaml @@ -20,7 +20,7 @@ Master: SchedulerName: "" Name: jenkins-master Image: "amamba-io/jenkins" - ImageTag: "v0.4.11-2.413" + ImageTag: "v0.4.12-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -360,36 +360,36 @@ Agent: Builder: Base: Image: amamba-io/jenkins-agent-base - ImageTag: v0.4.11 + ImageTag: v0.4.12 NodeJs: Image: amamba-io/jenkins-agent-nodejs - ImageTag: v0.4.11-16.20.2 + ImageTag: v0.4.12-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Versions: - - v0.4.11-18.20.4 - - v0.4.11-20.17.0 + - v0.4.12-18.20.4 + - v0.4.12-20.17.0 Maven: Image: amamba-io/jenkins-agent-maven - ImageTag: v0.4.11-jdk8 + ImageTag: v0.4.12-jdk8 Versions: - - v0.4.11-jdk11 - - v0.4.11-jdk17 - - v0.4.11-jdk21 + - v0.4.12-jdk11 + - v0.4.12-jdk17 + - v0.4.12-jdk21 Golang: Image: amamba-io/jenkins-agent-go - ImageTag: v0.4.11-1.22.6 + ImageTag: v0.4.12-1.22.6 Versions: - - v0.4.11-1.17.13 - - v0.4.11-1.18.10 - - v0.4.11-1.20.14 + - v0.4.12-1.17.13 + - v0.4.12-1.18.10 + - v0.4.12-1.20.14 Python: Image: amamba-io/jenkins-agent-python - ImageTag: v0.4.11-3.8.19 + ImageTag: v0.4.12-3.8.19 Versions: - - v0.4.11-2.7.9 - - v0.4.11-3.10.9 - - v0.4.11-3.11.9 + - v0.4.12-2.7.9 + - v0.4.12-3.10.9 + - v0.4.12-3.11.9 ContainerRuntime: podman # Available values: docker, podman Persistence: diff --git a/charts/jenkins-full/jenkins-full/values.schema.json b/charts/jenkins-full/jenkins-full/values.schema.json index 83a1626ce..cd62754a0 100644 --- a/charts/jenkins-full/jenkins-full/values.schema.json +++ b/charts/jenkins-full/jenkins-full/values.schema.json @@ -202,7 +202,7 @@ "properties": { "registry": { "type": "string", - "default": "docker.m.daocloud.io" + "default": "ghcr.m.daocloud.io" } } } diff --git a/charts/jenkins-full/jenkins-full/values.yaml b/charts/jenkins-full/jenkins-full/values.yaml index ac8d26ddc..6166211e0 100644 --- a/charts/jenkins-full/jenkins-full/values.yaml +++ b/charts/jenkins-full/jenkins-full/values.yaml @@ -21,7 +21,7 @@ jenkins-full: SchedulerName: "" Name: jenkins-master Image: "amamba-io/jenkins" - ImageTag: "v0.4.11-2.413" + ImageTag: "v0.4.12-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -332,36 +332,36 @@ jenkins-full: Builder: Base: Image: amamba-io/jenkins-agent-base - ImageTag: v0.4.11 + ImageTag: v0.4.12 NodeJs: Image: amamba-io/jenkins-agent-nodejs - ImageTag: v0.4.11-16.20.2 + ImageTag: v0.4.12-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Versions: - - v0.4.11-18.20.4 - - v0.4.11-20.17.0 + - v0.4.12-18.20.4 + - v0.4.12-20.17.0 Maven: Image: amamba-io/jenkins-agent-maven - ImageTag: v0.4.11-jdk8 + ImageTag: v0.4.12-jdk8 Versions: - - v0.4.11-jdk11 - - v0.4.11-jdk17 - - v0.4.11-jdk21 + - v0.4.12-jdk11 + - v0.4.12-jdk17 + - v0.4.12-jdk21 Golang: Image: amamba-io/jenkins-agent-go - ImageTag: v0.4.11-1.22.6 + ImageTag: v0.4.12-1.22.6 Versions: - - v0.4.11-1.17.13 - - v0.4.11-1.18.10 - - v0.4.11-1.20.14 + - v0.4.12-1.17.13 + - v0.4.12-1.18.10 + - v0.4.12-1.20.14 Python: Image: amamba-io/jenkins-agent-python - ImageTag: v0.4.11-3.8.19 + ImageTag: v0.4.12-3.8.19 Versions: - - v0.4.11-2.7.9 - - v0.4.11-3.10.9 - - v0.4.11-3.11.9 + - v0.4.12-2.7.9 + - v0.4.12-3.10.9 + - v0.4.12-3.11.9 ContainerRuntime: podman # Available values: docker, podman Persistence: Enabled: true diff --git a/charts/jenkins-full/parent/.relok8s-images.yaml b/charts/jenkins-full/parent/.relok8s-images.yaml index 345dd6321..76ab8d59d 100644 --- a/charts/jenkins-full/parent/.relok8s-images.yaml +++ b/charts/jenkins-full/parent/.relok8s-images.yaml @@ -5,10 +5,10 @@ - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Base.Image }}:{{ .jenkins-full.Agent.Builder.Base.ImageTag }}" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.Builder.NodeJs.ImageTag }}" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk1.8-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk1.8" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk1.8-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk1.8" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.Builder.Golang.ImageTag }}-ubuntu" - "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.Builder.Python.ImageTag }}-ubuntu-podman" @@ -17,27 +17,27 @@ - "{{ .jenkins-full.eventProxy.image.registry }}/{{ .jenkins-full.eventProxy.image.repository }}:{{ .jenkins-full.eventProxy.image.tag }}" # The following content is generated from the Builder.{language}.Versions in values.yaml, see hack/update_agent_version.sh -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-18.20.4-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-18.20.4-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-20.17.0-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk11-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk17-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-jdk21-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.17.13-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.18.10-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-1.20.14-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-2.7.9-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.10.9-ubuntu-podman" -- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.11-3.11.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-18.20.4-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.NodeJs.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-20.17.0-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk11-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk17-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Maven.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-jdk21-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.17.13-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.18.10-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Golang.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-1.20.14-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-2.7.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.10.9-ubuntu-podman" +- "{{ .jenkins-full.image.registry }}/{{ .jenkins-full.Agent.Builder.Python.Image }}:{{ .jenkins-full.Agent.relok8sPlaceholder }}v0.4.12-3.11.9-ubuntu-podman" diff --git a/charts/jenkins/config b/charts/jenkins/config index e36b47d18..aa93b12ad 100644 --- a/charts/jenkins/config +++ b/charts/jenkins/config @@ -7,8 +7,8 @@ export REPO_NAME=amamba export CHART_NAME=jenkins # Notice: update relok8s file when upgrade, avoid hardcode version -export PREV_VERSION=0.4.10 -export VERSION=0.4.11 +export PREV_VERSION=0.4.11 +export VERSION=0.4.12 # pr, issue, none diff --git a/charts/jenkins/jenkins/.relok8s-images.yaml b/charts/jenkins/jenkins/.relok8s-images.yaml index c8a31398b..ba8487901 100644 --- a/charts/jenkins/jenkins/.relok8s-images.yaml +++ b/charts/jenkins/jenkins/.relok8s-images.yaml @@ -2,7 +2,7 @@ - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Image }}:{{ .jenkins.Agent.ImageTag }}" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Base.Image }}:{{ .jenkins.Agent.Builder.Base.ImageTag }}-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.NodeJs.Image }}:{{ .jenkins.Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" -- "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Maven.Image }}:{{ .jenkins.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Maven.Image }}:{{ .jenkins.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Golang.Image }}:{{ .jenkins.Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Python.Image }}:{{ .jenkins.Agent.Builder.Python.ImageTag }}-ubuntu-podman" - "{{ .jenkins.trace.image.registry }}/{{ .jenkins.trace.image.repository }}:{{ .jenkins.trace.image.tag }}" diff --git a/charts/jenkins/jenkins/Chart.yaml b/charts/jenkins/jenkins/Chart.yaml index 69cd4bea4..f4f3ae970 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.11 +appVersion: 0.4.12 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 @@ -12,8 +12,8 @@ keywords: - ci - cd name: jenkins -version: 0.4.11 +version: 0.4.12 dependencies: - name: jenkins - version: "0.4.11" + version: "0.4.12" 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 b7aab3120..0977a6721 100644 --- a/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml +++ b/charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml @@ -2,7 +2,7 @@ - "{{ .image.registry }}/{{ .Agent.Image }}:{{ .Agent.ImageTag }}" - "{{ .image.registry }}/{{ .Agent.Builder.Base.Image }}:{{ .Agent.Builder.Base.ImageTag }}-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" -- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.Builder.Python.ImageTag }}-ubuntu-podman" - "{{ .trace.image.registry }}/{{ .trace.image.repository }}:{{ .trace.image.tag }}" diff --git a/charts/jenkins/jenkins/charts/jenkins/Chart.yaml b/charts/jenkins/jenkins/charts/jenkins/Chart.yaml index c1d64d950..832e8894b 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.11 +appVersion: 0.4.12 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 @@ -12,4 +12,4 @@ keywords: - ci - cd name: jenkins -version: 0.4.11 +version: 0.4.12 diff --git a/charts/jenkins/jenkins/charts/jenkins/values.schema.json b/charts/jenkins/jenkins/charts/jenkins/values.schema.json index 8e2e20ee8..520970785 100644 --- a/charts/jenkins/jenkins/charts/jenkins/values.schema.json +++ b/charts/jenkins/jenkins/charts/jenkins/values.schema.json @@ -193,7 +193,7 @@ "properties": { "registry": { "type": "string", - "default": "docker.m.daocloud.io" + "default": "ghcr.m.daocloud.io" } } } diff --git a/charts/jenkins/jenkins/charts/jenkins/values.yaml b/charts/jenkins/jenkins/charts/jenkins/values.yaml index 7535609c2..9e9973787 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: "amamba-io/jenkins" - ImageTag: "v0.4.11-2.413" + ImageTag: "v0.4.12-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -360,21 +360,21 @@ Agent: Builder: Base: Image: amamba-io/jenkins-agent-base - ImageTag: v0.4.11 + ImageTag: v0.4.12 NodeJs: Image: amamba-io/jenkins-agent-nodejs - ImageTag: v0.4.11-16.20.2 + ImageTag: v0.4.12-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Maven: Image: amamba-io/jenkins-agent-maven - ImageTag: v0.4.11-jdk8 + ImageTag: v0.4.12-jdk8 Golang: Image: amamba-io/jenkins-agent-go - ImageTag: v0.4.11-1.22.6 + ImageTag: v0.4.12-1.22.6 Python: Image: amamba-io/jenkins-agent-python - ImageTag: v0.4.11-3.8.19 + ImageTag: v0.4.12-3.8.19 ContainerRuntime: podman # Available values: docker, podman Persistence: diff --git a/charts/jenkins/jenkins/values.schema.json b/charts/jenkins/jenkins/values.schema.json index 03844a74c..1ab7dc98f 100644 --- a/charts/jenkins/jenkins/values.schema.json +++ b/charts/jenkins/jenkins/values.schema.json @@ -202,7 +202,7 @@ "properties": { "registry": { "type": "string", - "default": "docker.m.daocloud.io" + "default": "ghcr.m.daocloud.io" } } } diff --git a/charts/jenkins/jenkins/values.yaml b/charts/jenkins/jenkins/values.yaml index ee41e7629..5ee9f77c5 100644 --- a/charts/jenkins/jenkins/values.yaml +++ b/charts/jenkins/jenkins/values.yaml @@ -21,7 +21,7 @@ jenkins: SchedulerName: "" Name: jenkins-master Image: "amamba-io/jenkins" - ImageTag: "v0.4.11-2.413" + ImageTag: "v0.4.12-2.413" ImagePullPolicy: "IfNotPresent" ImagePullSecret: "" Component: "jenkins-master" @@ -331,21 +331,21 @@ jenkins: Builder: Base: Image: amamba-io/jenkins-agent-base - ImageTag: v0.4.11 + ImageTag: v0.4.12 NodeJs: Image: amamba-io/jenkins-agent-nodejs - ImageTag: v0.4.11-16.20.2 + ImageTag: v0.4.12-16.20.2 # Versions for auto generator Jenkins CASC Config and relock_k8s images. # must build image first. Maven: Image: amamba-io/jenkins-agent-maven - ImageTag: v0.4.11-jdk8 + ImageTag: v0.4.12-jdk8 Golang: Image: amamba-io/jenkins-agent-go - ImageTag: v0.4.11-1.22.6 + ImageTag: v0.4.12-1.22.6 Python: Image: amamba-io/jenkins-agent-python - ImageTag: v0.4.11-3.8.19 + ImageTag: v0.4.12-3.8.19 ContainerRuntime: podman # Available values: docker, podman Persistence: Enabled: true diff --git a/charts/jenkins/parent/.relok8s-images.yaml b/charts/jenkins/parent/.relok8s-images.yaml index c8a31398b..ba8487901 100644 --- a/charts/jenkins/parent/.relok8s-images.yaml +++ b/charts/jenkins/parent/.relok8s-images.yaml @@ -2,7 +2,7 @@ - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Image }}:{{ .jenkins.Agent.ImageTag }}" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Base.Image }}:{{ .jenkins.Agent.Builder.Base.ImageTag }}-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.NodeJs.Image }}:{{ .jenkins.Agent.Builder.NodeJs.ImageTag }}-ubuntu-podman" -- "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Maven.Image }}:{{ .jenkins.Agent.relok8sPlaceholder }}v0.4.11-jdk8-ubuntu-podman" +- "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Maven.Image }}:{{ .jenkins.Agent.relok8sPlaceholder }}v0.4.12-jdk8-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Golang.Image }}:{{ .jenkins.Agent.Builder.Golang.ImageTag }}-ubuntu-podman" - "{{ .jenkins.image.registry }}/{{ .jenkins.Agent.Builder.Python.Image }}:{{ .jenkins.Agent.Builder.Python.ImageTag }}-ubuntu-podman" - "{{ .jenkins.trace.image.registry }}/{{ .jenkins.trace.image.repository }}:{{ .jenkins.trace.image.tag }}"