diff --git a/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml b/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml index 62f631738..858d781d6 100644 --- a/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml +++ b/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml @@ -3499,7 +3499,7 @@ spec: additionalPlugins: description: 'List of plugins to enable in addition to essential plugins: rabbitmq_management, rabbitmq_prometheus, and rabbitmq_peer_discovery_k8s.' items: - description: kubebuilder validating tags 'Pattern' and 'MaxLength' must be specified on string type. Alias type 'string' as 'Plugin' to specify schema validation on items of the list 'AdditionalPlugins' + description: A Plugin to enable on the RabbitmqCluster. maxLength: 100 pattern: ^\w+$ type: string diff --git a/controllers/pod_executor.go b/controllers/pod_executor.go index 2f69055e5..a57649637 100644 --- a/controllers/pod_executor.go +++ b/controllers/pod_executor.go @@ -3,7 +3,7 @@ package controllers import ( "bufio" "bytes" - "fmt" + corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" @@ -48,12 +48,6 @@ func (p *rabbitmqPodExecutor) Exec(clientset *kubernetes.Clientset, clusterConfi Stdin: nil, Tty: false, }) - if err != nil { - return stdOut.String(), stdErr.String(), err - } - if stdErr.Len() > 0 { - return stdOut.String(), stdErr.String(), fmt.Errorf("%v", stdErr) - } - return stdOut.String(), "", nil + return stdOut.String(), stdErr.String(), err }