From eaf19a70d8602153bb6eacef7f7018e9485de218 Mon Sep 17 00:00:00 2001
From: Jakub Al-Khalili <jakubalkhalili@gmail.com>
Date: Thu, 17 Oct 2019 16:17:47 +0200
Subject: [PATCH] #137 Remove waitForVolumes function

---
 .../jenkins/configuration/base/reconcile.go   | 31 +------------------
 .../configuration/base/validate_test.go       |  2 +-
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go
index 9d1e6a7f..1c6a96ca 100644
--- a/pkg/controller/jenkins/configuration/base/reconcile.go
+++ b/pkg/controller/jenkins/configuration/base/reconcile.go
@@ -77,16 +77,7 @@ func (r *ReconcileJenkinsBaseConfiguration) Reconcile() (reconcile.Result, jenki
 	}
 	r.logger.V(log.VDebug).Info("Kubernetes resources are present")
 
-	result, err := r.waitForVolumes()
-	if err != nil {
-		return reconcile.Result{}, nil, err
-	}
-	if result.Requeue {
-		return result, nil, nil
-	}
-	r.logger.V(log.VDebug).Info("Jenkins master pod volumes are ready")
-
-	result, err = r.ensureJenkinsMasterPod(metaObject)
+	result, err := r.ensureJenkinsMasterPod(metaObject)
 	if err != nil {
 		return reconcile.Result{}, nil, err
 	}
@@ -206,26 +197,6 @@ func (r *ReconcileJenkinsBaseConfiguration) ensureResourcesRequiredForJenkinsPod
 	return nil
 }
 
-func (r *ReconcileJenkinsBaseConfiguration) waitForVolumes() (reconcile.Result, error) {
-	for _, volume := range r.jenkins.Spec.Master.Volumes {
-		if volume.PersistentVolumeClaim != nil {
-			pvc := &corev1.PersistentVolumeClaim{}
-			err := r.k8sClient.Get(context.TODO(), types.NamespacedName{Name: volume.PersistentVolumeClaim.ClaimName, Namespace: r.jenkins.ObjectMeta.Namespace}, pvc)
-			if err != nil {
-				return reconcile.Result{}, err
-			}
-
-			if pvc.Status.Phase != corev1.ClaimBound {
-				r.logger.V(log.VWarn).Info(fmt.Sprintf("PersistentVolumeClaim '%s' have invalid state '%s' - required '%s', volume '%v'",
-					volume.PersistentVolumeClaim.ClaimName, pvc.Status.Phase, corev1.ClaimBound, volume))
-				return reconcile.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
-			}
-		}
-	}
-
-	return reconcile.Result{}, nil
-}
-
 func (r *ReconcileJenkinsBaseConfiguration) verifyPlugins(jenkinsClient jenkinsclient.Jenkins) (bool, error) {
 	allPluginsInJenkins, err := jenkinsClient.GetPlugins(fetchAllPlugins)
 	if err != nil {
diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go
index 97d21a5a..51c1206f 100644
--- a/pkg/controller/jenkins/configuration/base/validate_test.go
+++ b/pkg/controller/jenkins/configuration/base/validate_test.go
@@ -83,7 +83,7 @@ func TestValidatePlugins(t *testing.T) {
 		var userPlugins []v1alpha2.Plugin
 
 		got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins)
-    
+
 		assert.Equal(t, got, []string{"invalid plugin version 'simple-plugin:invalid', must follow pattern '^[0-9\\\\.-]+$'"})
 	})
 	t.Run("valid user and base plugin version", func(t *testing.T) {