Use solr.xml from provided ConfigMap

[thelabdude]

Signed-off-by: Timothy Potter [email protected]

This fixes #86

Introduce a new var ProvidedConfigMap in the CustomSolrKubeOptions.ConfigMapOptions to allow users to supply the name of a ConfigMap containing a custom solr.xml. If supplied, we track the MD5 checksum of the solr.xml data in an annotation on the pod spec (solr.apache.org/solrXmlMd5) for the StatefulSet to trigger a rolling restart when the solr.xml in the ConfigMap changes. If supplied on the SolrCloud CRD, the controller requires the provided ConfigMap to contain a solr.xml that must have a placeholder for the operator to set the hostPort variable, e.g.

<int name="hostPort">${hostPort:80}</int>

Includes a unit test that verifies proper reconciliation using a provided ConfigMap and that an update to the solr.xml triggers a rolling restart of the StatefulSet (via the annotation changing).

I also tested this manually in Kubernetes by creating my own ConfigMap:

---
kind: ConfigMap
apiVersion: v1
metadata:
  name: tjp-custom-solr-xml
data:
  solr.xml: |
    <?xml version="1.0" encoding="UTF-8" ?>
    <solr>
      <solrcloud>
        <str name="host">${host:}</str>
        <int name="hostPort">${hostPort:80}</int>
        <str name="hostContext">${hostContext:solr}</str>
        <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
        <int name="zkClientTimeout">${zkClientTimeout:35000}</int>
        <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
        <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
        <str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
        <str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
      </solrcloud>
      <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
        <int name="socketTimeout">${socketTimeout:600000}</int>
        <int name="connTimeout">${connTimeout:60000}</int>
      </shardHandlerFactory>
    </solr>

And then referencing it in the SolrCloud definition:

  customSolrKubeOptions:
    configMapOptions:
      providedConfigMap: tjp-custom-solr-xml

[thelabdude]

thanks for fixing up that test issue @HoustonPutman !

[HoustonPutman]

@bsankara This is good to go. Pretty straightforward with convincing unit tests. 👍

[bsankara]

LGTM, thanks!