feat: upgrade jenkins to v0.4.7

DaoCloud · Nov 22, 2024 · ade1aca · ade1aca
1 parent 88c224b
commit ade1aca
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 95 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.6
+export VERSION=0.4.7
 
 # 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.6
+appVersion: 0.4.7
 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.6
+version: 0.4.7
 dependencies:
   - name: jenkins
-    version: "0.4.6"
+    version: "0.4.7"
     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.6-jdk1.8-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk1.8"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk8-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk8-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk1.8-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk1.8"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk8-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-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.6-18.20.4-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-20.17.0-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-18.20.4-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-20.17.0-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk11-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk17-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk21-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk11-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk17-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-jdk21-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.17.13"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.17.13-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.17.13-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.18.10-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.20.14-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.17.13-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.18.10-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-1.20.14-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-2.7.9-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-3.10.9-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-3.11.9-ubuntu"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-2.7.9-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-3.10.9-ubuntu-podman"
-- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.6-3.11.9-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-18.20.4-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-20.17.0-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-18.20.4-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.NodeJs.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-20.17.0-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk11-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk17-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk21-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk11-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk17-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Maven.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-jdk21-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.17.13"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.17.13-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.17.13-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.18.10-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.20.14-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.17.13-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.18.10-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Golang.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-1.20.14-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-2.7.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-3.10.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-3.11.9-ubuntu"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-2.7.9-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-3.10.9-ubuntu-podman"
+- "{{ .image.registry }}/{{ .Agent.Builder.Python.Image }}:{{ .Agent.relok8sPlaceholder }}v0.4.7-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.6
+appVersion: 0.4.7
 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.6
