diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go index 5c69bb1785..0cccf01a26 100644 --- a/apis/kubedb/v1alpha2/solr_helpers.go +++ b/apis/kubedb/v1alpha2/solr_helpers.go @@ -271,7 +271,7 @@ func (s *Solr) SetDefaults() { Name: s.Spec.Version, }, &slVersion) if err != nil { - klog.Errorf("can't get the rabbitmq version object %s for %s \n", err.Error(), s.Spec.Version) + klog.Errorf("can't get the solr version object %s for %s \n", err.Error(), s.Spec.Version) return } diff --git a/apis/ops/v1alpha1/solr_ops_types.go b/apis/ops/v1alpha1/solr_ops_types.go index 3918024f29..9a94398497 100644 --- a/apis/ops/v1alpha1/solr_ops_types.go +++ b/apis/ops/v1alpha1/solr_ops_types.go @@ -67,7 +67,7 @@ type SolrOpsRequestSpec struct { VolumeExpansion *SolrVolumeExpansionSpec `json:"volumeExpansion,omitempty"` // Specifies information necessary for restarting database Restart *RestartSpec `json:"restart,omitempty"` - // Specifies information necessary for custom configuration of rabbitmq + // Specifies information necessary for custom configuration of solr Configuration *SolrCustomConfigurationSpec `json:"configuration,omitempty"` // Timeout for each step of the ops request in second. If a step doesn't finish within the specified timeout, the ops request will result in failure. Timeout *metav1.Duration `json:"timeout,omitempty"` @@ -104,23 +104,23 @@ type SolrUpdateVersionSpec struct { TargetVersion string `json:"targetVersion,omitempty"` } -// SolrCustomConfigurationSpec is the spec for Reconfiguring the rabbitmq Settings +// SolrCustomConfigurationSpec is the spec for Reconfiguring the solr Settings type SolrCustomConfigurationSpec struct { // ConfigSecret is an optional field to provide custom configuration file for database. // +optional ConfigSecret *core.LocalObjectReference `json:"configSecret,omitempty"` - // ApplyConfig is an optional field to provide rabbitmq configuration. + // ApplyConfig is an optional field to provide solr configuration. // Provided configuration will be applied to config files stored in ConfigSecret. // If the ConfigSecret is missing, the operator will create a new k8s secret by the // following naming convention: {db-name}-user-config . // Expected input format: // applyConfig: - // rabbitmq.conf: | + // solr.xml: | // key=value // +optional ApplyConfig map[string]string `json:"applyConfig,omitempty"` // If set to "true", the user provided configuration will be removed. - // The rabbitmq cluster will start will default configuration that is generated by the operator. + // The solr cluster will start will default configuration that is generated by the operator. // +optional RemoveCustomConfig bool `json:"removeCustomConfig,omitempty"` }