Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Robot Upgrade: jenkins chart upgrade from 0.4.6 to 0.4.7 #2729

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Robot Upgrade: jenkins chart upgrade from 0.4.6 to 0.4.7 #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/jenkins/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions charts/jenkins/jenkins/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
56 changes: 28 additions & 28 deletions charts/jenkins/jenkins/charts/jenkins/.relok8s-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
4 changes: 2 additions & 2 deletions charts/jenkins/jenkins/charts/jenkins/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -11,4 +11,4 @@ keywords:
- ci
- cd
name: jenkins
version: 0.4.6
version: 0.4.7
24 changes: 24 additions & 0 deletions charts/jenkins/jenkins/charts/jenkins/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
53 changes: 22 additions & 31 deletions charts/jenkins/jenkins/charts/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -306,6 +306,11 @@ Master:
# - secretName: jenkins.cluster.local
# hosts:
# - jenkins.cluster.local
metrics:
enabled: false
serviceMonitor:
enabled: false
additionalLabels: {}

Agent:
Enabled: true
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
52 changes: 22 additions & 30 deletions charts/jenkins/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading