[lucene-solr-operator] branch main updated: Various fixes: (NPE, logging) (#224)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene-solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new fe62b2d  Various fixes: (NPE, logging) (#224)
fe62b2d is described below

commit fe62b2d97f424eba267205542fdc58e32b1f5f09
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Feb 22 19:13:30 2021 -0500

    Various fixes: (NPE, logging) (#224)
    
    - Fix logging for Prometheus exporter
    - Fix Null Pointer Exception when using additional volumes
    - Add generated file missing from previous commit
---
 api/v1beta1/zz_generated.deepcopy.go             | 5 +++++
 controllers/solrprometheusexporter_controller.go | 6 +++---
 controllers/util/prometheus_exporter_util.go     | 3 +--
 controllers/util/solr_util.go                    | 3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
index 54db00e..c797554 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -464,6 +464,11 @@ func (in *PodOptions) DeepCopyInto(out *PodOptions) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.ImagePullSecrets != nil {
+		in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
+		*out = make([]v1.LocalObjectReference, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodOptions.
diff --git a/controllers/solrprometheusexporter_controller.go b/controllers/solrprometheusexporter_controller.go
index 8a7df8d..9a497a5 100644
--- a/controllers/solrprometheusexporter_controller.go
+++ b/controllers/solrprometheusexporter_controller.go
@@ -220,11 +220,11 @@ func (r *SolrPrometheusExporterReconciler) Reconcile(req ctrl.Request) (ctrl.Res
 	foundDeploy := &appsv1.Deployment{}
 	err = r.Get(context.TODO(), types.NamespacedName{Name: deploy.Name, Namespace: deploy.Namespace}, foundDeploy)
 	if err != nil && errors.IsNotFound(err) {
-		deploymentLogger.Info("Creating Deployment", "namespace", deploy.Namespace, "name", deploy.Name)
+		deploymentLogger.Info("Creating Deployment")
 		err = r.Create(context.TODO(), deploy)
 	} else if err == nil {
 		if util.CopyDeploymentFields(deploy, foundDeploy, deploymentLogger) {
-			deploymentLogger.Info("Updating Deployment", "namespace", deploy.Namespace, "name", deploy.Name)
+			deploymentLogger.Info("Updating Deployment")
 			err = r.Update(context.TODO(), foundDeploy)
 		}
 		ready = foundDeploy.Status.ReadyReplicas > 0
@@ -235,7 +235,7 @@ func (r *SolrPrometheusExporterReconciler) Reconcile(req ctrl.Request) (ctrl.Res
 
 	if ready != prometheusExporter.Status.Ready {
 		prometheusExporter.Status.Ready = ready
-		logger.Info("Updating status for solr-prometheus-exporter", "namespace", prometheusExporter.Namespace, "name", prometheusExporter.Name)
+		logger.Info("Updating status for solr-prometheus-exporter")
 		err = r.Status().Update(context.TODO(), prometheusExporter)
 	}
 
diff --git a/controllers/util/prometheus_exporter_util.go b/controllers/util/prometheus_exporter_util.go
index 03868f5..49c094b 100644
--- a/controllers/util/prometheus_exporter_util.go
+++ b/controllers/util/prometheus_exporter_util.go
@@ -156,10 +156,9 @@ func GenerateSolrPrometheusExporterDeployment(solrPrometheusExporter *solr.SolrP
 
 		// Add Custom Volumes to pod
 		for _, volume := range customPodOptions.Volumes {
-			volume.DefaultContainerMount.Name = volume.Name
-
 			// Only add the container mount if one has been provided.
 			if volume.DefaultContainerMount != nil {
+				volume.DefaultContainerMount.Name = volume.Name
 				volumeMounts = append(volumeMounts, *volume.DefaultContainerMount)
 			}
 
diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
index 42334fe..def15b8 100644
--- a/controllers/util/solr_util.go
+++ b/controllers/util/solr_util.go
@@ -227,10 +227,9 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl
 	if nil != customPodOptions {
 		// Add Custom Volumes to pod
 		for _, volume := range customPodOptions.Volumes {
-			volume.DefaultContainerMount.Name = volume.Name
-
 			// Only add the container mount if one has been provided.
 			if volume.DefaultContainerMount != nil {
+				volume.DefaultContainerMount.Name = volume.Name
 				volumeMounts = append(volumeMounts, *volume.DefaultContainerMount)
 			}