upgrade jenkins to 0.4.5

DaoCloud · Oct 25, 2024 · 59f4ddb · 59f4ddb
1 parent a1e1438
commit 59f4ddb
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 78 deletions.
diff --git 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.4
+export VERSION=0.4.5
 
 # pr, issue, none
 

diff --git 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.4
+appVersion: 0.4.5
 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.4
+version: 0.4.5
 dependencies:
   - name: jenkins
-    version: "0.4.4"
+    version: "0.4.5"
     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
@@ -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.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.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk1.8-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk1.8"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk8-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-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.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"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-18.20.4-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-20.17.0-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-18.20.4-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-20.17.0-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk11-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk17-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk21-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk11-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk17-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-jdk21-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.18.10-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.20.14-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.17.13-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.18.10-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-1.20.14-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-2.7.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.10.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.11.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-2.7.9-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.10.9-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.5-3.11.9-ubuntu-podman"
diff --git 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.4
+appVersion: 0.4.5
 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.4
+version: 0.4.5
diff --git a/charts/jenkins/jenkins/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/jenkins/charts/jenkins/templates/_helpers.tpl
@@ -174,7 +174,7 @@ rateLimiterConfig: {{ toYaml .rateLimiterConfig | nindent 2 }}
 - name: AMAMBA_EVENTPROXY_TOKEN
   valueFrom:
     secretKeyRef:
-      name: {{ include "jenkins.fullname" . }}
+      name: jenkins-secret
       key: event-proxy-token
 {{- end -}}
 

diff --git a/charts/jenkins/jenkins/charts/jenkins/templates/jenkins-casc-config.yml b/charts/jenkins/jenkins/charts/jenkins/templates/jenkins-casc-config.yml
@@ -47,6 +47,7 @@ data:
                   resourceLimitCpu: "500m"
                   resourceRequestMemory: "400Mi"
                   resourceLimitMemory: "1536Mi"
+                  command: "/usr/local/bin/jenkins-agent"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -107,6 +108,7 @@ data:
                   resourceLimitCpu: "500m"
                   resourceRequestMemory: "400Mi"
                   resourceLimitMemory: "1536Mi"
+                  command: "/usr/local/bin/jenkins-agent"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -175,6 +177,7 @@ data:
                   resourceLimitCpu: "500m"
                   resourceRequestMemory: "400Mi"
                   resourceLimitMemory: "1536Mi"
+                  command: "/usr/local/bin/jenkins-agent"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -251,6 +254,7 @@ data:
                   resourceLimitCpu: "500m"
                   resourceRequestMemory: "400Mi"
                   resourceLimitMemory: "1536Mi"
+                  command: "/usr/local/bin/jenkins-agent"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -316,6 +320,7 @@ data:
                   resourceLimitCpu: "500m"
                   resourceRequestMemory: "400Mi"
                   resourceLimitMemory: "1536Mi"
+                  command: "/usr/local/bin/jenkins-agent"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false

diff --git a/charts/jenkins/jenkins/charts/jenkins/templates/jenkins-master-deployment.yaml b/charts/jenkins/jenkins/charts/jenkins/templates/jenkins-master-deployment.yaml
@@ -65,12 +65,12 @@ spec:
           - name: ADMIN_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ template "jenkins.fullname" . }}
+                name: jenkins-secret
                 key: jenkins-admin-password
           - name: ADMIN_USER
             valueFrom:
               secretKeyRef:
-                name: {{ template "jenkins.fullname" . }}
+                name: jenkins-secret
                 key: jenkins-admin-user
           {{- end }}
           {{- if .Values.Master.InitContainerEnv }}
@@ -158,12 +158,12 @@ spec:
             - name: ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "jenkins.fullname" . }}
+                  name: jenkins-secret
                   key: jenkins-admin-password
             - name: ADMIN_USER
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "jenkins.fullname" . }}
+                  name: jenkins-secret
                   key: jenkins-admin-user
             {{- end }}
             {{- if .Values.Master.ContainerEnv }}

