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/01/21 19:40:19 UTC
[lucene-solr-operator] branch main updated: Changing CRD group to
solr.apache.org (#184)
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/lucene-solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 6bb8e87 Changing CRD group to solr.apache.org (#184)
6bb8e87 is described below
commit 6bb8e8773dea21f8ba16fe311f5f47e2d972fa7f
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Jan 21 14:40:13 2021 -0500
Changing CRD group to solr.apache.org (#184)
---
api/v1beta1/groupversion_info.go | 4 ++--
...ckups.yaml => solr.apache.org_solrbackups.yaml} | 4 ++--
...clouds.yaml => solr.apache.org_solrclouds.yaml} | 4 ++--
... => solr.apache.org_solrcollectionaliases.yaml} | 4 ++--
...s.yaml => solr.apache.org_solrcollections.yaml} | 4 ++--
...> solr.apache.org_solrprometheusexporters.yaml} | 4 ++--
config/crd/kustomization.yaml | 10 ++++-----
config/crd/patches/cainjection_in_solrbackups.yaml | 2 +-
config/crd/patches/cainjection_in_solrclouds.yaml | 2 +-
.../cainjection_in_solrcollectionaliases.yaml | 2 +-
.../patches/cainjection_in_solrcollections.yaml | 2 +-
.../cainjection_in_solrprometheusexporters.yaml | 2 +-
config/crd/patches/webhook_in_solrbackups.yaml | 2 +-
config/crd/patches/webhook_in_solrclouds.yaml | 2 +-
.../patches/webhook_in_solrcollectionaliases.yaml | 2 +-
config/crd/patches/webhook_in_solrcollections.yaml | 2 +-
.../webhook_in_solrprometheusexporters.yaml | 2 +-
config/rbac/role.yaml | 24 +++++++++++-----------
controllers/solrbackup_controller.go | 8 ++++----
controllers/solrcloud_controller.go | 4 ++--
controllers/solrcollection_controller.go | 4 ++--
controllers/solrcollectionalias_controller.go | 8 ++++----
controllers/solrprometheusexporter_controller.go | 8 ++++----
docs/local_tutorial.md | 14 ++++++++-----
docs/running-the-operator.md | 3 ---
docs/solr-cloud/README.md | 4 ++--
docs/solr-cloud/dependencies.md | 2 +-
docs/solr-collection-alias/README.md | 2 +-
docs/solr-collection/README.md | 6 +++---
example/test_solrbackup.yaml | 2 +-
example/test_solrcloud.yaml | 2 +-
example/test_solrcloud_addressability.yaml | 4 ++--
example/test_solrcloud_private_repo.yaml | 2 +-
example/test_solrcloud_toleration_example.yaml | 2 +-
example/test_solrcollection.yaml | 6 +++---
example/test_solrcollection_alias.yaml | 2 +-
example/test_solrprometheusexporter.yaml | 2 +-
helm/solr-operator/crds/crds.yaml | 20 +++++++++---------
helm/solr-operator/templates/role.yaml | 24 +++++++++++-----------
39 files changed, 104 insertions(+), 103 deletions(-)
diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
index 4f05817..b209235 100644
--- a/api/v1beta1/groupversion_info.go
+++ b/api/v1beta1/groupversion_info.go
@@ -17,7 +17,7 @@
// Package v1beta1 contains API Schema definitions for the solr v1beta1 API group
// +kubebuilder:object:generate=true
-// +groupName=solr.bloomberg.com
+// +groupName=solr.apache.org
package v1beta1
import (
@@ -27,7 +27,7 @@ import (
var (
// GroupVersion is group version used to register these objects
- GroupVersion = schema.GroupVersion{Group: "solr.bloomberg.com", Version: "v1beta1"}
+ GroupVersion = schema.GroupVersion{Group: "solr.apache.org", Version: "v1beta1"}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
diff --git a/config/crd/bases/solr.bloomberg.com_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
similarity index 99%
rename from config/crd/bases/solr.bloomberg.com_solrbackups.yaml
rename to config/crd/bases/solr.apache.org_solrbackups.yaml
index 748a610..c04a612 100644
--- a/config/crd/bases/solr.bloomberg.com_solrbackups.yaml
+++ b/config/crd/bases/solr.apache.org_solrbackups.yaml
@@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrbackups.solr.bloomberg.com
+ name: solrbackups.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrBackup
listKind: SolrBackupList
diff --git a/config/crd/bases/solr.bloomberg.com_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml
similarity index 99%
rename from config/crd/bases/solr.bloomberg.com_solrclouds.yaml
rename to config/crd/bases/solr.apache.org_solrclouds.yaml
index 933eabb..626d7d6 100644
--- a/config/crd/bases/solr.bloomberg.com_solrclouds.yaml
+++ b/config/crd/bases/solr.apache.org_solrclouds.yaml
@@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrclouds.solr.bloomberg.com
+ name: solrclouds.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCloud
listKind: SolrCloudList
diff --git a/config/crd/bases/solr.bloomberg.com_solrcollectionaliases.yaml b/config/crd/bases/solr.apache.org_solrcollectionaliases.yaml
similarity index 97%
rename from config/crd/bases/solr.bloomberg.com_solrcollectionaliases.yaml
rename to config/crd/bases/solr.apache.org_solrcollectionaliases.yaml
index b4af794..836d6f9 100644
--- a/config/crd/bases/solr.bloomberg.com_solrcollectionaliases.yaml
+++ b/config/crd/bases/solr.apache.org_solrcollectionaliases.yaml
@@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrcollectionaliases.solr.bloomberg.com
+ name: solrcollectionaliases.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCollectionAlias
listKind: SolrCollectionAliasList
diff --git a/config/crd/bases/solr.bloomberg.com_solrcollections.yaml b/config/crd/bases/solr.apache.org_solrcollections.yaml
similarity index 98%
rename from config/crd/bases/solr.bloomberg.com_solrcollections.yaml
rename to config/crd/bases/solr.apache.org_solrcollections.yaml
index a6ab1a9..6e224ca 100644
--- a/config/crd/bases/solr.bloomberg.com_solrcollections.yaml
+++ b/config/crd/bases/solr.apache.org_solrcollections.yaml
@@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrcollections.solr.bloomberg.com
+ name: solrcollections.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCollection
listKind: SolrCollectionList
diff --git a/config/crd/bases/solr.bloomberg.com_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
similarity index 99%
rename from config/crd/bases/solr.bloomberg.com_solrprometheusexporters.yaml
rename to config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
index 8ab7dbb..deebc5b 100644
--- a/config/crd/bases/solr.bloomberg.com_solrprometheusexporters.yaml
+++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
@@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrprometheusexporters.solr.bloomberg.com
+ name: solrprometheusexporters.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrPrometheusExporter
listKind: SolrPrometheusExporterList
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 5d4a005..2301814 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -2,11 +2,11 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
-- bases/solr.bloomberg.com_solrclouds.yaml
-- bases/solr.bloomberg.com_solrbackups.yaml
-- bases/solr.bloomberg.com_solrcollections.yaml
-- bases/solr.bloomberg.com_solrprometheusexporters.yaml
-- bases/solr.bloomberg.com_solrcollectionaliases.yaml
+- bases/solr.apache.org_solrclouds.yaml
+- bases/solr.apache.org_solrbackups.yaml
+- bases/solr.apache.org_solrcollections.yaml
+- bases/solr.apache.org_solrprometheusexporters.yaml
+- bases/solr.apache.org_solrcollectionaliases.yaml
# +kubebuilder:scaffold:crdkustomizeresource
patchesStrategicMerge: []
diff --git a/config/crd/patches/cainjection_in_solrbackups.yaml b/config/crd/patches/cainjection_in_solrbackups.yaml
index 5036b9e..21001e2 100644
--- a/config/crd/patches/cainjection_in_solrbackups.yaml
+++ b/config/crd/patches/cainjection_in_solrbackups.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: solrbackups.solr.bloomberg.com
+ name: solrbackups.solr.apache.org
diff --git a/config/crd/patches/cainjection_in_solrclouds.yaml b/config/crd/patches/cainjection_in_solrclouds.yaml
index 2afc239..17d52d9 100644
--- a/config/crd/patches/cainjection_in_solrclouds.yaml
+++ b/config/crd/patches/cainjection_in_solrclouds.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: solrclouds.solr.bloomberg.com
+ name: solrclouds.solr.apache.org
diff --git a/config/crd/patches/cainjection_in_solrcollectionaliases.yaml b/config/crd/patches/cainjection_in_solrcollectionaliases.yaml
index 9e849bb..96682e5 100644
--- a/config/crd/patches/cainjection_in_solrcollectionaliases.yaml
+++ b/config/crd/patches/cainjection_in_solrcollectionaliases.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: solrcollectionaliases.solr.bloomberg.com
+ name: solrcollectionaliases.solr.apache.org
diff --git a/config/crd/patches/cainjection_in_solrcollections.yaml b/config/crd/patches/cainjection_in_solrcollections.yaml
index 12a0143..f008a33 100644
--- a/config/crd/patches/cainjection_in_solrcollections.yaml
+++ b/config/crd/patches/cainjection_in_solrcollections.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: solrcollections.solr.bloomberg.com
+ name: solrcollections.solr.apache.org
diff --git a/config/crd/patches/cainjection_in_solrprometheusexporters.yaml b/config/crd/patches/cainjection_in_solrprometheusexporters.yaml
index a0b3d08..7371f36 100644
--- a/config/crd/patches/cainjection_in_solrprometheusexporters.yaml
+++ b/config/crd/patches/cainjection_in_solrprometheusexporters.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: solrprometheusexporters.solr.bloomberg.com
+ name: solrprometheusexporters.solr.apache.org
diff --git a/config/crd/patches/webhook_in_solrbackups.yaml b/config/crd/patches/webhook_in_solrbackups.yaml
index 17d7d32..2b3580e 100644
--- a/config/crd/patches/webhook_in_solrbackups.yaml
+++ b/config/crd/patches/webhook_in_solrbackups.yaml
@@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: solrbackups.solr.bloomberg.com
+ name: solrbackups.solr.apache.org
spec:
conversion:
strategy: Webhook
diff --git a/config/crd/patches/webhook_in_solrclouds.yaml b/config/crd/patches/webhook_in_solrclouds.yaml
index 8a416a5..bd4d0e4 100644
--- a/config/crd/patches/webhook_in_solrclouds.yaml
+++ b/config/crd/patches/webhook_in_solrclouds.yaml
@@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: solrclouds.solr.bloomberg.com
+ name: solrclouds.solr.apache.org
spec:
conversion:
strategy: Webhook
diff --git a/config/crd/patches/webhook_in_solrcollectionaliases.yaml b/config/crd/patches/webhook_in_solrcollectionaliases.yaml
index bf6ead9..818f107 100644
--- a/config/crd/patches/webhook_in_solrcollectionaliases.yaml
+++ b/config/crd/patches/webhook_in_solrcollectionaliases.yaml
@@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: solrcollectionaliases.solr.bloomberg.com
+ name: solrcollectionaliases.solr.apache.org
spec:
conversion:
strategy: Webhook
diff --git a/config/crd/patches/webhook_in_solrcollections.yaml b/config/crd/patches/webhook_in_solrcollections.yaml
index 4cea537..ebd94ea 100644
--- a/config/crd/patches/webhook_in_solrcollections.yaml
+++ b/config/crd/patches/webhook_in_solrcollections.yaml
@@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: solrcollections.solr.bloomberg.com
+ name: solrcollections.solr.apache.org
spec:
conversion:
strategy: Webhook
diff --git a/config/crd/patches/webhook_in_solrprometheusexporters.yaml b/config/crd/patches/webhook_in_solrprometheusexporters.yaml
index 96a8bfc..e7ee9f9 100644
--- a/config/crd/patches/webhook_in_solrprometheusexporters.yaml
+++ b/config/crd/patches/webhook_in_solrprometheusexporters.yaml
@@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: solrprometheusexporters.solr.bloomberg.com
+ name: solrprometheusexporters.solr.apache.org
spec:
conversion:
strategy: Webhook
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 2df23ce..aedf4d0 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -155,7 +155,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrbackups
verbs:
@@ -167,7 +167,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrbackups/status
verbs:
@@ -175,7 +175,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcloud
verbs:
@@ -183,13 +183,13 @@ rules:
- list
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcloud/status
verbs:
- get
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrclouds
verbs:
@@ -201,7 +201,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrclouds/status
verbs:
@@ -209,7 +209,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollectionaliases
verbs:
@@ -221,7 +221,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollectionaliases/status
verbs:
@@ -229,7 +229,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollections
verbs:
@@ -241,7 +241,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollections/status
verbs:
@@ -249,7 +249,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrprometheusexporters
verbs:
@@ -261,7 +261,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrprometheusexporters/status
verbs:
diff --git a/controllers/solrbackup_controller.go b/controllers/solrbackup_controller.go
index aeee074..09accfe 100644
--- a/controllers/solrbackup_controller.go
+++ b/controllers/solrbackup_controller.go
@@ -49,10 +49,10 @@ type SolrBackupReconciler struct {
// +kubebuilder:rbac:groups="",resources=pods/exec,verbs=create
// +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=batch,resources=jobs/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds,verbs=get;list;watch
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds/status,verbs=get
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrbackups,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrbackups/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds,verbs=get;list;watch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/status,verbs=get
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrbackups,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrbackups/status,verbs=get;update;patch
func (r *SolrBackupReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = context.Background()
diff --git a/controllers/solrcloud_controller.go b/controllers/solrcloud_controller.go
index de4a776..9245deb 100644
--- a/controllers/solrcloud_controller.go
+++ b/controllers/solrcloud_controller.go
@@ -72,8 +72,8 @@ func UseZkCRD(useCRD bool) {
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups="",resources=configmaps/status,verbs=get;update;patch
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=zookeeper.pravega.io,resources=zookeeperclusters,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=zookeeper.pravega.io,resources=zookeeperclusters/status,verbs=get;update;patch
diff --git a/controllers/solrcollection_controller.go b/controllers/solrcollection_controller.go
index c8853a9..9f05470 100644
--- a/controllers/solrcollection_controller.go
+++ b/controllers/solrcollection_controller.go
@@ -42,8 +42,8 @@ type SolrCollectionReconciler struct {
Log logr.Logger
}
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcollections,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcollections/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcollections,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcollections/status,verbs=get;update;patch
func (r *SolrCollectionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = context.Background()
diff --git a/controllers/solrcollectionalias_controller.go b/controllers/solrcollectionalias_controller.go
index 2eafc3a..8bf60f3 100644
--- a/controllers/solrcollectionalias_controller.go
+++ b/controllers/solrcollectionalias_controller.go
@@ -42,10 +42,10 @@ type SolrCollectionAliasReconciler struct {
Scheme *runtime.Scheme
}
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcollectionaliases,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcollectionaliases/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcloud,verbs=get;list;watch
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrcloud/status,verbs=get
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcollectionaliases,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcollectionaliases/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcloud,verbs=get;list;watch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrcloud/status,verbs=get
func (r *SolrCollectionAliasReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = context.Background()
diff --git a/controllers/solrprometheusexporter_controller.go b/controllers/solrprometheusexporter_controller.go
index a453bc6..68374b8 100644
--- a/controllers/solrprometheusexporter_controller.go
+++ b/controllers/solrprometheusexporter_controller.go
@@ -53,10 +53,10 @@ type SolrPrometheusExporterReconciler struct {
// +kubebuilder:rbac:groups=,resources=services/status,verbs=get
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=apps,resources=deployments/status,verbs=get
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds,verbs=get;list;watch
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrclouds/status,verbs=get
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrprometheusexporters,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.bloomberg.com,resources=solrprometheusexporters/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds,verbs=get;list;watch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/status,verbs=get
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrprometheusexporters,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrprometheusexporters/status,verbs=get;update;patch
func (r *SolrPrometheusExporterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = context.Background()
diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md
index 972211c..19c85c1 100644
--- a/docs/local_tutorial.md
+++ b/docs/local_tutorial.md
@@ -74,8 +74,8 @@ $ helm repo add solr-operator https://apache.github.io/lucene-solr-operator/char
Next, install the Solr Operator chart. Note this is using Helm v3, in order to use Helm v2 please consult the [Helm Chart documentation](https://hub.helm.sh/charts/solr-operator/solr-operator).
```bash
-# Install the operator (specifying ingressBaseDomain to match our ingressController)
-$ helm install solr-operator solr-operator/solr-operator --set-string ingressBaseDomain=ing.local.domain
+# Install the operator
+$ helm install solr-operator solr-operator/solr-operator
```
After installing, you can check to see what lives in the cluster to make sure that the Solr and ZooKeeper operators have started correctly.
@@ -104,7 +104,7 @@ To start a Solr Cloud cluster, we will create a yaml that will tell the Solr Ope
```bash
# Create a spec for a 3-node cluster v8.3 with 300m RAM each:
cat <<EOF > solrCloud-example.yaml
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example
@@ -113,6 +113,10 @@ spec:
solrImage:
tag: "8.3"
solrJavaMem: "-Xms300m -Xmx300m"
+ solrAddressability:
+ external:
+ method: Ingress
+ domainName: "ing.local.domain"
EOF
# Install Solr from that spec
@@ -134,7 +138,7 @@ We'll use the Operator's built in collection creation option
```bash
# Create the spec
cat <<EOF > collection.yaml
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: mycoll
@@ -192,7 +196,7 @@ curl -s http://default-example-solrcloud.ing.local.domain/solr/admin/info/system
# Update the solrCloud configuratin with the new version, keeping 5 nodes
cat <<EOF > solrCloud-example.yaml
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example
diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md
index a724ab4..8e11cf8 100644
--- a/docs/running-the-operator.md
+++ b/docs/running-the-operator.md
@@ -66,8 +66,5 @@ In order to run the Solr Operator, you will only need the Slim Image.
Required to use the `ProvidedZookeeper.Zookeeper` option within the Spec.
If _true_, then a Zookeeper Operator must be running for the cluster.
( _true_ | _false_ , defaults to _false_)
-* **-ingress-base-domain** If you desire to make solr externally addressable via ingresses, a base ingress domain is required.
- Solr Clouds will be created with ingress rules at `*.(ingress-base-domain)`.
- ( _optional_ , e.g. `ing.base.domain` )
\ No newline at end of file
diff --git a/docs/solr-cloud/README.md b/docs/solr-cloud/README.md
index 582f260..6c2cf8b 100644
--- a/docs/solr-cloud/README.md
+++ b/docs/solr-cloud/README.md
@@ -22,7 +22,7 @@ Create an example Solr cloud, with the following configuration.
```bash
$ cat example/test_solrcloud.yaml
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example
@@ -90,7 +90,7 @@ The solr-operator supports private Docker repo access for Solr images you may wa
Using a private image requires you have a K8s secret preconfigured with appropriate access to the image. (type: kubernetes.io/dockerconfigjson)
```
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example-private-repo-solr-image
diff --git a/docs/solr-cloud/dependencies.md b/docs/solr-cloud/dependencies.md
index 66d9499..3b21ee4 100644
--- a/docs/solr-cloud/dependencies.md
+++ b/docs/solr-cloud/dependencies.md
@@ -44,5 +44,5 @@ NAME HOSTS
ingress.extensions/example-solrcloud-common default-example-solrcloud.test.domain,default-example-solrcloud-0.test.domain + 3 more... 80 2d2h
NAME VERSION DESIREDNODES NODES READYNODES AGE
-solrcloud.solr.bloomberg.com/example 8.1.1 4 4 4 47h
+solrcloud.solr.apache.org/example 8.1.1 4 4 4 47h
```
\ No newline at end of file
diff --git a/docs/solr-collection-alias/README.md b/docs/solr-collection-alias/README.md
index 708cddd..c5613ed 100644
--- a/docs/solr-collection-alias/README.md
+++ b/docs/solr-collection-alias/README.md
@@ -3,7 +3,7 @@
The solr-operator supports the full lifecycle of standard aliases. Here is an example pointing an alias to 2 collections
```
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollectionAlias
metadata:
name: collection-alias-example
diff --git a/docs/solr-collection/README.md b/docs/solr-collection/README.md
index 5207191..5372e86 100644
--- a/docs/solr-collection/README.md
+++ b/docs/solr-collection/README.md
@@ -9,7 +9,7 @@ Create an example set of collections against on the "example" solr cloud
```bash
$ cat example/test_solrcollection.yaml
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-1
@@ -23,7 +23,7 @@ spec:
maxShardsPerNode: 1
collectionConfigName: "_default"
---
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-2-compositeid-autoadd
@@ -37,7 +37,7 @@ spec:
maxShardsPerNode: 1
collectionConfigName: "_default"
---
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-3-implicit
diff --git a/example/test_solrbackup.yaml b/example/test_solrbackup.yaml
index 534eef8..19937bc 100644
--- a/example/test_solrbackup.yaml
+++ b/example/test_solrbackup.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrBackup
metadata:
name: solrbackup-test
diff --git a/example/test_solrcloud.yaml b/example/test_solrcloud.yaml
index 40c2ce7..b3c5f9d 100644
--- a/example/test_solrcloud.yaml
+++ b/example/test_solrcloud.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example
diff --git a/example/test_solrcloud_addressability.yaml b/example/test_solrcloud_addressability.yaml
index c57bfc3..eee76ce 100644
--- a/example/test_solrcloud_addressability.yaml
+++ b/example/test_solrcloud_addressability.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: ingress-cloud
@@ -19,7 +19,7 @@ spec:
nodePortOverride: 80
---
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: external-dns-cloud
diff --git a/example/test_solrcloud_private_repo.yaml b/example/test_solrcloud_private_repo.yaml
index 0101722..d05a0d1 100644
--- a/example/test_solrcloud_private_repo.yaml
+++ b/example/test_solrcloud_private_repo.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example-private-repo-solr-image
diff --git a/example/test_solrcloud_toleration_example.yaml b/example/test_solrcloud_toleration_example.yaml
index 03b98ae..3d893d4 100644
--- a/example/test_solrcloud_toleration_example.yaml
+++ b/example/test_solrcloud_toleration_example.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCloud
metadata:
name: example-with-tolerations
diff --git a/example/test_solrcollection.yaml b/example/test_solrcollection.yaml
index 414a606..39acbff 100644
--- a/example/test_solrcollection.yaml
+++ b/example/test_solrcollection.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-1
@@ -12,7 +12,7 @@ spec:
maxShardsPerNode: 1
collectionConfigName: "_default"
---
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-2-compositeid-autoadd
@@ -26,7 +26,7 @@ spec:
maxShardsPerNode: 1
collectionConfigName: "_default"
---
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollection
metadata:
name: example-collection-3-implicit
diff --git a/example/test_solrcollection_alias.yaml b/example/test_solrcollection_alias.yaml
index 32012ee..ae39d15 100644
--- a/example/test_solrcollection_alias.yaml
+++ b/example/test_solrcollection_alias.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrCollectionAlias
metadata:
name: collection-alias-example
diff --git a/example/test_solrprometheusexporter.yaml b/example/test_solrprometheusexporter.yaml
index aaa7911..81a2653 100644
--- a/example/test_solrprometheusexporter.yaml
+++ b/example/test_solrprometheusexporter.yaml
@@ -1,4 +1,4 @@
-apiVersion: solr.bloomberg.com/v1beta1
+apiVersion: solr.apache.org/v1beta1
kind: SolrPrometheusExporter
metadata:
name: solrprometheusexporter-sample
diff --git a/helm/solr-operator/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml
index 0366b7a..3d579e2 100644
--- a/helm/solr-operator/crds/crds.yaml
+++ b/helm/solr-operator/crds/crds.yaml
@@ -4,9 +4,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrbackups.solr.bloomberg.com
+ name: solrbackups.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrBackup
listKind: SolrBackupList
@@ -1132,9 +1132,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrclouds.solr.bloomberg.com
+ name: solrclouds.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCloud
listKind: SolrCloudList
@@ -6366,9 +6366,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrcollectionaliases.solr.bloomberg.com
+ name: solrcollectionaliases.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCollectionAlias
listKind: SolrCollectionAliasList
@@ -6440,9 +6440,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrcollections.solr.bloomberg.com
+ name: solrcollections.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrCollection
listKind: SolrCollectionList
@@ -6537,9 +6537,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
- name: solrprometheusexporters.solr.bloomberg.com
+ name: solrprometheusexporters.solr.apache.org
spec:
- group: solr.bloomberg.com
+ group: solr.apache.org
names:
kind: SolrPrometheusExporter
listKind: SolrPrometheusExporterList
diff --git a/helm/solr-operator/templates/role.yaml b/helm/solr-operator/templates/role.yaml
index c00c6cd..75cce8b 100644
--- a/helm/solr-operator/templates/role.yaml
+++ b/helm/solr-operator/templates/role.yaml
@@ -158,7 +158,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrbackups
verbs:
@@ -170,7 +170,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrbackups/status
verbs:
@@ -178,7 +178,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcloud
verbs:
@@ -186,13 +186,13 @@ rules:
- list
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcloud/status
verbs:
- get
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrclouds
verbs:
@@ -204,7 +204,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrclouds/status
verbs:
@@ -212,7 +212,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollectionaliases
verbs:
@@ -224,7 +224,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollectionaliases/status
verbs:
@@ -232,7 +232,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollections
verbs:
@@ -244,7 +244,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrcollections/status
verbs:
@@ -252,7 +252,7 @@ rules:
- patch
- update
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrprometheusexporters
verbs:
@@ -264,7 +264,7 @@ rules:
- update
- watch
- apiGroups:
- - solr.bloomberg.com
+ - solr.apache.org
resources:
- solrprometheusexporters/status
verbs: