This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch release-0.4
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/release-0.4 by this push:
new 40d3aee Fix small issues with Solr Helm chart & Release Wizard
40d3aee is described below
commit 40d3aee3e642498821a0597d0b3b2d2a1e5b0a58
Author: Houston Putman <[email protected]>
AuthorDate: Mon Sep 13 13:03:29 2021 -0400
Fix small issues with Solr Helm chart & Release Wizard
---
hack/release/wizard/releaseWizard.py | 6 +++---
helm/solr/Chart.yaml | 3 ++-
helm/solr/README.md | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hack/release/wizard/releaseWizard.py
b/hack/release/wizard/releaseWizard.py
index 1623806..765163d 100755
--- a/hack/release/wizard/releaseWizard.py
+++ b/hack/release/wizard/releaseWizard.py
@@ -358,9 +358,9 @@ class ReleaseState:
releases_str =
load("https://projects.apache.org/json/foundation/releases.json";, "utf-8")
releases = json.loads(releases_str)
state.mirrored_versions = []
- if 'solr-operator' in releases.keys():
- releases = releases['solr-operator']
- state.mirrored_versions = [ r for r in list(map(lambda y:
y[7:], filter(lambda x: x.startswith('solr-operator-'),
list(releases.keys())))) ]
+ if 'solr' in releases.keys():
+ releases = releases['solr']
+ state.mirrored_versions = [ r for r in list(map(lambda y:
y[14:], filter(lambda x: x.startswith('solr-operator-v'),
list(releases.keys())))) ]
return state.mirrored_versions
def get_mirrored_versions_to_delete(self):
diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml
index a4782a4..efd5a83 100644
--- a/helm/solr/Chart.yaml
+++ b/helm/solr/Chart.yaml
@@ -64,7 +64,8 @@ annotations:
url: https://solr.apache.org/operator/resources#tutorials
artifacthub.io/images: |
- name: solr
- image: apache/solr:8.9
+ image: solr:8.9
+ whitelisted: true
artifacthub.io/signKey: |
fingerprint: <fingerprint>
url: https://dist.apache.org/repos/dist/release/solr/KEYS
diff --git a/helm/solr/README.md b/helm/solr/README.md
index 2f12d67..6b31a00 100644
--- a/helm/solr/README.md
+++ b/helm/solr/README.md
@@ -78,7 +78,7 @@ The command removes the SolrCloud resource, and then
Kubernetes will garbage col
| fullnameOverride | string | `""` | A custom name for the Solr Operator
Deployment |
| nameOverride | string | `""` | |
| replicas | int | `3` | The number of Solr pods to run in the Solr Cloud. If
you want to use autoScaling, do not set this field. |
-| image.repository | string | `"apache/solr"` | The repository of the Solr
image |
+| image.repository | string | `"solr"` | The repository of the Solr image |
| image.tag | string | `"8.9"` | The tag/version of Solr to run |
| image.pullPolicy | string | | PullPolicy for the Solr image, defaults to
the empty Pod behavior |
| image.imagePullSecret | string | | PullSecret for the Solr image |
@@ -137,7 +137,7 @@ External addressability is disabled by default.
| addressability.external.hideNodes | boolean | `false` | Do not make the
individual Solr nodes addressable outside of the Kubernetes cluster. |
| addressability.external.hideCommon | boolean | `false` | Do not make the
load-balanced common Solr endpoint addressable outside of the Kubernetes
cluster. |
| addressability.external.nodePortOverride | int | | Override the port of
individual Solr nodes when using the `Ingress` method. This will default to
`80` if using an Ingress without TLS and `443` when using an Ingress with Solr
TLS enabled (not TLS Termination described below). |
-| addressability.external.ingressTLSTerminationSecret | int | | Name of
Kubernetes Secret to terminate TLS when using the `Ingress` method. |
+| addressability.external.ingressTLSTerminationSecret | string | | Name of
Kubernetes Secret to terminate TLS when using the `Ingress` method. |
### ZK Options
