public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: add tollerations again (#842) 

Signed-off-by: tombokombo <tombo@sysart.tech>
Co-authored-by: Tomas Hulata <tombo@sysart.tech>
This commit is contained in:
Luigi Operoso 2023-05-30 09:36:55 +02:00 committed by GitHub
parent 3275be357a
commit 00bb04745b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chart/jenkins-operator/README.md
View File

@ -88,6 +88,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
| jenkins.seedJobAgentImage | string | `""` | | | jenkins.seedJobAgentImage | string | `""` | |
| jenkins.seedJobs | list | `[]` | | | jenkins.seedJobs | list | `[]` | |
| jenkins.serviceAccount.annotations | object | `{}` | | | jenkins.serviceAccount.annotations | object | `{}` | |
| jenkins.tolerations | list | `[]` | |
| jenkins.validateSecurityWarnings | bool | `false` | | | jenkins.validateSecurityWarnings | bool | `false` | |
| jenkins.volumeMounts | list | `[]` | | | jenkins.volumeMounts | list | `[]` | |
| jenkins.volumes[0].name | string | `"backup"` | | | jenkins.volumes[0].name | string | `"backup"` | |

3
chart/jenkins-operator/templates/jenkins.yaml
View File

@ -95,6 +95,9 @@ spec:
{{- with .Values.jenkins.nodeSelector }} {{- with .Values.jenkins.nodeSelector }}
nodeSelector: {{ toYaml . | nindent 6 }} nodeSelector: {{ toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- with .Values.jenkins.tolerations }}
tolerations: {{ toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.jenkins.annotations }} {{- with .Values.jenkins.annotations }}
annotations: {{ toYaml . | nindent 6 }} annotations: {{ toYaml . | nindent 6 }}
{{- end }} {{- end }}

9
chart/jenkins-operator/values.yaml
View File

@ -27,6 +27,9 @@ jenkins:
# nodeSelector are injected into metadata nodeSelector field # nodeSelector are injected into metadata nodeSelector field
nodeSelector: {} nodeSelector: {}
# tolerations are injected into metadata tolerations field
tolerations: []
# annotations are injected into metadata annotations field # annotations are injected into metadata annotations field
annotations: {} annotations: {}
@ -87,13 +90,13 @@ jenkins:
# #
# basePlugins: # basePlugins:
# - name: kubernetes # - name: kubernetes
# version: 3923.v294a_d4250b_91 # version: 3937.vd7b_82db_e347b_
# - name: workflow-job # - name: workflow-job
# version: 1292.v27d8cc3e2602 # version: 1301.v054d9cea_9593
# - name: workflow-aggregator # - name: workflow-aggregator
# version: 596.v8c21c963d92d # version: 596.v8c21c963d92d
# - name: git # - name: git
# version: 5.0.1 # version: 5.0.2
# - name: job-dsl # - name: job-dsl
# version: "1.83" # version: "1.83"
# - name: configuration-as-code # - name: configuration-as-code

6
pkg/plugins/base_plugins.go
View File

@ -2,12 +2,12 @@ package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1625.v27444588cc3d" configurationAsCodePlugin = "configuration-as-code:1625.v27444588cc3d"
gitPlugin = "git:5.0.1" gitPlugin = "git:5.0.2"
jobDslPlugin = "job-dsl:1.83" jobDslPlugin = "job-dsl:1.83"
kubernetesPlugin = "kubernetes:3923.v294a_d4250b_91" kubernetesPlugin = "kubernetes:3937.vd7b_82db_e347b_"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c"
workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d"
workflowJobPlugin = "workflow-job:1292.v27d8cc3e2602" workflowJobPlugin = "workflow-job:1301.v054d9cea_9593"
) )
// basePluginsList contains plugins to install by operator. // basePluginsList contains plugins to install by operator.

6
test/e2e/configuration_test.go
View File

@ -25,12 +25,12 @@ const e2e = "e2e"
var expectedBasePluginsList = []plugins.Plugin{ var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")), plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")),
plugins.Must(plugins.New("git:5.0.1")), plugins.Must(plugins.New("git:5.0.2")),
plugins.Must(plugins.New("kubernetes:3923.v294a_d4250b_91")), plugins.Must(plugins.New("kubernetes:3937.vd7b_82db_e347b_")),
plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")), plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")),
plugins.Must(plugins.New("job-dsl:1.83")), plugins.Must(plugins.New("job-dsl:1.83")),
plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")), plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")),
plugins.Must(plugins.New("workflow-job:1292.v27d8cc3e2602")), plugins.Must(plugins.New("workflow-job:1301.v054d9cea_9593")),
} }
func createUserConfigurationSecret(namespace string, stringData map[string]string) { func createUserConfigurationSecret(namespace string, stringData map[string]string) {