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/28 18:46:17 UTC
[lucene-solr-operator] branch main updated: Change docker image
location to apache/ (#199)
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 b6e8970 Change docker image location to apache/ (#199)
b6e8970 is described below
commit b6e897048ec06a455e19a5c1ba9b8554fa174cf0
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Jan 28 13:46:05 2021 -0500
Change docker image location to apache/ (#199)
---
Makefile | 4 ++--
config/manager/manager.yaml | 2 +-
docs/development.md | 2 +-
docs/local_tutorial.md | 4 ++--
docs/running-the-operator.md | 2 +-
hack/release/update_versions.sh | 2 +-
helm/solr-operator/README.md | 2 +-
helm/solr-operator/values.yaml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 9fb2f68..b7e54a3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CRD_OPTIONS ?= "crd"
# Image URL to use all building/pushing image targets
NAME ?= solr-operator
-NAMESPACE ?= bloomberg/
+NAMESPACE ?= apache/
IMG = $(NAMESPACE)$(NAME)
VERSION ?= $(or $(shell git describe --tags HEAD),"latest")
GIT_SHA = $(shell git rev-parse --short HEAD)
@@ -61,7 +61,7 @@ install: manifests
# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
deploy: manifests install
- cd config/manager && touch kustomization.yaml && kustomize edit add resource manager.yaml && kustomize edit set image bloomberg/solr-operator=${IMG}:${VERSION}
+ cd config/manager && touch kustomization.yaml && kustomize edit add resource manager.yaml && kustomize edit set image apache/solr-operator=${IMG}:${VERSION}
kubectl apply -k config/default
# Generate code
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 113a173..4031f95 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -19,7 +19,7 @@ spec:
containers:
- args:
- -zk-operator=true
- image: bloomberg/solr-operator:latest
+ image: apache/solr-operator:latest
imagePullPolicy: IfNotPresent
name: solr-operator
env:
diff --git a/docs/development.md b/docs/development.md
index 3bf51c5..b937d68 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -83,7 +83,7 @@ $ NAMESPACE=your-namespace/ make docker-vendor-build docker-vendor-push
```
You can control the namespace and version for your solr-operator docker image via the ENV variables:
-- `NAMESPACE`, defaults to `bloomberg/`. **This must end with a forward slash.** This can also include the docker repository information for private repos.
+- `NAMESPACE`, defaults to `apache/`. **This must end with a forward slash.** This can also include the docker repository information for private repos.
- `NAME`, defaults to `solr-operator`.
- `VERSION`, defaults to the git HEAD tag. (e.g. `v0.2.5-1-g06f4e2a`).
You can check what version you are using by running `make version`.
diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md
index 8cd5925..77d2cca 100644
--- a/docs/local_tutorial.md
+++ b/docs/local_tutorial.md
@@ -5,8 +5,8 @@ This tutorial shows how to setup Solr under Kubernetes on your local mac. The pl
1. [Setup Kubernetes and Dependencies](#setup-kubernetes-and-dependencies)
1. [Setup Docker for Mac with K8S](#setup-docker-for-mac-with-k8s)
2. [Install an Ingress Controller to reach the cluster on localhost](#install-an-ingress-controller)
- 3. [Install Solr Operator](#install-solr-operator)
- 4. [Start your Solr cluster](#start-your-solr-cluster)
+ 3. [Install Solr Operator](#install-the-solr-operator)
+ 4. [Start your Solr cluster](#start-an-example-solr-cloud-cluster)
5. [Create a collection and index some documents](#create-a-collection-and-index-some-documents)
6. [Scale from 3 to 5 nodes](#scale-from-3-to-5-nodes)
7. [Upgrade to newer Solr version](#upgrade-to-newer-version)
diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md
index 40255dc..d1e62a2 100644
--- a/docs/running-the-operator.md
+++ b/docs/running-the-operator.md
@@ -54,7 +54,7 @@ After inspecting the status of you Kube cluster, you should see a deployment for
## Solr Operator Docker Images
-Two Docker images are published to [DockerHub](https://hub.docker.com/r/bloomberg/solr-operator), both based off of the same base image.
+Two Docker images are published to [DockerHub](https://hub.docker.com/r/apache/solr-operator), both based off of the same base image.
- [Builder Image](build/Dockerfile.build) - Downloads gomod dependencies, builds operator executable (This is not published, only used to build the following images)
- [Slim Image](build/Dockerfile.slim) - Contains only the operator executable, with the operator as the entry point
diff --git a/hack/release/update_versions.sh b/hack/release/update_versions.sh
index dcd1a87..48655a3 100755
--- a/hack/release/update_versions.sh
+++ b/hack/release/update_versions.sh
@@ -9,7 +9,7 @@ set -u
echo "Updating the latest version throughout the repo to: ${VERSION}"
# Update default solr-operator version and the helm chart versions.
-gawk -i inplace '$1 == "repository:" { tag = ($2 == "bloomberg/solr-operator") }
+gawk -i inplace '$1 == "repository:" { tag = ($2 == "apache/solr-operator") }
tag && $1 == "tag:"{$1 = " " $1; $2 = "'"${VERSION}"'"} 1' helm/solr-operator/values.yaml
gawk -i inplace '$1 == "version:"{$1 = $1; $2 = "'"${VERSION#v}"'"} 1' helm/solr-operator/Chart.yaml
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index b9d6555..c744294 100644
--- a/helm/solr-operator/README.md
+++ b/helm/solr-operator/README.md
@@ -126,7 +126,7 @@ The command removes all the Kubernetes components associated with the chart and
| Key | Type | Default | Description |
|-----|------|---------|-------------|
-| image.repository | string | `"bloomberg/solr-operator"` | The repository of the Solr Operator image |
+| image.repository | string | `"apache/solr-operator"` | The repository of the Solr Operator image |
| image.tag | string | `"v0.2.8"` | The tag/version of the Solr Operator to run |
| image.pullPolicy | string | `"Always"` | |
| fullnameOverride | string | `""` | A custom name for the Solr Operator Deployment |
diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml
index f8f7ccc..7692f41 100644
--- a/helm/solr-operator/values.yaml
+++ b/helm/solr-operator/values.yaml
@@ -20,7 +20,7 @@
replicaCount: 1
image:
- repository: bloomberg/solr-operator
+ repository: apache/solr-operator
tag: v0.2.8
pullPolicy: Always