public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-20 02:38:43 +02:00
Code Issues Releases Wiki Activity

Added TestPlugins, TestRestart and TestRestoreBackup (#504)

Browse Source 
Co-authored-by: Tomasz Sęk
This commit is contained in:
SylwiaBrant
2021-02-05 13:17:06 +01:00
committed by GitHub
co-authored by ek-docker-images
parent 294be87c64
commit 021ebb4745
11 changed files with 485 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/jenkins_controller.go
+1 -13
View File
@@ -211,14 +211,6 @@ func (r *JenkinsReconciler) reconcile(request reconcile.Request) (reconcile.Resu
return reconcile.Result{Requeue: true}, jenkins, nil
}
requeue, err = r.handleDeprecatedData(jenkins)
if err != nil {
return reconcile.Result{}, jenkins, err
}
if requeue {
return reconcile.Result{Requeue: true}, jenkins, nil
}
config := r.newJenkinsReconcilier(jenkins)
// Reconcile base configuration
baseConfiguration := base.New(config, r.JenkinsAPIConnectionSettings)
@@ -367,7 +359,7 @@ func (r *JenkinsReconciler) setDefaults(jenkins *v1alpha2.Jenkins) (requeue bool
if jenkinsContainer.ReadinessProbe == nil {
logger.Info("Setting default Jenkins readinessProbe")
changed = true
jenkinsContainer.ReadinessProbe = resources.NewSimpleProbe(containerProbeURI, containerProbePortName, corev1.URISchemeHTTP, 30)
jenkinsContainer.ReadinessProbe = resources.NewProbe(containerProbeURI, containerProbePortName, corev1.URISchemeHTTP, 30, 1, 3)
}
if jenkinsContainer.LivenessProbe == nil {
logger.Info("Setting default Jenkins livenessProbe")
@@ -493,7 +485,3 @@ func basePlugins() (result []v1alpha2.Plugin) {
}
return
}
func (r *JenkinsReconciler) handleDeprecatedData(_ *v1alpha2.Jenkins) (requeue bool, err error) {
return false, nil
}