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.

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

Update kiwigrid and inbound-agent images #548

Merged
merged 1 commit into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions charts/jenkins/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
The change log until v1.5.7 was auto-generated based on git commits.
Those entries include a reference to the git commit to be able to get more details.

## 3.11.3

Update kiwigrid/k8s-sidecar:1.15.0
Update jenkins/inbound-agent:4.11.2-4

## 3.11.2

Improve example for workspaceVolume. Clarify that this is not a list.
Expand Down
6 changes: 3 additions & 3 deletions charts/jenkins/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: jenkins
home: https://jenkins.io/
version: 3.11.2
version: 3.11.3
appVersion: 2.319.2
description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
sources:
Expand Down Expand Up @@ -31,8 +31,8 @@ annotations:
- name: jenkins
image: jenkins/jenkins:2.319.2-jdk11
- name: k8s-sidecar
image: kiwigrid/k8s-sidecar:1.14.2
image: kiwigrid/k8s-sidecar:1.15.0
- name: inbound-agent
image: jenkins/inbound-agent:4.11-1
image: jenkins/inbound-agent:4.11.2-4
- name: backup
image: maorfr/kube-tasks:0.2.0
4 changes: 2 additions & 2 deletions charts/jenkins/VALUES_SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| -------------------------- | ----------------------------------------------- | ---------------------- |
| `agent.sideContainerName` | Side container name in agent | jnlp |
| `agent.image` | Agent image name | `jenkins/inbound-agent`|
| `agent.tag` | Agent image tag | `4.11-1` |
| `agent.tag` | Agent image tag | `4.11.2-4` |
| `agent.alwaysPullImage` | Always pull agent container image before build | `false` |
| `agent.privileged` | Agent privileged container | `false` |
| `agent.resources` | Resources allocation (Requests and Limits) | `{requests: {cpu: 512m, memory: 512Mi}, limits: {cpu: 512m, memory: 512Mi}}` |
Expand All @@ -332,7 +332,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `agent.command` | Executed command when side container starts | Not set |
| `agent.args` | Arguments passed to executed command | `${computer.jnlpmac} ${computer.name}` |
| `agent.TTYEnabled` | Allocate pseudo tty to the side container | false |
| `agent.workingDir` | Configure working directory for default agent | `/home/jenkins/agent` |
| `agent.workingDir` | Configure working directory for default agent | `/home/jenkins/agent` |

#### Other

Expand Down
40 changes: 20 additions & 20 deletions charts/jenkins/unittests/jcasc-config-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tests:
value: "true"
templates:
- name: "default"
id: eeb122dab57104444f5bf23ca29f3550fbc187b9d7a51036ea513e2a99fecf0f
id: 1d5e7358aa57e8d8fb5290164936179288c8018247360a8e6c5bbd48e05cbb40
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -66,7 +66,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -176,7 +176,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 82558c766c80b819801ca09965f74936a17e41c5647f802989835908ef8bc92e
id: ef511ee9cd7e0218b92488675d593e1db3ceedc9030331d6206999f9fa9f35c6
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -186,7 +186,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.controller-namespace.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -615,7 +615,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 2d6f5a773ad8f255eab7f5c02b0c38c445e8719515711da7fe1a8c8fb56601a7
id: 9ac232a228983c3f8cf350915bfa487223e818baff6f316461b4f2f45c95af21
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -625,7 +625,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -720,7 +720,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 82060505f3355529f4d9cde420925c5dce24898412592ccc8158fce06189f156
id: c383c2aa2156720dbefb12f76200b23b6b011f8d3f499ef418f76d04e383f39c
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -730,7 +730,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -823,7 +823,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 7a73317f7cf162064b5897c437935ee0f4e48de04cd93dc639505034baa12f33
id: 4c6548123981cce394208b5d39fa8ff8588f1939ad7a39a8c95f74dad4ad8e28
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -833,7 +833,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -928,7 +928,7 @@ tests:
value: "true"
templates:
- name: "default"
id: b7d14b3289d54965df83aad44b4031072fc62c0f3983a2d391d0cf4d890fe0d1
id: 8f7c750a732cd7bf41991060e953f6dc152a3b989f0c80670ecdaa2d29e9ab20
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -938,7 +938,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -1034,7 +1034,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 4f3065e445ec524bd05295f75c3ab78e23873ef4e7ee809587fff0a0eb5d8a4c
id: 2a6303f5ba784e173e355c66dd64546aadd74c3eb8798890c2693342b601846b
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -1044,7 +1044,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -1139,7 +1139,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 8ef08c6bc935f4bdb6c294793d1b3772e1f77b21804a1dc97c60fe02e0965774
id: eac322f6c9065f6f288b7543745f5d72c9a02841dc016b14685e5bd1746273f1
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -1149,7 +1149,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -1313,7 +1313,7 @@ tests:
value: "true"
templates:
- name: "default"
id: eeb122dab57104444f5bf23ca29f3550fbc187b9d7a51036ea513e2a99fecf0f
id: 1d5e7358aa57e8d8fb5290164936179288c8018247360a8e6c5bbd48e05cbb40
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -1323,7 +1323,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.default.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down Expand Up @@ -1415,7 +1415,7 @@ tests:
value: "true"
templates:
- name: "default"
id: 1677adaa43f69c4c75d309dc4b5299ae1559168f2339d08c32e103c902490a63
id: c33e44054ae465f9813a27d455dc45f15dacefe7dbc41633043d38266de19459
containers:
- name: "jnlp"
alwaysPullImage: false
Expand All @@ -1425,7 +1425,7 @@ tests:
- envVar:
key: "JENKINS_URL"
value: "https://RELEASE-NAME-jenkins.NAMESPACE.svc.cluster.local:8080/"
image: "jenkins/inbound-agent:4.11-1"
image: "jenkins/inbound-agent:4.11.2-4"
privileged: "false"
resourceLimitCpu: 512m
resourceLimitMemory: 512Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ tests:
value: POST
- name: REQ_RETRY_CONNECT
value: "10"
image: kiwigrid/k8s-sidecar:1.14.2
image: kiwigrid/k8s-sidecar:1.15.0
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true
Expand Down Expand Up @@ -353,7 +353,7 @@ tests:
- it: configure empty image tag label
template: jenkins-controller-statefulset.yaml
set:
controller.tagLabel:
controller.tagLabel:
asserts:
- equal:
path: spec.template.spec.containers[0].image
Expand Down
4 changes: 2 additions & 2 deletions charts/jenkins/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ controller:
# jcasc changes will cause a reboot and will only be applied at the subsequent start-up. Auto-reload uses the
# https://<jenkins_url>/reload-configuration-as-code endpoint to reapply config when changes to the configScripts are detected.
enabled: true
image: kiwigrid/k8s-sidecar:1.14.2
image: kiwigrid/k8s-sidecar:1.15.0
imagePullPolicy: IfNotPresent
resources: {}
# limits:
Expand Down Expand Up @@ -587,7 +587,7 @@ agent:
maxRequestsPerHostStr: "32"
namespace:
image: "jenkins/inbound-agent"
tag: "4.11-1"
tag: "4.11.2-4"
workingDir: "/home/jenkins/agent"
nodeUsageMode: "NORMAL"
customJenkinsLabels: []
Expand Down