diff --git a/api/v1beta1/solrcloud_types.go b/api/v1beta1/solrcloud_types.go index 995a9acd..0a689a20 100644 --- a/api/v1beta1/solrcloud_types.go +++ b/api/v1beta1/solrcloud_types.go @@ -149,7 +149,8 @@ type SolrCloudSpec struct { SolrModules []string `json:"solrModules,omitempty"` // List of paths in the Solr Docker image to load in the classpath. - // Note: Solr Modules will be auto-loaded if specified in the "solrModules" property. There is no need to specify them here as well. + // There is no need to include paths for Solr Modules already specified in the "solrModules" property, those paths will be added automatically. + // Note that this setting has no effect on solrcloud clusters that rely on a user-provided solr.xml file. // //+optional AdditionalLibs []string `json:"additionalLibs,omitempty"` diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 76809b56..20a9a33c 100644 --- a/config/crd/bases/solr.apache.org_solrclouds.yaml +++ b/config/crd/bases/solr.apache.org_solrclouds.yaml @@ -88,7 +88,8 @@ spec: additionalLibs: description: |- List of paths in the Solr Docker image to load in the classpath. - Note: Solr Modules will be auto-loaded if specified in the "solrModules" property. There is no need to specify them here as well. + There is no need to include paths for Solr Modules already specified in the "solrModules" property, those paths will be added automatically. + Note that this setting has no effect on solrcloud clusters that rely on a user-provided solr.xml file. items: type: string type: array diff --git a/helm/solr-operator/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml index a1229dcf..931fbb7f 100644 --- a/helm/solr-operator/crds/crds.yaml +++ b/helm/solr-operator/crds/crds.yaml @@ -346,7 +346,8 @@ spec: additionalLibs: description: |- List of paths in the Solr Docker image to load in the classpath. - Note: Solr Modules will be auto-loaded if specified in the "solrModules" property. There is no need to specify them here as well. + There is no need to include paths for Solr Modules already specified in the "solrModules" property, those paths will be added automatically. + Note that this setting has no effect on solrcloud clusters that rely on a user-provided solr.xml file. items: type: string type: array diff --git a/helm/solr/README.md b/helm/solr/README.md index a02cfa10..5a94b80f 100644 --- a/helm/solr/README.md +++ b/helm/solr/README.md @@ -95,7 +95,7 @@ Descriptions on how to use these options can be found in the [SolrCloud document | solrOptions.logLevel | string | `"INFO"` | Log level to run Solr under | | solrOptions.gcTune | string | `""` | GC Tuning parameters for Solr | | solrOptions.solrModules | []string | | List of packaged Solr Modules to load when running Solr. Note: There is no need to specify solr modules necessary for other parts of the Spec (i.e. `backupRepositories[].gcs`), those will be added automatically. | -| solrOptions.additionalLibs | []string | | List of paths in the Solr Image to add to the classPath when running Solr. Note: There is no need to include paths for solrModules here if already listed in `solrModules`, those paths will be added automatically. | +| solrOptions.additionalLibs | []string | | List of paths in the Solr Image to add to the classPath when running Solr. (There is no need to include paths for solrModules here if already listed in `solrModules`, those paths will be added automatically.) Note that this setting has no effect on solrcloud clusters that rely on a user-provided `solr.xml` file. | | solrOptions.security.authenticationType | string | `""` | Type of authentication to use for Solr | | solrOptions.security.basicAuthSecret | string | `""` | Name of Secret in the same namespace that stores the basicAuth information for the Solr user | | solrOptions.security.probesRequireAuth | boolean | | Whether the probes for the SolrCloud pod require auth |