You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/06/28 13:43:33 UTC
[solr-operator] branch main updated: Fix SolrCloud Status node version bug (#450)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 9e48f52 Fix SolrCloud Status node version bug (#450)
9e48f52 is described below
commit 9e48f5284c51db5bd49a1cfc703828fbf9c40b73
Author: Houston Putman <ho...@apache.org>
AuthorDate: Tue Jun 28 09:43:27 2022 -0400
Fix SolrCloud Status node version bug (#450)
---
api/v1beta1/common_types.go | 7 +++----
helm/solr-operator/Chart.yaml | 7 +++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
index 4c29cb6..c75213b 100644
--- a/api/v1beta1/common_types.go
+++ b/api/v1beta1/common_types.go
@@ -251,12 +251,11 @@ func ImageVersion(image string) (version string) {
if len(split) < 2 {
return ""
} else {
- return split[1]
+ return split[len(split)-1]
}
}
-// SolrNodeStatus is the status of a solrNode in the cloud, with readiness status
-// and internal and external addresses
+// ZookeeperConnectionInfo is the information on how to connect to the Solr Zookeeper Cluster
type ZookeeperConnectionInfo struct {
// The connection string to connect to the ensemble from within the Kubernetes cluster
// +optional
@@ -299,7 +298,7 @@ func (ci *ZookeeperConnectionInfo) withDefaults() (changed bool) {
return changed
}
-// ZookeeperSpec defines the internal zookeeper ensemble to run for solr
+// ZookeeperACL defines acls to connect to a protected Zookeeper
type ZookeeperACL struct {
// The name of the Kubernetes Secret that stores the username and password for the ACL.
// This secret must be in the same namespace as the solrCloud or prometheusExporter is running in.
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index c947820..0262e1c 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -122,6 +122,13 @@ annotations:
url: https://github.com/apache/solr-operator/issues/428
- name: Github PR
url: https://github.com/apache/solr-operator/pull/429
+ - kind: fixed
+ description: SolrCloud.Status now shows correct version when using an image repo that contains a colon
+ links:
+ - name: Github Issue
+ url: https://github.com/apache/solr-operator/issues/445
+ - name: Github PR
+ url: https://github.com/apache/solr-operator/pull/450
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.6.0-prerelease