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 2021/06/11 21:04:51 UTC
[solr-operator] branch main updated: Various small fixes for the
tutorial and upgrade notes. (#275)
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 d3b8778 Various small fixes for the tutorial and upgrade notes. (#275)
d3b8778 is described below
commit d3b87780e8fb012ac1127c1a48a6df2ae53b74d5
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Jun 11 17:04:42 2021 -0400
Various small fixes for the tutorial and upgrade notes. (#275)
---
docs/local_tutorial.md | 4 ++--
docs/upgrading-to-apache.md | 2 +-
hack/test-upgrade.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md
index ccd55f6..fb2d2b7 100644
--- a/docs/local_tutorial.md
+++ b/docs/local_tutorial.md
@@ -138,7 +138,7 @@ Create a collection via the [Collections API](https://solr.apache.org/guide/8_8/
```bash
# Execute the Collections API command
-curl "http://default-example-solrcloud.ing.local.domain/admin/collections?action=CREATE&name=mycoll&numShards=1&replicationFactor=3&maxShardsPerNode=2&collection.configName=_default"
+curl "http://default-example-solrcloud.ing.local.domain/solr/admin/collections?action=CREATE&name=mycoll&numShards=1&replicationFactor=3&maxShardsPerNode=2&collection.configName=_default"
# Check in Admin UI that collection is created
open "http://default-example-solrcloud.ing.local.domain/solr/#/~cloud?view=graph"
@@ -253,4 +253,4 @@ open "http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/http
```bash
kubectl delete solrcloud example
-```
\ No newline at end of file
+```
diff --git a/docs/upgrading-to-apache.md b/docs/upgrading-to-apache.md
index b8da2a1..ca420b3 100644
--- a/docs/upgrading-to-apache.md
+++ b/docs/upgrading-to-apache.md
@@ -65,7 +65,7 @@ If you manually manage your cluster, then the instructions below will allow you
# First make sure that "yq" is installed
kubectl get solrclouds.solr.bloomberg.com --all-namespaces -o yaml | \
sed "s#solr.bloomberg.com#solr.apache.org#g" | \
- yq eval 'del(.items.[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration", .items.[].metadata.managedFields, .items.[].metadata.resourceVersion, .items.[].metadata.creationTimestamp, .items.[].metadata.generation, .items.[].metadata.selfLink, .items.[].metadata.uid, .items.[].spec.solrPodPolicy, .items.[].spec.zookeeperRef.provided.image.tag)' - \
+ yq eval 'del(.items.[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration", .items.[].metadata.managedFields, .items.[].metadata.resourceVersion, .items.[].metadata.creationTimestamp, .items.[].metadata.generation, .items.[].metadata.selfLink, .items.[].metadata.uid, .items.[].spec.solrPodPolicy, .items.[].spec.zookeeperRef.provided.image.tag, .items.[].status)' - \
| kubectl apply -f -
kubectl get solrprometheusexporters.solr.bloomberg.com --all-namespaces -o yaml | \
sed "s#solr.bloomberg.com#solr.apache.org#g" | \
diff --git a/hack/test-upgrade.sh b/hack/test-upgrade.sh
index da08d7a..3f521b0 100755
--- a/hack/test-upgrade.sh
+++ b/hack/test-upgrade.sh
@@ -155,7 +155,7 @@ helm install apache helm/solr-operator --set image.tag=latest --set image.pullPo
####
kubectl get solrclouds.solr.bloomberg.com --all-namespaces -o yaml | \
sed "s#solr.bloomberg.com#solr.apache.org#g" | \
- yq eval 'del(.items.[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration", .items.[].metadata.managedFields, .items.[].metadata.resourceVersion, .items.[].metadata.creationTimestamp, .items.[].metadata.generation, .items.[].metadata.selfLink, .items.[].metadata.uid, .items.[].spec.solrPodPolicy, .items.[].spec.zookeeperRef.provided.image.tag)' - \
+ yq eval 'del(.items.[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration", .items.[].metadata.managedFields, .items.[].metadata.resourceVersion, .items.[].metadata.creationTimestamp, .items.[].metadata.generation, .items.[].metadata.selfLink, .items.[].metadata.uid, .items.[].spec.solrPodPolicy, .items.[].spec.zookeeperRef.provided.image.tag, .items.[].status)' - \
| kubectl apply -f -
kubectl get solrprometheusexporters.solr.bloomberg.com --all-namespaces -o yaml | \
sed "s#solr.bloomberg.com#solr.apache.org#g" | \