diff --git a/charts/jenkins/jenkins/charts/jenkins/templates/secret.yaml b/charts/jenkins/jenkins/charts/jenkins/templates/secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "jenkins.fullname" . }}
+  name: jenkins-secret
   labels:
     app: {{ template "jenkins.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ include "charts.version" . }}"

diff --git a/charts/jenkins/jenkins/charts/jenkins/values-for-gen-schema.yaml b/charts/jenkins/jenkins/charts/jenkins/values-for-gen-schema.yaml
@@ -2,7 +2,7 @@ image:
   registry: 
 Master:
   AdminUser: admin
-  AdminPassword: Admin01
+  AdminPassword: ""
   resources:
     requests:
       cpu: "1"

diff --git a/charts/jenkins/jenkins/charts/jenkins/values.schema.json b/charts/jenkins/jenkins/charts/jenkins/values.schema.json
@@ -14,6 +14,7 @@
                         "ContainerRuntime": {
                             "type": "string",
                             "default": "podman",
+                            "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\".",
                             "enum": [
                                 "podman",
                                 "docker"
@@ -33,7 +34,7 @@
             "properties": {
                 "AdminPassword": {
                     "type": "string",
-                    "default": "Admin01"
+                    "default": ""
                 },
                 "AdminUser": {
                     "type": "string",

diff --git a/charts/jenkins/jenkins/charts/jenkins/values.yaml b/charts/jenkins/jenkins/charts/jenkins/values.yaml
@@ -20,15 +20,15 @@ Master:
     SchedulerName: ""
   Name: jenkins-master
   Image: "amambadev/jenkins"
-  ImageTag: "v0.4.4-2.413"
+  ImageTag: "v0.4.5-2.413"
   ImagePullPolicy: "IfNotPresent"
   ImagePullSecret: ""
   Component: "jenkins-master"
   TZ: "Asia/Shanghai"
   UseSecurity: true
   HostNetworking: false
   AdminUser: admin
-  AdminPassword: Admin01
+  AdminPassword: ""
   resources: {}
     # requests:
     #   cpu: "1"
@@ -347,36 +347,36 @@ Agent:
   Builder:
     Base:
       Image: amambadev/jenkins-agent-base
-      ImageTag: v0.4.4
+      ImageTag: v0.4.5
     NodeJs:
       Image: amambadev/jenkins-agent-nodejs
-      ImageTag: v0.4.4-16.20.2
+      ImageTag: v0.4.5-16.20.2
       # Versions for auto generator Jenkins CASC Config and relock_k8s images.
       # must build image first.
       Versions:
-        - v0.4.4-18.20.4
-        - v0.4.4-20.17.0
+        - v0.4.5-18.20.4
+        - v0.4.5-20.17.0
     Maven:
       Image: amambadev/jenkins-agent-maven
-      ImageTag: v0.4.4-jdk8
+      ImageTag: v0.4.5-jdk8
       Versions:
-        - v0.4.4-jdk11
-        - v0.4.4-jdk17
-        - v0.4.4-jdk21
+        - v0.4.5-jdk11
+        - v0.4.5-jdk17
+        - v0.4.5-jdk21
     Golang:
       Image: amambadev/jenkins-agent-go
-      ImageTag: v0.4.4-1.22.6
+      ImageTag: v0.4.5-1.22.6
       Versions:
-        - v0.4.4-1.17.13
-        - v0.4.4-1.18.10
-        - v0.4.4-1.20.14
+        - v0.4.5-1.17.13
+        - v0.4.5-1.18.10
+        - v0.4.5-1.20.14
     Python:
       Image: amambadev/jenkins-agent-python
-      ImageTag: v0.4.4-3.8.19
+      ImageTag: v0.4.5-3.8.19
       Versions:
-        - v0.4.4-2.7.9
-        - v0.4.4-3.10.9
-        - v0.4.4-3.11.9
+        - v0.4.5-2.7.9
+        - v0.4.5-3.10.9
+        - v0.4.5-3.11.9
     ContainerRuntime: podman # Available values: docker, podman
 
 Persistence:

diff --git a/charts/jenkins/jenkins/values.yaml b/charts/jenkins/jenkins/values.yaml
@@ -21,15 +21,15 @@ jenkins:
       SchedulerName: ""
     Name: jenkins-master
     Image: "amambadev/jenkins"
-    ImageTag: "v0.4.4-2.413"
+    ImageTag: "v0.4.5-2.413"
     ImagePullPolicy: "IfNotPresent"
     ImagePullSecret: ""
     Component: "jenkins-master"
     TZ: "Asia/Shanghai"
     UseSecurity: true
     HostNetworking: false
     AdminUser: admin
-    AdminPassword: Admin01
+    AdminPassword: ""
     resources: {}
     # requests:
     #   cpu: "1"
@@ -319,36 +319,36 @@ jenkins:
     Builder:
       Base:
         Image: amambadev/jenkins-agent-base
-        ImageTag: v0.4.4
+        ImageTag: v0.4.5
       NodeJs:
         Image: amambadev/jenkins-agent-nodejs
-        ImageTag: v0.4.4-16.20.2
+        ImageTag: v0.4.5-16.20.2
         # Versions for auto generator Jenkins CASC Config and relock_k8s images.
         # must build image first.
         Versions:
-          - v0.4.4-18.20.4
-          - v0.4.4-20.17.0
+          - v0.4.5-18.20.4
+          - v0.4.5-20.17.0
       Maven:
         Image: amambadev/jenkins-agent-maven
-        ImageTag: v0.4.4-jdk8
+        ImageTag: v0.4.5-jdk8
         Versions:
-          - v0.4.4-jdk11
-          - v0.4.4-jdk17
-          - v0.4.4-jdk21
+          - v0.4.5-jdk11
+          - v0.4.5-jdk17
+          - v0.4.5-jdk21
       Golang:
         Image: amambadev/jenkins-agent-go
-        ImageTag: v0.4.4-1.22.6
+        ImageTag: v0.4.5-1.22.6
         Versions:
-          - v0.4.4-1.17.13
-          - v0.4.4-1.18.10
-          - v0.4.4-1.20.14
+          - v0.4.5-1.17.13
+          - v0.4.5-1.18.10
+          - v0.4.5-1.20.14
       Python:
         Image: amambadev/jenkins-agent-python
-        ImageTag: v0.4.4-3.8.19
+        ImageTag: v0.4.5-3.8.19
         Versions:
-          - v0.4.4-2.7.9
-          - v0.4.4-3.10.9
-          - v0.4.4-3.11.9
+          - v0.4.5-2.7.9
+          - v0.4.5-3.10.9
+          - v0.4.5-3.11.9
       ContainerRuntime: podman # Available values: docker, podman
   Persistence:
     Enabled: true