+version: 0.4.7
diff --git a/charts/jenkins/jenkins/charts/jenkins/templates/service-monitor.yaml b/charts/jenkins/jenkins/charts/jenkins/templates/service-monitor.yaml
@@ -0,0 +1,24 @@
+{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.Master.metrics.enabled .Values.Master.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "jenkins.fullname" . }}
+  labels:
+    component: "{{ .Release.Name }}-{{ .Values.Master.Name }}"
+    {{- with .Values.Master.metrics.serviceMonitor.additionalLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - path: /prometheus
+      honorLabels: true
+      port: http
+      interval: 10s
+      scheme: http
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      component: "{{ .Release.Name }}-{{ .Values.Master.Component }}"
+{{- end }}
diff --git 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.6-2.413"
+  ImageTag: "v0.4.7-2.413"
   ImagePullPolicy: "IfNotPresent"
   ImagePullSecret: ""
   Component: "jenkins-master"
@@ -306,6 +306,11 @@ Master:
     # - secretName: jenkins.cluster.local
     #   hosts:
     #     - jenkins.cluster.local
+  metrics:
+    enabled: false
+    serviceMonitor:
+      enabled: false
+      additionalLabels: {}
 
 Agent:
   Enabled: true
@@ -347,36 +352,36 @@ Agent:
   Builder:
     Base:
       Image: amambadev/jenkins-agent-base
-      ImageTag: v0.4.6
+      ImageTag: v0.4.7
     NodeJs:
       Image: amambadev/jenkins-agent-nodejs
-      ImageTag: v0.4.6-16.20.2
+      ImageTag: v0.4.7-16.20.2
       # Versions for auto generator Jenkins CASC Config and relock_k8s images.
       # must build image first.
       Versions:
-        - v0.4.6-18.20.4
-        - v0.4.6-20.17.0
+        - v0.4.7-18.20.4
+        - v0.4.7-20.17.0
     Maven:
       Image: amambadev/jenkins-agent-maven
-      ImageTag: v0.4.6-jdk8
+      ImageTag: v0.4.7-jdk8
       Versions:
-        - v0.4.6-jdk11
-        - v0.4.6-jdk17
-        - v0.4.6-jdk21
+        - v0.4.7-jdk11
+        - v0.4.7-jdk17
+        - v0.4.7-jdk21
     Golang:
       Image: amambadev/jenkins-agent-go
-      ImageTag: v0.4.6-1.22.6
+      ImageTag: v0.4.7-1.22.6
       Versions:
-        - v0.4.6-1.17.13
-        - v0.4.6-1.18.10
-        - v0.4.6-1.20.14
+        - v0.4.7-1.17.13
+        - v0.4.7-1.18.10
+        - v0.4.7-1.20.14
     Python:
       Image: amambadev/jenkins-agent-python
-      ImageTag: v0.4.6-3.8.19
+      ImageTag: v0.4.7-3.8.19
       Versions:
-        - v0.4.6-2.7.9
-        - v0.4.6-3.10.9
-        - v0.4.6-3.11.9
+        - v0.4.7-2.7.9
+        - v0.4.7-3.10.9
+        - v0.4.7-3.11.9
     ContainerRuntime: podman # Available values: docker, podman
 
 Persistence:
@@ -416,20 +421,6 @@ rbac:
 securityRealm:
   type: local # support values include local, ldap
 
-# Install service monitor
-prometheus:
-  namespace: ""
-  serviceMonitor:
-    disabled: false
-    labels: { }
-  prometheusRule:
-    disabled: false
-    labels:
-      custom-alerting-rule-level: cluster
-      role: thanos-alerting-rules
-      thanosruler: thanos-rule
-    alertRules: [ ]
-
 eventProxy:
   enabled: false
   image:

diff --git 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.6-2.413"
+    ImageTag: "v0.4.7-2.413"
     ImagePullPolicy: "IfNotPresent"
     ImagePullSecret: ""
     Component: "jenkins-master"
@@ -279,6 +279,11 @@ jenkins:
       # - secretName: jenkins.cluster.local
       #   hosts:
       #     - jenkins.cluster.local
+    metrics:
+      enabled: false
+      serviceMonitor:
+        enabled: false
+        additionalLabels: {}
   Agent:
     Enabled: true
     Image: "jenkins/inbound-agent"
@@ -319,36 +324,36 @@ jenkins:
     Builder:
       Base:
         Image: amambadev/jenkins-agent-base
-        ImageTag: v0.4.6
+        ImageTag: v0.4.7
       NodeJs:
         Image: amambadev/jenkins-agent-nodejs
-        ImageTag: v0.4.6-16.20.2
+        ImageTag: v0.4.7-16.20.2
         # Versions for auto generator Jenkins CASC Config and relock_k8s images.
         # must build image first.
         Versions:
-          - v0.4.6-18.20.4
-          - v0.4.6-20.17.0
+          - v0.4.7-18.20.4
+          - v0.4.7-20.17.0
       Maven:
         Image: amambadev/jenkins-agent-maven
-        ImageTag: v0.4.6-jdk8
+        ImageTag: v0.4.7-jdk8
         Versions:
-          - v0.4.6-jdk11
-          - v0.4.6-jdk17
-          - v0.4.6-jdk21
+          - v0.4.7-jdk11
+          - v0.4.7-jdk17
+          - v0.4.7-jdk21
       Golang:
         Image: amambadev/jenkins-agent-go
-        ImageTag: v0.4.6-1.22.6
+        ImageTag: v0.4.7-1.22.6
         Versions:
-          - v0.4.6-1.17.13
-          - v0.4.6-1.18.10
-          - v0.4.6-1.20.14
+          - v0.4.7-1.17.13
+          - v0.4.7-1.18.10
+          - v0.4.7-1.20.14
       Python:
         Image: amambadev/jenkins-agent-python
-        ImageTag: v0.4.6-3.8.19
+        ImageTag: v0.4.7-3.8.19
         Versions:
-          - v0.4.6-2.7.9
-          - v0.4.6-3.10.9
-          - v0.4.6-3.11.9
+          - v0.4.7-2.7.9
+          - v0.4.7-3.10.9
+          - v0.4.7-3.11.9
       ContainerRuntime: podman # Available values: docker, podman
   Persistence:
     Enabled: true
@@ -383,19 +388,6 @@ jenkins:
     roleBindingKind: ClusterRoleBinding
   securityRealm:
     type: local # support values include local, ldap
-  # Install service monitor
-  prometheus:
-    namespace: ""
-    serviceMonitor:
-      disabled: false
-      labels: {}
-    prometheusRule:
-      disabled: false
-      labels:
-        custom-alerting-rule-level: cluster
-        role: thanos-alerting-rules
-        thanosruler: thanos-rule
-      alertRules: []
   eventProxy:
     enabled: false
     image: