Skip to content

Commit 59f4ddb

Browse files
yyzxwmuma378
yyzxw
authored and
muma378
committed
upgrade jenkins to 0.4.5
1 parent a1e1438 commit 59f4ddb

File tree

12 files changed

+84
-78
lines changed

12 files changed

+84
-78
lines changed

‎charts/jenkins/config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export USE_OPENSOURCE_CHART=false
55
export REPO_URL=https://amamba-io.github.io/charts
66
export REPO_NAME=amamba
77
export CHART_NAME=jenkins
8-
export VERSION=0.4.4
8+
export VERSION=0.4.5
99

1010
# pr, issue, none
1111

‎charts/jenkins/jenkins/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotations:
22
addon.kpanda.io/repo: addon
33
addon.kpanda.io/source: addon
44
apiVersion: v2
5-
appVersion: 0.4.4
5+
appVersion: 0.4.5
66
description: jenkins charts of amamba.
77
home: https://github.com/amamba-io/jenkins-agent
88
icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg
@@ -11,8 +11,8 @@ keywords:
1111
- ci
1212
- cd
1313
name: jenkins
14-
version: 0.4.4
14+
version: 0.4.5
1515
dependencies:
1616
- name: jenkins
17-
version: "0.4.4"
17+
version: "0.4.5"
1818
repository: "https://amamba-io.github.io/charts"

‎charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
- "{{ .image.registry }}/{{ .Agent.Builder.Base.Image }}:{{ .Agent.Builder.Base.ImageTag }}"
55
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}-podman"
66
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.Builder.NodeJs.ImageTag }}"
7-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk1.8-podman"
8-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk1.8"
9-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk8-ubuntu"
10-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk8-ubuntu-podman"
7+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk1.8-podman"
8+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk1.8"
9+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk8-ubuntu"
10+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk8-ubuntu-podman"
1111
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.Builder.Golang.ImageTag }}-ubuntu-podman"
1212
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.Builder.Golang.ImageTag }}-ubuntu"
1313
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.Builder.Python.ImageTag }}-podman"
@@ -16,27 +16,27 @@
1616
- "{{ .eventProxy.image.registry }}/{{ .eventProxy.image.repository }}:{{ .eventProxy.image.tag }}"
1717

1818
# The following content is generated from the Builder.{language}.Versions in values.yaml, see hack/update_agent_version.sh
19-
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-18.20.4-ubuntu"
20-
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-20.17.0-ubuntu"
21-
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-18.20.4-ubuntu-podman"
22-
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-20.17.0-ubuntu-podman"
23-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk11-ubuntu"
24-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk17-ubuntu"
25-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk21-ubuntu"
26-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk11-ubuntu-podman"
27-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk17-ubuntu-podman"
28-
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-jdk21-ubuntu-podman"
29-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13"
30-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-podman"
31-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-ubuntu"
32-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.18.10-ubuntu"
33-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.20.14-ubuntu"
34-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.17.13-ubuntu-podman"
35-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.18.10-ubuntu-podman"
36-
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-1.20.14-ubuntu-podman"
37-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-2.7.9-ubuntu"
38-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.10.9-ubuntu"
39-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.11.9-ubuntu"
40-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-2.7.9-ubuntu-podman"
41-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.10.9-ubuntu-podman"
42-
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.4-3.11.9-ubuntu-podman"
19+
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-18.20.4-ubuntu"
20+
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-20.17.0-ubuntu"
21+
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-18.20.4-ubuntu-podman"
22+
- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-20.17.0-ubuntu-podman"
23+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk11-ubuntu"
24+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk17-ubuntu"
25+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk21-ubuntu"
26+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk11-ubuntu-podman"
27+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk17-ubuntu-podman"
28+
- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk21-ubuntu-podman"
29+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13"
30+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-podman"
31+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-ubuntu"
32+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.18.10-ubuntu"
33+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.20.14-ubuntu"
34+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-ubuntu-podman"
35+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.18.10-ubuntu-podman"
36+
- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.20.14-ubuntu-podman"
37+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-2.7.9-ubuntu"
38+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.10.9-ubuntu"
39+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.11.9-ubuntu"
40+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-2.7.9-ubuntu-podman"
41+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.10.9-ubuntu-podman"
42+
- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.11.9-ubuntu-podman"

‎charts/jenkins/jenkins/charts/jenkins/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotations:
22
addon.kpanda.io/repo: addon
33
addon.kpanda.io/source: addon
44
apiVersion: v2
5-
appVersion: 0.4.4
5+
appVersion: 0.4.5
66
description: jenkins charts of amamba.
77
home: https://github.com/amamba-io/jenkins-agent
88
icon: https://mirrors.tuna.tsinghua.edu.cn/jenkins/art/jenkins-logo/logo.svg
@@ -11,4 +11,4 @@ keywords:
1111
- ci
1212
- cd
1313
name: jenkins
14-
version: 0.4.4
14+
version: 0.4.5

‎charts/jenkins/jenkins/charts/jenkins/templates/_helpers.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ rateLimiterConfig: {{ toYaml .rateLimiterConfig | nindent 2 }}
174174
- name: AMAMBA_EVENTPROXY_TOKEN
175175
valueFrom:
176176
secretKeyRef:
177-
name: {{ include "jenkins.fullname" . }}
177+
name: jenkins-secret
178178
key: event-proxy-token
179179
{{- end -}}
180180

‎charts/jenkins/jenkins/charts/jenkins/templates/jenkins-casc-config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ data:
4747
resourceLimitCpu: "500m"
4848
resourceRequestMemory: "400Mi"
4949
resourceLimitMemory: "1536Mi"
50+
command: "/usr/local/bin/jenkins-agent"
5051
workspaceVolume:
5152
emptyDirWorkspaceVolume:
5253
memory: false
@@ -107,6 +108,7 @@ data:
107108
resourceLimitCpu: "500m"
108109
resourceRequestMemory: "400Mi"
109110
resourceLimitMemory: "1536Mi"
111+
command: "/usr/local/bin/jenkins-agent"
110112
workspaceVolume:
111113
emptyDirWorkspaceVolume:
112114
memory: false
@@ -175,6 +177,7 @@ data:
175177
resourceLimitCpu: "500m"
176178
resourceRequestMemory: "400Mi"
177179
resourceLimitMemory: "1536Mi"
180+
command: "/usr/local/bin/jenkins-agent"
178181
workspaceVolume:
179182
emptyDirWorkspaceVolume:
180183
memory: false
@@ -251,6 +254,7 @@ data:
251254
resourceLimitCpu: "500m"
252255
resourceRequestMemory: "400Mi"
253256
resourceLimitMemory: "1536Mi"
257+
command: "/usr/local/bin/jenkins-agent"
254258
workspaceVolume:
255259
emptyDirWorkspaceVolume:
256260
memory: false
@@ -316,6 +320,7 @@ data:
316320
resourceLimitCpu: "500m"
317321
resourceRequestMemory: "400Mi"
318322
resourceLimitMemory: "1536Mi"
323+
command: "/usr/local/bin/jenkins-agent"
319324
workspaceVolume:
320325
emptyDirWorkspaceVolume:
321326
memory: false

‎charts/jenkins/jenkins/charts/jenkins/templates/jenkins-master-deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ spec:
6565
- name: ADMIN_PASSWORD
6666
valueFrom:
6767
secretKeyRef:
68-
name: {{ template "jenkins.fullname" . }}
68+
name: jenkins-secret
6969
key: jenkins-admin-password
7070
- name: ADMIN_USER
7171
valueFrom:
7272
secretKeyRef:
73-
name: {{ template "jenkins.fullname" . }}
73+
name: jenkins-secret
7474
key: jenkins-admin-user
7575
{{- end }}
7676
{{- if .Values.Master.InitContainerEnv }}
@@ -158,12 +158,12 @@ spec:
158158
- name: ADMIN_PASSWORD
159159
valueFrom:
160160
secretKeyRef:
161-
name: {{ template "jenkins.fullname" . }}
161+
name: jenkins-secret
162162
key: jenkins-admin-password
163163
- name: ADMIN_USER
164164
valueFrom:
165165
secretKeyRef:
166-
name: {{ template "jenkins.fullname" . }}
166+
name: jenkins-secret
167167
key: jenkins-admin-user
168168
{{- end }}
169169
{{- if .Values.Master.ContainerEnv }}

‎charts/jenkins/jenkins/charts/jenkins/templates/secret.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: {{ template "jenkins.fullname" . }}
5+
name: jenkins-secret
66
labels:
77
app: {{ template "jenkins.fullname" . }}
88
chart: "{{ .Chart.Name }}-{{ include "charts.version" . }}"

‎charts/jenkins/jenkins/charts/jenkins/values-for-gen-schema.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ image:
22
registry:
33
Master:
44
AdminUser: admin
5-
AdminPassword: Admin01
5+
AdminPassword: ""
66
resources:
77
requests:
88
cpu: "1"

‎charts/jenkins/jenkins/charts/jenkins/values.schema.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"ContainerRuntime": {
1515
"type": "string",
1616
"default": "podman",
17+
"description": "ContainerRuntime defines the tools used by the Agent to run and build containers. It’s important to note that \"Docker\" should only be selected when the container runtime on the node is Docker. For other container runtimes, please select \"Podman\".",
1718
"enum": [
1819
"podman",
1920
"docker"
@@ -33,7 +34,7 @@
3334
"properties": {
3435
"AdminPassword": {
3536
"type": "string",
36-
"default": "Admin01"
37+
"default": ""
3738
},
3839
"AdminUser": {
3940
"type": "string",

0 commit comments

Comments
 (0)