Skip to content

Commit

Permalink
Change repo from lucene-solr-operator to solr-operator (#237)
Browse files Browse the repository at this point in the history
  • Loading branch information
HoustonPutman committed Mar 15, 2021
1 parent 252232f commit d236b4f
Show file tree
Hide file tree
Showing 32 changed files with 74 additions and 73 deletions.
8 changes: 4 additions & 4 deletions .asf.yaml
Expand Up @@ -2,7 +2,7 @@

github:
description: "Kubernetes Operator for Apache Solr"
homepage: https://lucene.apache.org/
homepage: https://solr.apache.org/
labels:
- solr
- search
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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
Expand Down
24 changes: 12 additions & 12 deletions 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]]
Expand Down Expand Up @@ -31,28 +31,28 @@ 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

#### v0.3.0
- 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`.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions controllers/controller_utils_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrbackup_controller.go
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/solrbackup_controller_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller_externaldns_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller_ingress_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller_storage_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrcloud_controller_tls_test.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/solrcloud_controller_zk_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrprometheusexporter_controller.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/solrprometheusexporter_controller_test.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/util/backup_util.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/util/prometheus_exporter_util.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/util/solr_api/api.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions controllers/util/solr_update_util.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/util/solr_update_util_test.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/util/solr_util.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/util/zk_util.go
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docs/local_tutorial.md
Expand Up @@ -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
```

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/running-the-operator.md
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion docs/solr-cloud/solr-cloud-crd.md
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/solr-prometheus-exporter/README.md
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,4 +1,4 @@
module github.com/apache/lucene-solr-operator
module github.com/apache/solr-operator

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion hack/release/build_helm.sh
Expand Up @@ -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

0 comments on commit d236b4f

Please sign in to comment.