You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2021/03/15 17:41:08 UTC
[solr-operator] branch main updated: Change repo from lucene-solr-operator to solr-operator (#237)

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 d236b4f  Change repo from lucene-solr-operator to solr-operator (#237)
d236b4f is described below

commit d236b4f2cc2713c410554cc5166064b566b58342
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Mar 15 13:40:51 2021 -0400

    Change repo from lucene-solr-operator to solr-operator (#237)
---
 .asf.yaml                                          |  8 ++++----
 PROJECT                                            |  2 +-
 README.md                                          | 24 +++++++++++-----------
 controllers/controller_utils_test.go               |  4 ++--
 controllers/solrbackup_controller.go               |  4 ++--
 controllers/solrbackup_controller_test.go          |  2 +-
 controllers/solrcloud_controller.go                |  4 ++--
 .../solrcloud_controller_externaldns_test.go       |  4 ++--
 controllers/solrcloud_controller_ingress_test.go   |  4 ++--
 controllers/solrcloud_controller_storage_test.go   |  4 ++--
 controllers/solrcloud_controller_test.go           |  4 ++--
 controllers/solrcloud_controller_tls_test.go       |  4 ++--
 controllers/solrcloud_controller_zk_test.go        |  2 +-
 controllers/solrprometheusexporter_controller.go   |  4 ++--
 .../solrprometheusexporter_controller_test.go      |  4 ++--
 controllers/suite_test.go                          |  2 +-
 controllers/util/backup_util.go                    |  4 ++--
 controllers/util/prometheus_exporter_util.go       |  2 +-
 controllers/util/solr_api/api.go                   |  4 ++--
 controllers/util/solr_update_util.go               |  4 ++--
 controllers/util/solr_update_util_test.go          |  4 ++--
 controllers/util/solr_util.go                      |  2 +-
 controllers/util/zk_util.go                        |  2 +-
 docs/local_tutorial.md                             |  4 ++--
 docs/running-the-operator.md                       |  2 +-
 docs/solr-cloud/solr-cloud-crd.md                  |  2 +-
 docs/solr-prometheus-exporter/README.md            |  2 +-
 go.mod                                             |  2 +-
 hack/release/build_helm.sh                         |  2 +-
 helm/solr-operator/Chart.yaml                      | 21 ++++++++++---------
 helm/solr-operator/README.md                       |  4 ++--
 main.go                                            |  6 +++---
 32 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index b4103f6..6daaefe 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -2,7 +2,7 @@
 
 github:
   description: "Kubernetes Operator for Apache Solr"
-  homepage: https://lucene.apache.org/
+  homepage: https://solr.apache.org/
   labels:
     - solr
     - search
@@ -37,6 +37,6 @@ github:
   ghp_branch: gh-pages
 
 notifications:
-  commits:      commits@lucene.apache.org
-  issues:       issues@lucene.apache.org
-  pullrequests: issues@lucene.apache.org
+  commits:      commits@solr.apache.org
+  issues:       issues@solr.apache.org
+  pullrequests: issues@solr.apache.org
diff --git a/PROJECT b/PROJECT
index bc7e63b..d161e4e 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,6 +1,6 @@
 version: "2"
 domain: apache.org
-repo: github.com/apache/lucene-solr-operator
+repo: github.com/apache/solr-operator
 resources:
 - group: solr
   version: v1beta1
diff --git a/README.md b/README.md
index 5d5c361..4a7dc85 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Solr Operator
-[![Latest Version](https://img.shields.io/github/tag/apache/lucene-solr-operator)](https://github.com/apache/lucene-solr-operator/releases)
+[![Latest Version](https://img.shields.io/github/tag/apache/solr-operator)](https://github.com/apache/solr-operator/releases)
 [![License](https://img.shields.io/badge/LICENSE-Apache2.0-ff69b4.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/apache-solr)](https://artifacthub.io/packages/search?repo=apache-solr)
-[![Commit since last release](https://img.shields.io/github/commits-since/apache/lucene-solr-operator/latest.svg)](https://github.com/apache/lucene-solr-operator/commits/main)
+[![Commit since last release](https://img.shields.io/github/commits-since/apache/solr-operator/latest.svg)](https://github.com/apache/solr-operator/commits/main)
 [![Docker Pulls](https://img.shields.io/docker/pulls/bloomberg/solr-operator)](https://hub.docker.com/r/bloomberg/solr-operator/)
 [![Slack](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://kubernetes.slack.com/messages/solr-operator)
 [![Mailing List]]
@@ -31,20 +31,20 @@ Join us on the [#solr-operator](https://kubernetes.slack.com/messages/solr-opera
 
 Please visit the following pages for documentation on using and developing the Solr Operator:
 
-- [Local Tutorial](https://apache.github.io/lucene-solr-operator/docs/local_tutorial)
+- [Local Tutorial](https://apache.github.io/solr-operator/docs/local_tutorial)
 - [Helm Instructions via Artifact Hub](https://artifacthub.io/packages/helm/apache-solr/solr-operator)
   - The released helm charts and their instructions should be used for all safe and stable deployments.
     The charts found in `helm/` are not guaranteed to be compatible with the last stable release, and should only be used for development purposes.
-- [Running the Solr Operator](https://apache.github.io/lucene-solr-operator/docs/running-the-operator)
+- [Running the Solr Operator](https://apache.github.io/solr-operator/docs/running-the-operator)
 - Available Solr Resources
-    - [Solr Clouds](https://apache.github.io/lucene-solr-operator/docs/solr-cloud)
-    - [Solr Backups](https://apache.github.io/lucene-solr-operator/docs/solr-backup)
-    - [Solr Metrics](https://apache.github.io/lucene-solr-operator/docs/solr-prometheus-exporter)
-- [Development](https://apache.github.io/lucene-solr-operator/docs/development)
+    - [Solr Clouds](https://apache.github.io/solr-operator/docs/solr-cloud)
+    - [Solr Backups](https://apache.github.io/solr-operator/docs/solr-backup)
+    - [Solr Metrics](https://apache.github.io/solr-operator/docs/solr-prometheus-exporter)
+- [Development](https://apache.github.io/solr-operator/docs/development)
 
 ### Examples
 
-Example uses of each CRD have been [provided](https://apache.github.io/lucene-solr-operator/example).
+Example uses of each CRD have been [provided](https://apache.github.io/solr-operator/example).
 
 ## Version Compatibility & Upgrade Notes
 
@@ -52,7 +52,7 @@ Example uses of each CRD have been [provided](https://apache.github.io/lucene-so
 - All deprecated CRD fields and Solr Operator options from `v0.2.*` have been removed.
   
 - The `SolrCollection` and `SolrCollectionAlias` have been removed. Please use the Solr APIs to manage these resources instead.
-Discussion around the removal can be found in [Issue #204](https://github.com/apache/lucene-solr-operator/issues/204).
+Discussion around the removal can be found in [Issue #204](https://github.com/apache/solr-operator/issues/204).
 
 #### v0.2.7
 - Do to the addition of possible sidecar/initContainers for SolrClouds, the version of CRDs used had to be upgraded to `apiextensions.k8s.io/v1`.
@@ -148,12 +148,12 @@ This is different from the source release LICENSE and NOTICE files, so make sure
 
 This space applies the ASF [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
 If you have any concerns about the Code, or behavior which you have experienced in the project, please
-contact us at private@lucene.apache.org .
+contact us at private@solr.apache.org .
 
 ## Security Vulnerability Reporting
 
 If you believe you have identified a security vulnerability in this project, please send email to the ASF security
-team at security@apache.org, detailing the suspected issue and any methods you've found to reproduce it. More details
+team at security@solr.apache.org, detailing the suspected issue and any methods you've found to reproduce it. More details
 can be found [here](https://www.apache.org/security/)
 
 Please do NOT open an issue in the GitHub repository, as we'd prefer to keep vulnerability reports private until
diff --git a/controllers/controller_utils_test.go b/controllers/controller_utils_test.go
index 8e9b3a7..652e4b4 100644
--- a/controllers/controller_utils_test.go
+++ b/controllers/controller_utils_test.go
@@ -20,13 +20,13 @@ package controllers
 import (
 	b64 "encoding/base64"
 	"fmt"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	"github.com/apache/solr-operator/controllers/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 	"strings"
 	"testing"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
diff --git a/controllers/solrbackup_controller.go b/controllers/solrbackup_controller.go
index 8026d99..9f6c3f5 100644
--- a/controllers/solrbackup_controller.go
+++ b/controllers/solrbackup_controller.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/go-logr/logr"
 	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	solrv1beta1 "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solrv1beta1 "github.com/apache/solr-operator/api/v1beta1"
 )
 
 // SolrBackupReconciler reconciles a SolrBackup object
diff --git a/controllers/solrbackup_controller_test.go b/controllers/solrbackup_controller_test.go
index b79c0e9..eb1d478 100644
--- a/controllers/solrbackup_controller_test.go
+++ b/controllers/solrbackup_controller_test.go
@@ -18,7 +18,7 @@
 package controllers
 
 import (
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"golang.org/x/net/context"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/controllers/solrcloud_controller.go b/controllers/solrcloud_controller.go
index 2813db5..f7a6a24 100644
--- a/controllers/solrcloud_controller.go
+++ b/controllers/solrcloud_controller.go
@@ -21,8 +21,8 @@ import (
 	"context"
 	"crypto/md5"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/go-logr/logr"
 	zk "github.com/pravega/zookeeper-operator/pkg/apis/zookeeper/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/controllers/solrcloud_controller_externaldns_test.go b/controllers/solrcloud_controller_externaldns_test.go
index 97880c4..dfc881a 100644
--- a/controllers/solrcloud_controller_externaldns_test.go
+++ b/controllers/solrcloud_controller_externaldns_test.go
@@ -21,10 +21,10 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"testing"
 
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/stretchr/testify/assert"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/solrcloud_controller_ingress_test.go b/controllers/solrcloud_controller_ingress_test.go
index 3708285..d28f7c4 100644
--- a/controllers/solrcloud_controller_ingress_test.go
+++ b/controllers/solrcloud_controller_ingress_test.go
@@ -23,10 +23,10 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/stretchr/testify/assert"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/solrcloud_controller_storage_test.go b/controllers/solrcloud_controller_storage_test.go
index bb5bde9..e53c1d8 100644
--- a/controllers/solrcloud_controller_storage_test.go
+++ b/controllers/solrcloud_controller_storage_test.go
@@ -22,10 +22,10 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	"testing"
 
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/stretchr/testify/assert"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go
index 59238ed..d8870b9 100644
--- a/controllers/solrcloud_controller_test.go
+++ b/controllers/solrcloud_controller_test.go
@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"time"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/onsi/gomega"
 	zookeeperv1beta1 "github.com/pravega/zookeeper-operator/pkg/apis/zookeeper/v1beta1"
 	"github.com/stretchr/testify/assert"
diff --git a/controllers/solrcloud_controller_tls_test.go b/controllers/solrcloud_controller_tls_test.go
index 119dc67..2a52b42 100644
--- a/controllers/solrcloud_controller_tls_test.go
+++ b/controllers/solrcloud_controller_tls_test.go
@@ -20,8 +20,8 @@ package controllers
 import (
 	"crypto/md5"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
diff --git a/controllers/solrcloud_controller_zk_test.go b/controllers/solrcloud_controller_zk_test.go
index a8b2503..ae8e6fb 100644
--- a/controllers/solrcloud_controller_zk_test.go
+++ b/controllers/solrcloud_controller_zk_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/solrprometheusexporter_controller.go b/controllers/solrprometheusexporter_controller.go
index 0e396ea..9ba03a3 100644
--- a/controllers/solrprometheusexporter_controller.go
+++ b/controllers/solrprometheusexporter_controller.go
@@ -21,8 +21,8 @@ import (
 	"context"
 	"crypto/md5"
 	"fmt"
-	solrv1beta1 "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	solrv1beta1 "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/controllers/solrprometheusexporter_controller_test.go b/controllers/solrprometheusexporter_controller_test.go
index 523e5f0..4146992 100644
--- a/controllers/solrprometheusexporter_controller_test.go
+++ b/controllers/solrprometheusexporter_controller_test.go
@@ -20,8 +20,8 @@ package controllers
 import (
 	"crypto/md5"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
index 09a8198..4752253 100644
--- a/controllers/suite_test.go
+++ b/controllers/suite_test.go
@@ -30,7 +30,7 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	solrv1beta1 "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solrv1beta1 "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/onsi/gomega"
 	zkOp "github.com/pravega/zookeeper-operator/pkg/apis"
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/controllers/util/backup_util.go b/controllers/util/backup_util.go
index b5c78d9..0d27267 100644
--- a/controllers/util/backup_util.go
+++ b/controllers/util/backup_util.go
@@ -20,8 +20,8 @@ package util
 import (
 	"bytes"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util/solr_api"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util/solr_api"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/util/prometheus_exporter_util.go b/controllers/util/prometheus_exporter_util.go
index 88e7653..25c10e9 100644
--- a/controllers/util/prometheus_exporter_util.go
+++ b/controllers/util/prometheus_exporter_util.go
@@ -18,7 +18,7 @@
 package util
 
 import (
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1beta1"
diff --git a/controllers/util/solr_api/api.go b/controllers/util/solr_api/api.go
index c35ca8f..df080e9 100644
--- a/controllers/util/solr_api/api.go
+++ b/controllers/util/solr_api/api.go
@@ -20,7 +20,7 @@ package solr_api
 import (
 	"encoding/json"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"net/http"
@@ -53,7 +53,7 @@ type SolrResponseHeader struct {
 }
 
 type SolrAsyncStatus struct {
-	// Possible states can be found here: https://github.com/apache/lucene-solr/blob/1d85cd783863f75cea133fb9c452302214165a4d/solr/solrj/src/java/org/apache/solr/client/solrj/response/RequestStatusState.java
+	// Possible states can be found here: https://github.com/apache/solr/blob/releases/lucene-solr%2F8.8.1/solr/solrj/src/java/org/apache/solr/client/solrj/response/RequestStatusState.java
 	AsyncState string `json:"state"`
 
 	Message string `json:"msg"`
diff --git a/controllers/util/solr_update_util.go b/controllers/util/solr_update_util.go
index 15d4321..ba441d2 100644
--- a/controllers/util/solr_update_util.go
+++ b/controllers/util/solr_update_util.go
@@ -19,8 +19,8 @@ package util
 
 import (
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util/solr_api"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util/solr_api"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/controllers/util/solr_update_util_test.go b/controllers/util/solr_update_util_test.go
index b7a4c2e..cd799cc 100644
--- a/controllers/util/solr_update_util_test.go
+++ b/controllers/util/solr_update_util_test.go
@@ -18,8 +18,8 @@
 package util
 
 import (
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers/util/solr_api"
+	solr "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers/util/solr_api"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
index 0c5b542..4288915 100644
--- a/controllers/util/solr_util.go
+++ b/controllers/util/solr_util.go
@@ -22,7 +22,7 @@ import (
 	b64 "encoding/base64"
 	"encoding/json"
 	"fmt"
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1beta1"
diff --git a/controllers/util/zk_util.go b/controllers/util/zk_util.go
index 6d7c793..4241fd1 100644
--- a/controllers/util/zk_util.go
+++ b/controllers/util/zk_util.go
@@ -18,7 +18,7 @@
 package util
 
 import (
-	solr "github.com/apache/lucene-solr-operator/api/v1beta1"
+	solr "github.com/apache/solr-operator/api/v1beta1"
 	"github.com/go-logr/logr"
 	zk "github.com/pravega/zookeeper-operator/pkg/apis/zookeeper/v1beta1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md
index 2af3724..1e92dd2 100644
--- a/docs/local_tutorial.md
+++ b/docs/local_tutorial.md
@@ -63,7 +63,7 @@ Now that we have the prerequisites setup, let us install Solr Operator which wil
 Now add the Solr Operator Helm repository. (You should only need to do this once)
 
 ```bash
-$ helm repo add apache-solr https://apache.github.io/lucene-solr-operator/charts
+$ helm repo add apache-solr https://solr.apache.org/charts
 $ helm repo update
 ```
 
@@ -130,7 +130,7 @@ open "http://default-example-solrcloud.ing.local.domain/solr/#/~cloud?view=nodes
 
 ## Create a collection and index some documents
 
-Create a collection via the [Collections API](https://lucene.apache.org/solr/guide/8_8/collection-management.html#create).
+Create a collection via the [Collections API](https://solr.apache.org/guide/8_8/collection-management.html#create).
 
 ```bash
 # Execute the Collections API command
diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md
index fcdf8f7..f2dbbda 100644
--- a/docs/running-the-operator.md
+++ b/docs/running-the-operator.md
@@ -13,7 +13,7 @@ The official documentation for installing the Solr Operator Helm chart can be fo
 The first step is to add the Solr Operator helm repository.
 
 ```bash
-$ helm repo add apache-solr https://apache.github.io/lucene-solr-operator/charts
+$ helm repo add apache-solr https://solr.apache.org/charts
 $ helm repo update
 ```
 
diff --git a/docs/solr-cloud/solr-cloud-crd.md b/docs/solr-cloud/solr-cloud-crd.md
index 19f14df..e74f996 100644
--- a/docs/solr-cloud/solr-cloud-crd.md
+++ b/docs/solr-cloud/solr-cloud-crd.md
@@ -564,7 +564,7 @@ use case. The Solr operator can bootstrap a default security configuration for y
 there is no reason to deploy an unsecured SolrCloud cluster when using the Solr operator. In most cases, you'll want to combine
 basic authentication with TLS to ensure credentials are never passed in clear text.
 
-For background on Solr security, please refer to the [Reference Guide](https://lucene.apache.org/solr/guide) for your version of Solr.
+For background on Solr security, please refer to the [Reference Guide](https://solr.apache.org/guide) for your version of Solr.
 
 Basic authentication is the only authentication scheme supported by the Solr operator at this time. In general, you have 
 two basic options for configuring basic authentication with the Solr operator:
diff --git a/docs/solr-prometheus-exporter/README.md b/docs/solr-prometheus-exporter/README.md
index 0b47cc2..f27e20c 100644
--- a/docs/solr-prometheus-exporter/README.md
+++ b/docs/solr-prometheus-exporter/README.md
@@ -7,7 +7,7 @@ To use the Prometheus exporter, the easiest thing to do is just provide a refere
 - The address of the standalone Solr instance
 
 You can also provide a custom Prometheus Exporter config, Solr version, and exporter options as described in the
-[Solr ref-guide](https://lucene.apache.org/solr/guide/monitoring-solr-with-prometheus-and-grafana.html#command-line-parameters).
+[Solr ref-guide](https://solr.apache.org/guide/monitoring-solr-with-prometheus-and-grafana.html#command-line-parameters).
 
 Note that a few of the official Solr docker images do not enable the Prometheus Exporter.
 Versions `6.6` - `7.x` and `8.2` - `master` should have the exporter available. 
diff --git a/go.mod b/go.mod
index bb81b34..c9de22b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/apache/lucene-solr-operator
+module github.com/apache/solr-operator
 
 go 1.16
 
diff --git a/hack/release/build_helm.sh b/hack/release/build_helm.sh
index 3cc1bd0..d0d6a54 100755
--- a/hack/release/build_helm.sh
+++ b/hack/release/build_helm.sh
@@ -15,6 +15,6 @@ rm -rf release-artifacts/*
 
 helm package -u helm/* --app-version "${VERSION}" --version "${VERSION#v}" -d release-artifacts/
 
-helm repo index release-artifacts/ --url https://github.com/apache/lucene-solr-operator/releases/download/${VERSION}/ --merge docs/charts/index.yaml
+helm repo index release-artifacts/ --merge docs/charts/index.yaml
 
 mv release-artifacts/index.yaml docs/charts/index.yaml
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 5b09806..ab1f711 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -19,9 +19,9 @@ description: The Solr Operator enables easy management of Solr resources within
 version: 0.2.8
 appVersion: v0.2.8
 kubeVersion: ">= 1.16.0-0"
-home: https://github.com/apache/lucene-solr-operator
+home: https://github.com/apache/solr-operator
 sources:
-  - https://github.com/apache/lucene-solr-operator
+  - https://github.com/apache/solr-operator
 keywords:
   - solr
   - apache
@@ -30,10 +30,17 @@ keywords:
   - operator
 maintainers:
   - name: Solr Dev Community
-    email: dev@lucene.apache.org
+    email: dev@solr.apache.org
   - name: Houston Putman
     email: houston@apache.org
-icon: https://lucene.apache.org/theme/images/solr/identity/Solr_Logo_on_white.png
+icon: https://solr.apache.org/theme/images/identity/Solr_Logo_on_white.png
+
+dependencies:
+  - name: 'zookeeper-operator'
+    version: 0.2.9
+    repository: https://charts.pravega.io
+    condition: zookeeper-operator.install
+
 annotations:
   artifacthub.io/operator: "true"
   artifacthub.io/operatorCapabilities: Seamless Upgrades
@@ -96,9 +103,3 @@ annotations:
         numThreads: 4
         image:
           tag: 8.7.0
-
-dependencies:
-  - name: 'zookeeper-operator'
-    version: 0.2.9
-    repository: https://charts.pravega.io
-    condition: zookeeper-operator.install
\ No newline at end of file
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index d338f60..0418101 100644
--- a/helm/solr-operator/README.md
+++ b/helm/solr-operator/README.md
@@ -3,7 +3,7 @@ Solr Operator
 
 The Solr Operator is designed to allow easy deployment Solr Clouds and other Solr Resources to Kubernetes.
 
-Documentation around using the Solr Operator can be found in it's [source repo](https://github.com/apache/lucene-solr-operator).
+Documentation around using the Solr Operator can be found in it's [source repo](https://github.com/apache/solr-operator).
 
 ## Using the Helm Chart
 
@@ -27,7 +27,7 @@ If you do not wish to use the Zookeeper Operator, set:
 You should only need to add the solr operator helm chart repository once, by running the following command:
 
 ```bash
-helm repo add apache-solr https://apache.github.io/lucene-solr-operator/charts
+helm repo add apache-solr https://solr.apache.org/charts
 ```
 
 ### Installing the Chart
diff --git a/main.go b/main.go
index 5ea06bf..f4ccde7 100644
--- a/main.go
+++ b/main.go
@@ -21,9 +21,9 @@ import (
 	"crypto/tls"
 	"flag"
 	"fmt"
-	solrv1beta1 "github.com/apache/lucene-solr-operator/api/v1beta1"
-	"github.com/apache/lucene-solr-operator/controllers"
-	"github.com/apache/lucene-solr-operator/controllers/util/solr_api"
+	solrv1beta1 "github.com/apache/solr-operator/api/v1beta1"
+	"github.com/apache/solr-operator/controllers"
+	"github.com/apache/solr-operator/controllers/util/solr_api"
 	"net/http"
 	"os"
 	"runtime"