Skip to content

Commit 40d3aee

Browse files
committed
Fix small issues with Solr Helm chart & Release Wizard
1 parent 16aaa8f commit 40d3aee

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

hack/release/wizard/releaseWizard.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ def get_mirrored_versions(self):
358358
releases_str = load("https://projects.apache.org/json/foundation/releases.json", "utf-8")
359359
releases = json.loads(releases_str)
360360
state.mirrored_versions = []
361-
if 'solr-operator' in releases.keys():
362-
releases = releases['solr-operator']
363-
state.mirrored_versions = [ r for r in list(map(lambda y: y[7:], filter(lambda x: x.startswith('solr-operator-'), list(releases.keys())))) ]
361+
if 'solr' in releases.keys():
362+
releases = releases['solr']
363+
state.mirrored_versions = [ r for r in list(map(lambda y: y[14:], filter(lambda x: x.startswith('solr-operator-v'), list(releases.keys())))) ]
364364
return state.mirrored_versions
365365

366366
def get_mirrored_versions_to_delete(self):

helm/solr/Chart.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ annotations:
6464
url: https://solr.apache.org/operator/resources#tutorials
6565
artifacthub.io/images: |
6666
- name: solr
67-
image: apache/solr:8.9
67+
image: solr:8.9
68+
whitelisted: true
6869
artifacthub.io/signKey: |
6970
fingerprint: <fingerprint>
7071
url: https://dist.apache.org/repos/dist/release/solr/KEYS

helm/solr/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The command removes the SolrCloud resource, and then Kubernetes will garbage col
7878
| fullnameOverride | string | `""` | A custom name for the Solr Operator Deployment |
7979
| nameOverride | string | `""` | |
8080
| 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. |
81-
| image.repository | string | `"apache/solr"` | The repository of the Solr image |
81+
| image.repository | string | `"solr"` | The repository of the Solr image |
8282
| image.tag | string | `"8.9"` | The tag/version of Solr to run |
8383
| image.pullPolicy | string | | PullPolicy for the Solr image, defaults to the empty Pod behavior |
8484
| image.imagePullSecret | string | | PullSecret for the Solr image |
@@ -137,7 +137,7 @@ External addressability is disabled by default.
137137
| addressability.external.hideNodes | boolean | `false` | Do not make the individual Solr nodes addressable outside of the Kubernetes cluster. |
138138
| addressability.external.hideCommon | boolean | `false` | Do not make the load-balanced common Solr endpoint addressable outside of the Kubernetes cluster. |
139139
| 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). |
140-
| addressability.external.ingressTLSTerminationSecret | int | | Name of Kubernetes Secret to terminate TLS when using the `Ingress` method. |
140+
| addressability.external.ingressTLSTerminationSecret | string | | Name of Kubernetes Secret to terminate TLS when using the `Ingress` method. |
141141

142142
### ZK Options
143143

0 commit comments

Comments
 (0)