From 00bb04745b8e895df2af84f91f5381c339d7a820 Mon Sep 17 00:00:00 2001
From: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com>
Date: Tue, 30 May 2023 09:36:55 +0200
Subject: [PATCH] Fix: add tollerations again (#842)

Signed-off-by: tombokombo <tombo@sysart.tech>
Co-authored-by: Tomas Hulata <tombo@sysart.tech>
---
 chart/jenkins-operator/README.md              | 1 +
 chart/jenkins-operator/templates/jenkins.yaml | 3 +++
 chart/jenkins-operator/values.yaml            | 9 ++++++---
 pkg/plugins/base_plugins.go                   | 6 +++---
 test/e2e/configuration_test.go                | 6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/chart/jenkins-operator/README.md b/chart/jenkins-operator/README.md
index c692235d..857b8b52 100644
--- a/chart/jenkins-operator/README.md
+++ b/chart/jenkins-operator/README.md
@@ -88,6 +88,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
 | jenkins.seedJobAgentImage | string | `""` |  |
 | jenkins.seedJobs | list | `[]` |  |
 | jenkins.serviceAccount.annotations | object | `{}` |  |
+| jenkins.tolerations | list | `[]` |  |
 | jenkins.validateSecurityWarnings | bool | `false` |  |
 | jenkins.volumeMounts | list | `[]` |  |
 | jenkins.volumes[0].name | string | `"backup"` |  |
diff --git a/chart/jenkins-operator/templates/jenkins.yaml b/chart/jenkins-operator/templates/jenkins.yaml
index 1ce3b0cc..c4d39b76 100644
--- a/chart/jenkins-operator/templates/jenkins.yaml
+++ b/chart/jenkins-operator/templates/jenkins.yaml
@@ -95,6 +95,9 @@ spec:
     {{- with .Values.jenkins.nodeSelector }}
     nodeSelector: {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.jenkins.tolerations }}
+    tolerations: {{ toYaml . | nindent 6 }}
+    {{- end }}
     {{- with .Values.jenkins.annotations }}
     annotations: {{ toYaml . | nindent 6 }}
     {{- end }}
diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml
index bf6a6f6e..7df657a0 100644
--- a/chart/jenkins-operator/values.yaml
+++ b/chart/jenkins-operator/values.yaml
@@ -27,6 +27,9 @@ jenkins:
   # nodeSelector are injected into metadata nodeSelector field
   nodeSelector: {}
 
+  # tolerations are injected into metadata tolerations field
+  tolerations: []
+
   # annotations are injected into metadata annotations field
   annotations: {}
 
@@ -87,13 +90,13 @@ jenkins:
   #
   # basePlugins:
   # - name: kubernetes
-  #   version: 3923.v294a_d4250b_91
+  #   version: 3937.vd7b_82db_e347b_
   # - name: workflow-job
-  #   version: 1292.v27d8cc3e2602
+  #   version: 1301.v054d9cea_9593
   # - name: workflow-aggregator
   #   version: 596.v8c21c963d92d
   # - name: git
-  #   version: 5.0.1
+  #   version: 5.0.2
   # - name: job-dsl
   #   version: "1.83"
   # - name: configuration-as-code
diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go
index a8f23d30..39ca3264 100644
--- a/pkg/plugins/base_plugins.go
+++ b/pkg/plugins/base_plugins.go
@@ -2,12 +2,12 @@ package plugins
 
 const (
 	configurationAsCodePlugin           = "configuration-as-code:1625.v27444588cc3d"
-	gitPlugin                           = "git:5.0.1"
+	gitPlugin                           = "git:5.0.2"
 	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"
 	workflowAggregatorPlugin            = "workflow-aggregator:596.v8c21c963d92d"
-	workflowJobPlugin                   = "workflow-job:1292.v27d8cc3e2602"
+	workflowJobPlugin                   = "workflow-job:1301.v054d9cea_9593"
 )
 
 // basePluginsList contains plugins to install by operator.
diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
index 65c742cd..ff8c8662 100644
--- a/test/e2e/configuration_test.go
+++ b/test/e2e/configuration_test.go
@@ -25,12 +25,12 @@ const e2e = "e2e"
 
 var expectedBasePluginsList = []plugins.Plugin{
 	plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")),
-	plugins.Must(plugins.New("git:5.0.1")),
-	plugins.Must(plugins.New("kubernetes:3923.v294a_d4250b_91")),
+	plugins.Must(plugins.New("git:5.0.2")),
+	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("job-dsl:1.83")),
 	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) {