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

Add backup.imagePullSecretName #600

Merged
merged 1 commit into from
Jun 18, 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: 4 additions & 1 deletion charts/jenkins/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ 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.

## 4.1.9

Allow setting `imagePullSecret` for backup job via `backup.imagePullSecretName`

## 4.1.8

Fix path of projected secrets from `additionalExistingSecrets`.
Expand Down Expand Up @@ -65,7 +69,6 @@ Added a flag for disabling the default Jenkins Agent configuration.

Update Jenkins image and appVersion to jenkins lts release version 2.332.2


## 3.11.9 Bump configuration-as-code plugin version

| plugin | old version | new version |
Expand Down
2 changes: 1 addition & 1 deletion 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: 4.1.8
version: 4.1.9
appVersion: 2.332.3
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
1 change: 1 addition & 0 deletions charts/jenkins/VALUES_SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `backup.serviceAccount.annotations` | Backup pod annotations | `{}` |
| `backup.image.repo` | Backup image repository | `maorfr/kube-tasks` |
| `backup.image.tag` | Backup image tag | `0.2.0` |
| `backup.image.imagePullSecretName` | Backup image pull secret | Not set |
| `backup.extraArgs` | Additional arguments for kube-tasks | `[]` |
| `backup.existingSecret` | Environment variables to add to the cronjob container | `{}` |
| `backup.existingSecret.*` | Specify the secret name containing the AWS or GCP credentials | `jenkinsaws` |
Expand Down
4 changes: 4 additions & 0 deletions charts/jenkins/templates/jenkins-backup-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,8 @@ spec:
nodeSelector:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.backup.imagePullSecretName }}
imagePullSecrets:
- name: {{ .Values.backup.imagePullSecretName }}
{{- end -}}
{{- end }}
18 changes: 18 additions & 0 deletions charts/jenkins/unittests/jenkins-backup-cronjob-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,21 @@ tests:
runAsUser: 4444
supplementalGroups:
- 5555
- it: test empty backup.imagePullSecretName
set:
backup:
enabled: true
imagePullSecretName:
asserts:
- isNull:
path: spec.jobTemplate.spec.template.spec.imagePullSecrets
- it: test backup.imagePullSecretName
set:
backup:
enabled: true
imagePullSecretName: my-secret
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.imagePullSecrets
value:
- name: my-secret
1 change: 1 addition & 0 deletions charts/jenkins/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ backup:
image:
repository: "maorfr/kube-tasks"
tag: "0.2.0"
imagePullSecretName:
# Additional arguments for kube-tasks
# Ref: https://github.com/maorfr/kube-tasks#simple-backup
extraArgs: []
Expand Down