Skip to content

Commit

Permalink
Apply suggested changes
Browse files Browse the repository at this point in the history
Signed-off-by: pritamdas99 <[email protected]>
  • Loading branch information
pritamdas99 committed Aug 2, 2024
1 parent 8f45f15 commit 68bceb2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion apis/kubedb/v1alpha2/solr_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 5 additions & 5 deletions apis/ops/v1alpha1/solr_ops_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down Expand Up @@ -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"`
}
Expand Down

0 comments on commit 68bceb2

Please sign in to comment.