Fixing format and manifests.

Signed-off-by: Houston Putman <[email protected]>
apache · Feb 14, 2020 · a1c14b1 · a1c14b1
1 parent 636e672
commit a1c14b1
Show file tree

Hide file tree

Showing 6 changed files with 4,587 additions and 20 deletions.
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -94,7 +94,6 @@ type AdditionalVolume struct {
 	DefaultContainerMount corev1.VolumeMount `json:"defaultContainerMount"`
 }
 
-
 // ContainerImage defines the fields needed for a Docker repository image. The
 // format here matches the predominant format used in Helm charts.
 type ContainerImage struct {
@@ -135,4 +134,4 @@ func ImageVersion(image string) (version string) {
 	} else {
 		return split[1]
 	}
-}
+}
diff --git a/config/crd/bases/solr.bloomberg.com_solrclouds.yaml b/config/crd/bases/solr.bloomberg.com_solrclouds.yaml
diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go
@@ -126,27 +126,27 @@ func TestCloudReconcileWithIngress(t *testing.T) {
 	UseEtcdCRD(false)
 	UseZkCRD(true)
 	g := gomega.NewGomegaWithT(t)
-	testPodAnnotations := map[string]string {
+	testPodAnnotations := map[string]string{
 		"test1": "value1",
 		"test2": "value2",
 	}
-	testPodLabels := map[string]string {
+	testPodLabels := map[string]string{
 		"test3": "value3",
 		"test4": "value4",
 	}
-	testSSAnnotations := map[string]string {
+	testSSAnnotations := map[string]string{
 		"test5": "value5",
 		"test6": "value6",
 	}
-	testSSLabels := map[string]string {
+	testSSLabels := map[string]string{
 		"test7": "value7",
 		"test8": "value8",
 	}
 	instance := &solr.SolrCloud{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: expectedCloudRequest.Name,
+			Name:      expectedCloudRequest.Name,
 			Namespace: expectedCloudRequest.Namespace,
-			Labels: map[string]string{"base": "here"},
+			Labels:    map[string]string{"base": "here"},
 		},
 		Spec: solr.SolrCloudSpec{
 			ZookeeperRef: &solr.ZookeeperRef{
@@ -156,7 +156,7 @@ func TestCloudReconcileWithIngress(t *testing.T) {
 			},
 			SolrGCTune: "gc Options",
 			CustomSolrKubeOptions: solr.CustomSolrKubeOptions{
-				PodOptions:         &solr.PodOptions{
+				PodOptions: &solr.PodOptions{
 					Annotations: testPodAnnotations,
 					Labels:      testPodLabels,
 				},
@@ -215,8 +215,8 @@ func TestCloudReconcileWithIngress(t *testing.T) {
 		"SOLR_PORT": "8983",
 		"GC_TUNE":   "gc Options",
 	}
-	expectedStatefulSetLabels := util.MergeLabelsOrAnnotations(instance.SharedLabelsWith(instance.Labels), map[string]string {"technology": "solr-cloud"})
-	expectedStatefulSetAnnotations := map[string]string {util.SolrZKConnectionStringAnnotation: "host:7271/"}
+	expectedStatefulSetLabels := util.MergeLabelsOrAnnotations(instance.SharedLabelsWith(instance.Labels), map[string]string{"technology": "solr-cloud"})
+	expectedStatefulSetAnnotations := map[string]string{util.SolrZKConnectionStringAnnotation: "host:7271/"}
 	testPodEnvVariables(t, expectedEnvVars, statefulSet.Spec.Template.Spec.Containers[0].Env)
 	testMapsEqual(t, "statefulSet labels", util.MergeLabelsOrAnnotations(expectedStatefulSetLabels, testSSLabels), statefulSet.Labels)
 	testMapsEqual(t, "statefulSet annotations", util.MergeLabelsOrAnnotations(expectedStatefulSetAnnotations, testSSAnnotations), statefulSet.Annotations)
@@ -446,4 +446,4 @@ func TestDefaults(t *testing.T) {
 	assert.NotNil(t, instance.Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec, "Bad Default - instance.Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec")
 	assert.Equal(t, 1, len(instance.Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec.Resources.Requests), "Bad Default - Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec.Resources length")
 	assert.Equal(t, 1, len(instance.Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec.AccessModes), "Bad Default - Spec.ZookeeperRef.ProvidedZookeeper.Zookeeper.Persistence.PersistentVolumeClaimSpec.AccesModes length")
-}
+}
diff --git a/controllers/util/common.go b/controllers/util/common.go
@@ -54,7 +54,7 @@ func DuplicateLabelsOrAnnotations(from map[string]string) map[string]string {
 	for k, v := range from {
 		to[k] = v
 	}
-	return to;
+	return to
 }
 
 func MergeLabelsOrAnnotations(base, additional map[string]string) map[string]string {
@@ -64,5 +64,5 @@ func MergeLabelsOrAnnotations(base, additional map[string]string) map[string]str
 			merged[k] = v
 		}
 	}
-	return merged;
-}
+	return merged
+}
diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
@@ -280,7 +280,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl
 								},
 							},
 							VolumeMounts: volumeMounts,
-							Env: envVars,
+							Env:          envVars,
 							LivenessProbe: &corev1.Probe{
 								InitialDelaySeconds: 20,
 								TimeoutSeconds:      1,