Rename Gerrit slave to Gerrit replica
Issue: 13046
Change-Id: Idf01486d67c05da676b31edeebc8d1166484e443
diff --git a/Documentation/minikube.md b/Documentation/minikube.md
index 1229bf3..62ca54a 100644
--- a/Documentation/minikube.md
+++ b/Documentation/minikube.md
@@ -4,7 +4,7 @@
Minikube. Minikube provides basic Kubernetes functionality and allows to quickly
deploy and evaluate a Kubernetes deployment.
This tutorial will guide through setting up Minikube to deploy the gerrit-
-master and gerrit-slave helm charts to it. Note, that due to limited compute
+master and gerrit-replica helm charts to it. Note, that due to limited compute
resources on a single local machine and the restricted functionality of Minikube,
the full functionality of the charts might not be usable.
@@ -49,7 +49,7 @@
minikube config set vm-driver hyperkit
```
-The gerrit-master and gerrit-slave charts are configured to work with the default
+The gerrit-master and gerrit-replica charts are configured to work with the default
resource limits configured for minikube (2 cpus and 2Gi RAM). If more resources
are desired (e.g. to speed up deployment startup or for more resource intensive
tests), configure the resource limits using:
@@ -59,7 +59,7 @@
minikube config set cpus 4
```
-To install a full Gerrit master and Gerrit slave setup with reasonable startup
+To install a full Gerrit master and Gerrit replica setup with reasonable startup
times, Minikube will need about 9.5 GB of RAM and 3-4 CPUs! But the more the
better.
@@ -94,7 +94,7 @@
of all the hostnames:
```sh
-echo "$(minikube ip) master.gerrit backend.gerrit slave.gerrit" | sudo tee -a /etc/hosts
+echo "$(minikube ip) master.gerrit backend.gerrit replica.gerrit" | sudo tee -a /etc/hosts
```
The host names (e.g. `master.gerrit`) are the defaults, when using the values.yaml
@@ -168,26 +168,26 @@
open http://master.gerrit
```
-## Installing the gerrit-slave helm chart
+## Installing the gerrit-replica helm chart
-A custom configuration file to configure the gerrit-slave chart is provided at
-`./supplements/gerrit-slave.minikube.values.yaml`. Install it by running:
+A custom configuration file to configure the gerrit-replica chart is provided at
+`./supplements/gerrit-replica.minikube.values.yaml`. Install it by running:
```sh
-helm install gerrit-slave \
- ./helm-charts/gerrit-slave \
- -f ./supplements/gerrit-slave.minikube.values.yaml
+helm install gerrit-replica \
+ ./helm-charts/gerrit-replica \
+ -f ./supplements/gerrit-replica.minikube.values.yaml
```
-The slave will start up, which can be followed by running:
+The replica will start up, which can be followed by running:
```sh
-kubectl logs -f gerrit-slave-gerrit-slave-deployment-<id>
+kubectl logs -f gerrit-replica-gerrit-replica-deployment-<id>
```
Replication of repositories has to be started on the Gerrit master, e.g. by making
a change in the respective repositories. Only then previous changes to the
-repositories will be available on the slave.
+repositories will be available on the replica.
## Cleanup
diff --git a/README.md b/README.md
index a128319..56c32f1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
# Docker images
-Images to run a Gerrit master and slave setup based on the 3.1.7 Gerrit release.
+Images to run a Gerrit master and Gerrit replica setup based on the 3.1.7 Gerrit release.
## Building images
@@ -20,7 +20,7 @@
Multiple images can be specified at once:
```
-./build gerrit-slave git-gc
+./build gerrit-replica git-gc
```
The build-script usually uses the `latest`-tag to tag the images. By using the
@@ -60,7 +60,7 @@
```
The `<component-name>` is one of: `apache-git-http-backend`, `git-gc`,
-`gerrit-slave`.
+`gerrit-replica`.
Adding the `--update-latest`-flag will also update the images tagged `latest` in
the repository:
@@ -89,7 +89,7 @@
# Helm Charts
These Helm charts can be used to install a Gerrit cluster consisting of a
-Gerrit master and a Gerrit slave on a Kubernetes cluster. A helm version newer
+Gerrit master and a Gerrit replica on a Kubernetes cluster. A helm version newer
than 3.0 is required to follow the instructions provided with the helm charts.
To evaluate and test the helm-charts, they can be installed on a local machine
@@ -109,9 +109,9 @@
* Install a [Gerrit master](helm-charts/gerrit-master/README.md)
-## Gerrit Slave
+## Gerrit Replica
-* Install a [Gerrit slave](helm-charts/gerrit-slave/README.md)
+* Install a [Gerrit replica](helm-charts/gerrit-replica/README.md)
# Running tests
diff --git a/build b/build
index aeea82f..693e5c9 100755
--- a/build
+++ b/build
@@ -63,7 +63,7 @@
if test $# -eq 0 ; then
docker_build_gerrit_base
- for IMAGE in apache-git-http-backend gerrit-master gerrit-slave git-gc gerrit-init; do
+ for IMAGE in apache-git-http-backend gerrit-master gerrit-replica git-gc gerrit-init; do
docker_build $IMAGE
done
else
diff --git a/container-images/apache-git-http-backend/README.md b/container-images/apache-git-http-backend/README.md
index 1284648..01bbfb1 100644
--- a/container-images/apache-git-http-backend/README.md
+++ b/container-images/apache-git-http-backend/README.md
@@ -1,7 +1,7 @@
# apache-git-http-backend
The apache-git-http-backend docker image serves as receiver in git replication
-from a Gerrit master to a Gerrit slave.
+from a Gerrit master to a Gerrit replica.
## Content
@@ -11,7 +11,7 @@
* git (via base image) and git-deamon for git-http-backend
* `tools/create_repo.sh`: cgi script to enable remote creation of new git
repository over http. This is triggered by the Gerrit replication plugin
- if a new repository on the Gerrit master does not yet exist in a Gerrit slave,
+ if a new repository on the Gerrit master does not yet exist in a Gerrit replica,
a corresponding
[change for the replication plugin](https://gerrit-review.googlesource.com/c/plugins/replication/+/199900)
enabling repository creation via http is still in review for master and will be
diff --git a/container-images/gerrit-base/README.md b/container-images/gerrit-base/README.md
index dfad4d4..16ac57e 100644
--- a/container-images/gerrit-base/README.md
+++ b/container-images/gerrit-base/README.md
@@ -1,6 +1,6 @@
# Gerrit base image
-Gerrit base image for Gerrit master and Gerrit slave images.
+Gerrit base image for Gerrit master and Gerrit replica images.
It is only used in the build process and not published on Dockerhub.
## Content
diff --git a/container-images/gerrit-init/README.md b/container-images/gerrit-init/README.md
index 4cf03f7..3f92f43 100644
--- a/container-images/gerrit-init/README.md
+++ b/container-images/gerrit-init/README.md
@@ -1,4 +1,4 @@
-# Gerrit slave init container image
+# Gerrit replica init container image
Kubernetes init container for initializing gerrit. The python script running in
the container initializes Gerrit including the installation of configured
diff --git a/container-images/gerrit-init/tools/gerrit_init.py b/container-images/gerrit-init/tools/gerrit_init.py
index bef04c8..538c9a9 100755
--- a/container-images/gerrit-init/tools/gerrit_init.py
+++ b/container-images/gerrit-init/tools/gerrit_init.py
@@ -35,7 +35,7 @@
self.plugin_installer = get_installer(self.site, self.config)
self.gerrit_config = self._parse_gerrit_config()
- self.is_slave = self._is_slave()
+ self.is_replica = self._is_replica()
self.installed_plugins = self._get_installed_plugins()
def _parse_gerrit_config(self):
@@ -46,9 +46,9 @@
return None
- def _is_slave(self):
+ def _is_replica(self):
if self.gerrit_config:
- return self.gerrit_config.get_boolean("container.slave", False)
+ return self.gerrit_config.get_boolean("container.replica", False)
return False
@@ -124,7 +124,7 @@
flags = "--no-auto-start --batch"
- if self.is_slave:
+ if self.is_replica:
flags += " --no-reindex"
command = "java -jar /var/war/gerrit.war init %s %s -d %s" % (
diff --git a/container-images/gerrit-replica/Dockerfile b/container-images/gerrit-replica/Dockerfile
new file mode 100644
index 0000000..d69b770
--- /dev/null
+++ b/container-images/gerrit-replica/Dockerfile
@@ -0,0 +1,6 @@
+FROM gerrit-base:latest
+
+COPY tools/* /var/tools/
+
+# Configure Gerrit as replica
+RUN git config -f /var/gerrit/etc/gerrit.config container.replica true
diff --git a/container-images/gerrit-slave/README.md b/container-images/gerrit-replica/README.md
similarity index 76%
rename from container-images/gerrit-slave/README.md
rename to container-images/gerrit-replica/README.md
index d78c2c9..b9ed7a0 100644
--- a/container-images/gerrit-slave/README.md
+++ b/container-images/gerrit-replica/README.md
@@ -1,6 +1,6 @@
-# Gerrit slave image
+# Gerrit replica image
-Image for Gerrit slave
+Image for Gerrit replica
## Content
@@ -9,7 +9,7 @@
## Setup and configuration
* copy entrypoint scripts to image
-* ensure gerrit is configured as gerrit slave
+* ensure gerrit is configured as gerrit replica
## Start
diff --git a/container-images/gerrit-slave/tools/start b/container-images/gerrit-replica/tools/start
similarity index 97%
rename from container-images/gerrit-slave/tools/start
rename to container-images/gerrit-replica/tools/start
index 21e8268..9dfb11c 100755
--- a/container-images/gerrit-slave/tools/start
+++ b/container-images/gerrit-replica/tools/start
@@ -18,6 +18,6 @@
java ${JAVA_OPTIONS} -jar /var/gerrit/bin/gerrit.war daemon \
-d /var/gerrit \
--enable-httpd \
- --slave &
+ --replica &
tail -F -n +1 /var/gerrit/logs/error_log
diff --git a/container-images/gerrit-slave/Dockerfile b/container-images/gerrit-slave/Dockerfile
deleted file mode 100644
index 01cb993..0000000
--- a/container-images/gerrit-slave/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM gerrit-base:latest
-
-COPY tools/* /var/tools/
-
-# Configure Gerrit as slave
-RUN git config -f /var/gerrit/etc/gerrit.config container.slave true
diff --git a/helm-charts/gerrit-master/Chart.yaml b/helm-charts/gerrit-master/Chart.yaml
index 1cfeab8..af01037 100644
--- a/helm-charts/gerrit-master/Chart.yaml
+++ b/helm-charts/gerrit-master/Chart.yaml
@@ -18,7 +18,7 @@
email: sasa.zivkov@sap.com
- name: Christian Halstrick
email: christian.halstrick@sap.com
-home: https://gerrit.googlesource.com/k8s-gerrit/+/master/helm-charts/gerrit-slave
+home: https://gerrit.googlesource.com/k8s-gerrit/+/master/helm-charts/gerrit-replica
icon: http://commondatastorage.googleapis.com/gerrit-static/diffy-w200.png
sources:
- https://gerrit.googlesource.com/k8s-gerrit/+/master/
diff --git a/helm-charts/gerrit-master/values.yaml b/helm-charts/gerrit-master/values.yaml
index 85abf91..bd0f9ca 100644
--- a/helm-charts/gerrit-master/values.yaml
+++ b/helm-charts/gerrit-master/values.yaml
@@ -185,13 +185,13 @@
javaOptions = -Xmx4g
secure: |-
- # Password for the keystore added as value for 'gerritSlave.keystore'
+ # Password for the keystore added as value for 'gerritReplica.keystore'
# Only needed, if SSL is enabled.
#[httpd]
# sslKeyPassword = gerrit
# Credentials for replication targets
- # [remote "slave"]
+ # [remote "replica"]
# username = git
# password = secret
@@ -201,7 +201,7 @@
replicateOnStartup = true
defaultForceUpdate = true
- # [remote "slave"]
- # url = http://gerrit-slave.example.com/git/${name}.git
+ # [remote "replica"]
+ # url = http://gerrit-replica.example.com/git/${name}.git
# replicationDelay = 0
# timeout = 30
diff --git a/helm-charts/gerrit-slave/.helmignore b/helm-charts/gerrit-replica/.helmignore
similarity index 100%
rename from helm-charts/gerrit-slave/.helmignore
rename to helm-charts/gerrit-replica/.helmignore
diff --git a/helm-charts/gerrit-slave/Chart.yaml b/helm-charts/gerrit-replica/Chart.yaml
similarity index 83%
rename from helm-charts/gerrit-slave/Chart.yaml
rename to helm-charts/gerrit-replica/Chart.yaml
index 448bbb8..944978b 100644
--- a/helm-charts/gerrit-slave/Chart.yaml
+++ b/helm-charts/gerrit-replica/Chart.yaml
@@ -1,10 +1,10 @@
apiVersion: v2
appVersion: 3.1.7
description: |-
- The Gerrit slave serves as a read-only Gerrit instance to serve repositories
+ The Gerrit replica serves as a read-only Gerrit instance to serve repositories
that it receives from a Gerrit master instance via replication. It can be
used to reduce the load on Gerrit master instances.
-name: gerrit-slave
+name: gerrit-replica
version: 0.2.0
maintainers:
- name: Thomas Draebing
@@ -15,7 +15,7 @@
email: sasa.zivkov@sap.com
- name: Christian Halstrick
email: christian.halstrick@sap.com
-home: https://gerrit.googlesource.com/k8s-gerrit/+/master/helm-charts/gerrit-slave
+home: https://gerrit.googlesource.com/k8s-gerrit/+/master/helm-charts/gerrit-replica
icon: http://commondatastorage.googleapis.com/gerrit-static/diffy-w200.png
sources:
- https://gerrit.googlesource.com/k8s-gerrit/+/master
diff --git a/helm-charts/gerrit-slave/LICENSE b/helm-charts/gerrit-replica/LICENSE
similarity index 100%
rename from helm-charts/gerrit-slave/LICENSE
rename to helm-charts/gerrit-replica/LICENSE
diff --git a/helm-charts/gerrit-slave/README.md b/helm-charts/gerrit-replica/README.md
similarity index 71%
rename from helm-charts/gerrit-slave/README.md
rename to helm-charts/gerrit-replica/README.md
index 32d0fee..a3ff603 100644
--- a/helm-charts/gerrit-slave/README.md
+++ b/helm-charts/gerrit-replica/README.md
@@ -1,14 +1,14 @@
-# Gerrit slave on Kubernetes
+# Gerrit replica on Kubernetes
Gerrit is a web-based code review tool, which acts as a Git server. On large setups
Gerrit servers can see a sizable amount of traffic from git operations performed by
developers and build servers. The major part of requests are read-only requests
(e.g. by `git fetch` operations). To take some load of the Gerrit master server,
-Gerrit slaves can be deployed to serve read-only requests.
+Gerrit replicas can be deployed to serve read-only requests.
-This helm chart provides a Gerrit slave setup that can be deployed on Kubernetes.
-The Gerrit slave is capable of receiving replicated git repositories from a
-Gerrit master. The Gerrit slave can then serve authenticated read-only requests.
+This helm chart provides a Gerrit replica setup that can be deployed on Kubernetes.
+The Gerrit replica is capable of receiving replicated git repositories from a
+Gerrit master. The Gerrit replica can then serve authenticated read-only requests.
***note
Gerrit versions before 3.0 are no longer supported, since the support of ReviewDB
@@ -30,7 +30,7 @@
This project was developed using the
[NFS-server-provisioner helm chart](https://github.com/helm/charts/tree/master/stable/nfs-server-provisioner),
a NFS-provisioner deployed in the Kubernetes cluster itself. Refer to
- [this guide](/helm-charts/gerrit-slave/docs/nfs-provisioner.md) of how to
+ [this guide](/helm-charts/gerrit-replica/docs/nfs-provisioner.md) of how to
deploy it in context of this project.
- A domain name that is configured to point to the IP address of the node running
@@ -44,44 +44,44 @@
## Installing the Chart
***note
-**ATTENTION:** The value for `gerritSlave.ingress.host` is required for rendering
+**ATTENTION:** The value for `gerritReplica.ingress.host` is required for rendering
the chart's templates. The nature of the value does not allow defaults.
Thus a custom `values.yaml`-file setting this value is required!
***
-To install the chart with the release name `gerrit-slave`, execute:
+To install the chart with the release name `gerrit-replica`, execute:
```sh
cd $(git rev-parse --show-toplevel)/helm-charts
helm install \
- gerrit-slave \ # release name
- ./gerrit-slave \ # path to chart
+ gerrit-replica \ # release name
+ ./gerrit-replica \ # path to chart
-f <path-to-custom-values>.yaml
```
-The command deploys the Gerrit slave on the current Kubernetes cluster. The
+The command deploys the Gerrit replica on the current Kubernetes cluster. The
[configuration section](#Configuration) lists the parameters that can be
configured during installation.
-The Gerrit slave requires the replicated `All-Projects.git`- and `All-Users.git`-
+The Gerrit replica requires the replicated `All-Projects.git`- and `All-Users.git`-
repositories to be present in the `/var/gerrit/git`-directory. The `gerrit-init`-
InitContainer will wait for this being the case. A way to do this is to access
-the Gerrit slave pod and to clone the repositories from the Gerrit master (Make
+the Gerrit replica pod and to clone the repositories from the Gerrit master (Make
sure that you have the correct access rights do so.):
```sh
-kubectl exec -it <gerrit-slave-pod> -c gerrit-init ash
-gerrit@<gerrit-slave-pod>:/var/tools$ cd /var/gerrit/git
-gerrit@<gerrit-slave-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Projects" --mirror
+kubectl exec -it <gerrit-replica-pod> -c gerrit-init ash
+gerrit@<gerrit-replica-pod>:/var/tools$ cd /var/gerrit/git
+gerrit@<gerrit-replica-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Projects" --mirror
Cloning into bare repository 'All-Projects.git'...
-gerrit@<gerrit-slave-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Users" --mirror
+gerrit@<gerrit-replica-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Users" --mirror
Cloning into bare repository 'All-Users.git'...
```
## Configuration
The following sections list the configurable values in `values.yaml`. To configure
-a Gerrit slave setup, make a copy of the `values.yaml`-file and change the
+a Gerrit replica setup, make a copy of the `values.yaml`-file and change the
parameters as needed. The configuration can be applied by installing the chart as
described [above](#Installing-the-chart).
@@ -90,8 +90,8 @@
```sh
cd $(git rev-parse --show-toplevel)/helm-charts
helm install \
- gerrit-slave \ # release name
- ./gerrit-slave \ # path to chart
+ gerrit-replica \ # release name
+ ./gerrit-replica \ # path to chart
--set=gitRepositoryStorage.size=100Gi,gitBackend.replicas=2
```
@@ -178,11 +178,11 @@
| `gitGC.logging.persistence.enabled` | Whether to persist logs | `true` |
| `gitGC.logging.persistence.size` | Storage size for persisted logs | `1Gi` |
-### Gerrit slave
+### Gerrit replica
***note
-The way the Jetty servlet used by Gerrit works, the Gerrit slave component of the
-gerrit-slave chart actually requires the URL to be known, when the chart is installed.
+The way the Jetty servlet used by Gerrit works, the Gerrit replica component of the
+gerrit-replica chart actually requires the URL to be known, when the chart is installed.
The suggested way to do that is to use the provided Ingress resource. This requires
that a URL is available and that the DNS is configured to point the URL to the
IP of the node the Ingress controller is running on!
@@ -190,43 +190,43 @@
***note
Setting the canonical web URL in the gerrit.config to the host used for the Ingress
-is mandatory, if access to the Gerrit slave is required!
+is mandatory, if access to the Gerrit replica is required!
***
-| Parameter | Description | Default |
-|---------------------------------------------|----------------------------------------------------------------------------------------------------------|-----------------------------------|
-| `gerritSlave.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` |
-| `gerritSlave.images.gerritSlave` | Image name of the Gerrit slave container image | `k8s-gerrit/gerrit-slave` |
-| `gerritSlave.replicas` | Number of pod replicas to deploy | `1` |
-| `gerritSlave.maxSurge` | Max. percentage or number of pods allowed to be scheduled above the desired number | `25%` |
-| `gerritSlave.maxUnavailable` | Max. percentage or number of pods allowed to be unavailable at a time | `100%` |
-| `gerritSlave.initializeTestSite.enabled` | Enable the initialization of a site. USE ONLY for testing, if you do not plan to replicate repositories. | `true` |
-| `gerritSlave.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
-| | | `requests.memory: 5Gi` |
-| | | `limits.cpu: 1` |
-| | | `limits.memory: 6Gi` |
-| `gerritSlave.persistence.enabled` | Whether to persist the Gerrit site | `true` |
-| `gerritSlave.persistence.size` | Storage size for persisted Gerrit site | `10Gi` |
-| `gerritSlave.service.type` | Which kind of Service to deploy | `NodePort` |
-| `gerritSlave.service.http.port` | Port over which to expose HTTP | `80` |
-| `gerritSlave.ingress.host` | REQUIRED: Host name to use for the Ingress (required for Ingress) | `nil` |
-| `gerritSlave.ingress.additionalAnnotations` | Additional annotations for the Ingress | `nil` |
-| `gerritSlave.ingress.tls.enabled` | Whether to enable TLS termination in the Ingress | `false` |
-| `gerritSlave.ingress.tls.cert` | Public SSL server certificate | `-----BEGIN CERTIFICATE-----` |
-| `gerritSlave.ingress.tls.key` | Private SSL server certificate | `-----BEGIN RSA PRIVATE KEY-----` |
-| `gerritSlave.keystore` | base64-encoded Java keystore (`cat keystore.jks | base64`) to be used by Gerrit, when using SSL | `nil` |
-| `gerritSlave.config.gerrit` | The contents of the gerrit.config | [see here](#Gerrit-config-files) |
-| `gerritSlave.config.secure` | The contents of the secure.config | [see here](#Gerrit-config-files) |
+| Parameter | Description | Default |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------|-----------------------------------|
+| `gerritReplica.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` |
+| `gerritReplica.images.gerritReplica` | Image name of the Gerrit replica container image | `k8s-gerrit/gerrit-replica` |
+| `gerritReplica.replicas` | Number of pod replicas to deploy | `1` |
+| `gerritReplica.maxSurge` | Max. percentage or number of pods allowed to be scheduled above the desired number | `25%` |
+| `gerritReplica.maxUnavailable` | Max. percentage or number of pods allowed to be unavailable at a time | `100%` |
+| `gerritReplica.initializeTestSite.enabled` | Enable the initialization of a site. USE ONLY for testing, if you do not plan to replicate repositories. | `true` |
+| `gerritReplica.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
+| | | `requests.memory: 5Gi` |
+| | | `limits.cpu: 1` |
+| | | `limits.memory: 6Gi` |
+| `gerritReplica.persistence.enabled` | Whether to persist the Gerrit site | `true` |
+| `gerritReplica.persistence.size` | Storage size for persisted Gerrit site | `10Gi` |
+| `gerritReplica.service.type` | Which kind of Service to deploy | `NodePort` |
+| `gerritReplica.service.http.port` | Port over which to expose HTTP | `80` |
+| `gerritReplica.ingress.host` | REQUIRED: Host name to use for the Ingress (required for Ingress) | `nil` |
+| `gerritReplica.ingress.additionalAnnotations` | Additional annotations for the Ingress | `nil` |
+| `gerritReplica.ingress.tls.enabled` | Whether to enable TLS termination in the Ingress | `false` |
+| `gerritReplica.ingress.tls.cert` | Public SSL server certificate | `-----BEGIN CERTIFICATE-----` |
+| `gerritReplica.ingress.tls.key` | Private SSL server certificate | `-----BEGIN RSA PRIVATE KEY-----` |
+| `gerritReplica.keystore` | base64-encoded Java keystore (`cat keystore.jks | base64`) to be used by Gerrit, when using SSL | `nil` |
+| `gerritReplica.config.gerrit` | The contents of the gerrit.config | [see here](#Gerrit-config-files) |
+| `gerritReplica.config.secure` | The contents of the secure.config | [see here](#Gerrit-config-files) |
### Gerrit config files
-The gerrit-slave chart provides a ConfigMap containing the `gerrit.config` and a
+The gerrit-replica chart provides a ConfigMap containing the `gerrit.config` and a
Secret containing the `secure.config` to configure the Gerrit installation in the
-Gerrit slave component. The content of the `gerrit.config` and `secure.config`
-can be set in the `values.yaml` under the keys `gerritSlave.config.gerrit` and
-`gerritSlave.config.secure` respectively. All configuration options are described
+Gerrit replica component. The content of the `gerrit.config` and `secure.config`
+can be set in the `values.yaml` under the keys `gerritReplica.config.gerrit` and
+`gerritReplica.config.secure` respectively. All configuration options are described
in detail in the [official documentation of Gerrit](https://gerrit-review.googlesource.com/Documentation/config-gerrit.html).
-Some options however have to be set in a specified way for the Gerrit slave to
+Some options however have to be set in a specified way for the Gerrit replica to
work as intended:
- `gerrit.basePath`
@@ -254,12 +254,12 @@
- `container.user`
- The technical user in the Gerrit slave container is called `gerrit`. Thus, this
+ The technical user in the Gerrit replica container is called `gerrit`. Thus, this
value is required to be `gerrit`.
-- `container.slave`
+- `container.replica`
- Since this chart is meant to install a Gerrit slave, this naturally has to be
+ Since this chart is meant to install a Gerrit replica, this naturally has to be
`true`.
- `container.javaHome`
@@ -275,7 +275,7 @@
## Upgrading the Chart
-To upgrade an existing installation of the gerrit-slave chart, e.g. to install
+To upgrade an existing installation of the gerrit-replica chart, e.g. to install
a newer chart version or to use an updated custom `values.yaml`-file, execute
the following command:
@@ -283,7 +283,7 @@
cd $(git rev-parse --show-toplevel)/helm-charts
helm upgrade \
<release-name> \
- ./gerrit-slave \ # path to chart
+ ./gerrit-replica \ # path to chart
-f <path-to-custom-values>.yaml \
```
diff --git a/helm-charts/gerrit-slave/docs/nfs-provisioner.md b/helm-charts/gerrit-replica/docs/nfs-provisioner.md
similarity index 85%
rename from helm-charts/gerrit-slave/docs/nfs-provisioner.md
rename to helm-charts/gerrit-replica/docs/nfs-provisioner.md
index 177254d..e2d0806 100644
--- a/helm-charts/gerrit-slave/docs/nfs-provisioner.md
+++ b/helm-charts/gerrit-replica/docs/nfs-provisioner.md
@@ -1,6 +1,6 @@
# Installing a NFS-provisioner
-The Gerrit slave requires access to a persistent volume capable of running in
+The Gerrit replica requires access to a persistent volume capable of running in
`Read Write Many (RWM)`-mode to store the git repositories, since the repositories
have to be accessed by mutiple pods. One possibility to provide such volumes
is to install a provisioner for NFS-volumes into the same Kubernetes-cluster.
@@ -19,15 +19,15 @@
## Installing the nfs-server-provisioner chart
A custom `values.yaml`-file containing a configuration tested with the
-gerrit-slave chart can be found in the `supplements/nfs`-directory in the
-gerrit-slave chart's root directory. In addition a file stating the tested
+gerrit-replica chart can be found in the `supplements/nfs`-directory in the
+gerrit-replica chart's root directory. In addition a file stating the tested
version of the nfs-server-provisioner chart is present in the same directory.
If needed, adapt the `values.yaml`-file for the nfs-server-provisioner chart
further and then run:
```sh
-cd $(git rev-parse --show-toplevel)/helm-charts/gerrit-slave/supplements/nfs
+cd $(git rev-parse --show-toplevel)/helm-charts/gerrit-replica/supplements/nfs
helm install nfs \
stable/nfs-server-provisioner \
-f values.yaml \
@@ -38,12 +38,12 @@
[chart's documentation](https://github.com/helm/charts/blob/master/stable/nfs-server-provisioner/README.md).
Here are some tips for configuring the nfs-server-provisioner chart to work with
-the gerrit-slave chart:
+the gerrit-replica chart:
- Deploying more than 1 `replica` led to some reliability issues in tests and
should be further tested for now, if required.
- The name of the StorageClass created for NFS-volumes has to be the same as the
- one defined in the gerrit-slave chart for `storageClasses.shared.name`
+ one defined in the gerrit-replica chart for `storageClasses.shared.name`
- The StorageClas for NFS-volumes needs to have the parameter `mountOptions: vers=4.1`,
due to compatibility [issues](https://github.com/kubernetes-incubator/external-storage/issues/223)
with Ganesha.
diff --git a/helm-charts/gerrit-slave/supplements/nfs/VERSION b/helm-charts/gerrit-replica/supplements/nfs/VERSION
similarity index 100%
rename from helm-charts/gerrit-slave/supplements/nfs/VERSION
rename to helm-charts/gerrit-replica/supplements/nfs/VERSION
diff --git a/helm-charts/gerrit-slave/supplements/nfs/values.yaml b/helm-charts/gerrit-replica/supplements/nfs/values.yaml
similarity index 92%
rename from helm-charts/gerrit-slave/supplements/nfs/values.yaml
rename to helm-charts/gerrit-replica/supplements/nfs/values.yaml
index ca42a7e..aa3d9ce 100644
--- a/helm-charts/gerrit-slave/supplements/nfs/values.yaml
+++ b/helm-charts/gerrit-replica/supplements/nfs/values.yaml
@@ -23,7 +23,7 @@
create: true
defaultClass: false
# The name of the StorageClass has to be the same as the one defined in the
- # gerrit-slave chart for `storageClasses.shared.name`
+ # gerrit-replica chart for `storageClasses.shared.name`
name: shared-storage
parameters:
# Required!
diff --git a/helm-charts/gerrit-slave/templates/NOTES.txt b/helm-charts/gerrit-replica/templates/NOTES.txt
similarity index 84%
rename from helm-charts/gerrit-slave/templates/NOTES.txt
rename to helm-charts/gerrit-replica/templates/NOTES.txt
index 19fd906..a673eb0 100644
--- a/helm-charts/gerrit-slave/templates/NOTES.txt
+++ b/helm-charts/gerrit-replica/templates/NOTES.txt
@@ -1,4 +1,4 @@
-A Gerrit slave has been deployed.
+A Gerrit replica has been deployed.
=================================
The Apache-Git-HTTP-Backend is now ready to receive replication requests from the
@@ -23,9 +23,9 @@
https://gerrit.googlesource.com/plugins/replication/+doc/master/src/main/resources/Documentation/config.md
-The Gerrit slave is starting up.
+The Gerrit replica is starting up.
The initialization process may take some time. Afterwards the git repositories
will be available under:
-http {{- if .Values.gerritSlave.ingress.tls.enabled -}} s {{- end -}} :// {{- .Values.gerritSlave.ingress.host -}} /<repository-name>.git
+http {{- if .Values.gerritReplica.ingress.tls.enabled -}} s {{- end -}} :// {{- .Values.gerritReplica.ingress.host -}} /<repository-name>.git
diff --git a/helm-charts/gerrit-slave/templates/_helpers.tpl b/helm-charts/gerrit-replica/templates/_helpers.tpl
similarity index 94%
rename from helm-charts/gerrit-slave/templates/_helpers.tpl
rename to helm-charts/gerrit-replica/templates/_helpers.tpl
index 95a0020..500d58c 100644
--- a/helm-charts/gerrit-slave/templates/_helpers.tpl
+++ b/helm-charts/gerrit-replica/templates/_helpers.tpl
@@ -1,7 +1,7 @@
{{/*
Create chart name and version as used by the chart label.
*/}}
-{{- define "gerrit-slave.chart" -}}
+{{- define "gerrit-replica.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -17,4 +17,4 @@
*/}}
{{- define "registry" -}}
{{ if .Values.images.registry.name }}{{- printf "%s/" .Values.images.registry.name -}}{{end}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.configmap.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.configmap.yaml
similarity index 60%
rename from helm-charts/gerrit-slave/templates/gerrit-slave.configmap.yaml
rename to helm-charts/gerrit-replica/templates/gerrit-replica.configmap.yaml
index 9586b6f..0397cd9 100644
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.configmap.yaml
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.configmap.yaml
@@ -1,23 +1,23 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ .Release.Name }}-gerrit-slave-configmap
+ name: {{ .Release.Name }}-gerrit-replica-configmap
labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
data:
gerrit.config: |-
-{{ .Values.gerritSlave.config.gerrit | indent 4 }}
+{{ .Values.gerritReplica.config.gerrit | indent 4 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-gerrit-init-configmap
labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
data:
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
similarity index 73%
rename from helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
rename to helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
index 099d4fc..8e8f1a8 100644
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
@@ -1,25 +1,25 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ .Release.Name }}-gerrit-slave-deployment
+ name: {{ .Release.Name }}-gerrit-replica-deployment
labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
- replicas: {{ .Values.gerritSlave.replicas | default 1 }}
+ replicas: {{ .Values.gerritReplica.replicas | default 1 }}
strategy:
rollingUpdate:
- maxSurge: {{ .Values.gerritSlave.maxSurge }}
- maxUnavailable: {{ .Values.gerritSlave.maxUnavailable }}
+ maxSurge: {{ .Values.gerritReplica.maxSurge }}
+ maxUnavailable: {{ .Values.gerritReplica.maxUnavailable }}
selector:
matchLabels:
- app: gerrit-slave
+ app: gerrit-replica
template:
metadata:
labels:
- app: gerrit-slave
+ app: gerrit-replica
annotations:
chartRevision: "{{ .Release.Revision }}"
spec:
@@ -47,12 +47,12 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- {{ if not .Values.gerritSlave.initializeTestSite.enabled -}}
+ {{ if not .Values.gerritReplica.initializeTestSite.enabled -}}
# Initialize the volume containing the whole Gerrit-site with defaults
# Not needed, when running in test mode, since then the configured site will
# be initialized
- name: populate-gerrit-site-volume
- image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritInit }}:{{ .Values.images.version }}
+ image: {{ template "registry" . }}{{ .Values.gerritReplica.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- /bin/ash
@@ -75,7 +75,7 @@
# If configured, run initialization taking the given Gerrit configuration
# and persisted volumes into account.
- name: gerrit-init
- image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritInit }}:{{ .Values.images.version }}
+ image: {{ template "registry" . }}{{ .Values.gerritReplica.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- /bin/ash
@@ -83,7 +83,7 @@
args:
- |
symlink_config_to_site(){
- {{ if .Values.gerritSlave.keystore -}}
+ {{ if .Values.gerritReplica.keystore -}}
ln -s /var/config/keystore /var/gerrit/etc/keystore
{{- end }}
ln -sf /var/config/gerrit.config /var/gerrit/etc/gerrit.config
@@ -97,7 +97,7 @@
ln -sf /var/mnt/git /var/gerrit/
fi
- {{ if .Values.gerritSlave.initializeTestSite.enabled -}}
+ {{ if .Values.gerritReplica.initializeTestSite.enabled -}}
/var/tools/gerrit_init.py \
-c /var/config/gerrit-init.yaml \
-s /var/gerrit
@@ -117,17 +117,17 @@
- name: gerrit-config
mountPath: "/var/config/gerrit.config"
subPath: gerrit.config
- - name: gerrit-slave-secure-config
+ - name: gerrit-replica-secure-config
mountPath: "/var/config/secure.config"
subPath: secure.config
- {{ if .Values.gerritSlave.keystore -}}
- - name: gerrit-slave-secure-config
+ {{ if .Values.gerritReplica.keystore -}}
+ - name: gerrit-replica-secure-config
mountPath: "/var/config/keystore"
subPath: keystore
{{- end }}
containers:
- - name: gerrit-slave
- image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritSlave }}:{{ .Values.images.version }}
+ - name: gerrit-replica
+ image: {{ template "registry" . }}{{ .Values.gerritReplica.images.gerritReplica }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
ports:
- containerPort: 8080
@@ -139,21 +139,21 @@
- name: gerrit-config
mountPath: "/var/config/gerrit.config"
subPath: gerrit.config
- - name: gerrit-slave-secure-config
+ - name: gerrit-replica-secure-config
mountPath: "/var/config/secure.config"
subPath: secure.config
- {{ if .Values.gerritSlave.keystore -}}
- - name: gerrit-slave-secure-config
+ {{ if .Values.gerritReplica.keystore -}}
+ - name: gerrit-replica-secure-config
mountPath: "/var/config/keystore"
subPath: keystore
{{- end }}
resources:
-{{ toYaml .Values.gerritSlave.resources | indent 10 }}
+{{ toYaml .Values.gerritReplica.resources | indent 10 }}
volumes:
- name: gerrit-site
- {{ if .Values.gerritSlave.persistence.enabled -}}
+ {{ if .Values.gerritReplica.persistence.enabled -}}
persistentVolumeClaim:
- claimName: {{ .Release.Name }}-gerrit-slave-pvc
+ claimName: {{ .Release.Name }}-gerrit-replica-pvc
{{ else -}}
emptyDir: {}
{{- end }}
@@ -165,7 +165,7 @@
name: {{ .Release.Name }}-gerrit-init-configmap
- name: gerrit-config
configMap:
- name: {{ .Release.Name }}-gerrit-slave-configmap
- - name: gerrit-slave-secure-config
+ name: {{ .Release.Name }}-gerrit-replica-configmap
+ - name: gerrit-replica-secure-config
secret:
- secretName: {{ .Release.Name }}-gerrit-slave-secure-config
+ secretName: {{ .Release.Name }}-gerrit-replica-secure-config
diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.ingress.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.ingress.yaml
new file mode 100644
index 0000000..325265e
--- /dev/null
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.ingress.yaml
@@ -0,0 +1,27 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ .Release.Name }}-gerrit-replica-ingress
+ labels:
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ {{ if .Values.gerritReplica.ingress.additionalAnnotations -}}
+ annotations:
+{{ toYaml .Values.gerritReplica.ingress.additionalAnnotations | indent 4 }}
+ {{- end }}
+spec:
+ {{ if .Values.gerritReplica.ingress.tls.enabled -}}
+ tls:
+ - hosts:
+ - {{ .Values.gerritReplica.ingress.host }}
+ secretName: {{ .Release.Name }}-gerrit-replica-tls-secret
+ {{- end }}
+ rules:
+ - host: {{required "A host URL is required for the Gerrit replica Ingress. Please set 'gerritReplica.ingress.host'" .Values.gerritReplica.ingress.host }}
+ http:
+ paths:
+ - backend:
+ serviceName: {{ .Release.Name }}-gerrit-replica-service
+ servicePort: {{ .Values.gerritReplica.service.http.port }}
diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.secrets.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.secrets.yaml
new file mode 100644
index 0000000..a021161
--- /dev/null
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.secrets.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Release.Name }}-gerrit-replica-secure-config
+ labels:
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+data:
+ {{ if .Values.gerritReplica.keystore -}}
+ keystore: {{ .Values.gerritReplica.keystore }}
+ {{- end }}
+ secure.config: {{ .Values.gerritReplica.config.secure | b64enc }}
+type: Opaque
+---
+{{ if .Values.gerritReplica.ingress.tls.enabled -}}
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Release.Name }}-gerrit-replica-tls-secret
+ labels:
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+type: kubernetes.io/tls
+data:
+ {{ with .Values.gerritReplica.ingress.tls -}}
+ tls.crt: {{ .cert | b64enc }}
+ tls.key: {{ .key | b64enc }}
+ {{- end }}
+{{- end }}
diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.service.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.service.yaml
new file mode 100644
index 0000000..8798667
--- /dev/null
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ .Release.Name }}-gerrit-replica-service
+ labels:
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ {{ with .Values.gerritReplica.service }}
+ ports:
+ - name: http
+ port: {{ .http.port }}
+ targetPort: 8080
+ selector:
+ app: gerrit-replica
+ type: {{ .type }}
+ {{- end }}
diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.storage.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.storage.yaml
new file mode 100644
index 0000000..50fc503
--- /dev/null
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.storage.yaml
@@ -0,0 +1,18 @@
+{{ if .Values.gerritReplica.persistence.enabled -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+ name: {{ .Release.Name }}-gerrit-replica-pvc
+ labels:
+ app: gerrit-replica
+ chart: {{ template "gerrit-replica.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: {{ .Values.gerritReplica.persistence.size }}
+ storageClassName: {{ .Values.storageClasses.default.name }}
+{{- end }}
diff --git a/helm-charts/gerrit-slave/templates/git-backend.deployment.yaml b/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
similarity index 97%
rename from helm-charts/gerrit-slave/templates/git-backend.deployment.yaml
rename to helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
index 2717771..b5231a8 100644
--- a/helm-charts/gerrit-slave/templates/git-backend.deployment.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
@@ -4,7 +4,7 @@
name: {{ .Release.Name }}-git-backend-deployment
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
diff --git a/helm-charts/gerrit-slave/templates/git-backend.ingress.yaml b/helm-charts/gerrit-replica/templates/git-backend.ingress.yaml
similarity index 95%
rename from helm-charts/gerrit-slave/templates/git-backend.ingress.yaml
rename to helm-charts/gerrit-replica/templates/git-backend.ingress.yaml
index 8a40155..2a74a4a 100644
--- a/helm-charts/gerrit-slave/templates/git-backend.ingress.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.ingress.yaml
@@ -5,7 +5,7 @@
name: {{ .Release.Name }}-git-backend-ingress
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
annotations:
diff --git a/helm-charts/gerrit-slave/templates/git-backend.secrets.yaml b/helm-charts/gerrit-replica/templates/git-backend.secrets.yaml
similarity index 91%
rename from helm-charts/gerrit-slave/templates/git-backend.secrets.yaml
rename to helm-charts/gerrit-replica/templates/git-backend.secrets.yaml
index 34b3552..15c8681 100644
--- a/helm-charts/gerrit-slave/templates/git-backend.secrets.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.secrets.yaml
@@ -4,7 +4,7 @@
name: {{ .Release.Name }}-git-backend-secret
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
data:
@@ -24,7 +24,7 @@
name: {{ .Release.Name }}-git-backend-tls-secret
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
type: kubernetes.io/tls
diff --git a/helm-charts/gerrit-slave/templates/git-backend.service.yaml b/helm-charts/gerrit-replica/templates/git-backend.service.yaml
similarity index 90%
rename from helm-charts/gerrit-slave/templates/git-backend.service.yaml
rename to helm-charts/gerrit-replica/templates/git-backend.service.yaml
index 11b57ce..76b139f 100644
--- a/helm-charts/gerrit-slave/templates/git-backend.service.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.service.yaml
@@ -4,7 +4,7 @@
name: {{ .Release.Name }}-git-backend-service
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
@@ -23,4 +23,4 @@
selector:
app: git-backend
type: {{ .type }}
- {{- end }}
\ No newline at end of file
+ {{- end }}
diff --git a/helm-charts/gerrit-slave/templates/git-backend.storage.yaml b/helm-charts/gerrit-replica/templates/git-backend.storage.yaml
similarity index 89%
rename from helm-charts/gerrit-slave/templates/git-backend.storage.yaml
rename to helm-charts/gerrit-replica/templates/git-backend.storage.yaml
index aebbabf..99848ee 100644
--- a/helm-charts/gerrit-slave/templates/git-backend.storage.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.storage.yaml
@@ -5,7 +5,7 @@
name: {{ .Release.Name }}-apache-logs-pvc
labels:
app: git-backend
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
@@ -15,4 +15,4 @@
requests:
storage: {{ .Values.gitBackend.logging.persistence.size }}
storageClassName: {{ .Values.storageClasses.default.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/helm-charts/gerrit-slave/templates/git-gc.cronjob.yaml b/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
similarity index 96%
rename from helm-charts/gerrit-slave/templates/git-gc.cronjob.yaml
rename to helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
index 6e87759..81f6f1f 100644
--- a/helm-charts/gerrit-slave/templates/git-gc.cronjob.yaml
+++ b/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
@@ -4,7 +4,7 @@
name: {{ .Release.Name }}-git-gc
labels:
app: git-gc
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
diff --git a/helm-charts/gerrit-slave/templates/git-gc.storage.yaml b/helm-charts/gerrit-replica/templates/git-gc.storage.yaml
similarity index 89%
rename from helm-charts/gerrit-slave/templates/git-gc.storage.yaml
rename to helm-charts/gerrit-replica/templates/git-gc.storage.yaml
index 8a63ee8..1e2fac4 100644
--- a/helm-charts/gerrit-slave/templates/git-gc.storage.yaml
+++ b/helm-charts/gerrit-replica/templates/git-gc.storage.yaml
@@ -5,7 +5,7 @@
name: {{ .Release.Name }}-git-gc-logs-pvc
labels:
app: git-gc
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
@@ -15,4 +15,4 @@
requests:
storage: {{ .Values.gitGC.logging.persistence.size }}
storageClassName: {{ .Values.storageClasses.default.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/helm-charts/gerrit-slave/templates/git-repositories.storage.yaml b/helm-charts/gerrit-replica/templates/git-repositories.storage.yaml
similarity index 100%
rename from helm-charts/gerrit-slave/templates/git-repositories.storage.yaml
rename to helm-charts/gerrit-replica/templates/git-repositories.storage.yaml
diff --git a/helm-charts/gerrit-slave/templates/image-pull.secret.yaml b/helm-charts/gerrit-replica/templates/image-pull.secret.yaml
similarity index 100%
rename from helm-charts/gerrit-slave/templates/image-pull.secret.yaml
rename to helm-charts/gerrit-replica/templates/image-pull.secret.yaml
diff --git a/helm-charts/gerrit-slave/templates/storageclasses.yaml b/helm-charts/gerrit-replica/templates/storageclasses.yaml
similarity index 91%
rename from helm-charts/gerrit-slave/templates/storageclasses.yaml
rename to helm-charts/gerrit-replica/templates/storageclasses.yaml
index 10a3c12..f5c117f 100644
--- a/helm-charts/gerrit-slave/templates/storageclasses.yaml
+++ b/helm-charts/gerrit-replica/templates/storageclasses.yaml
@@ -4,7 +4,7 @@
metadata:
name: {{ .Values.storageClasses.default.name }}
labels:
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
provisioner: {{ .Values.storageClasses.default.provisioner }}
@@ -23,7 +23,7 @@
metadata:
name: {{ .Values.storageClasses.shared.name }}
labels:
- chart: {{ template "gerrit-slave.chart" . }}
+ chart: {{ template "gerrit-replica.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
provisioner: {{ .Values.storageClasses.shared.provisioner }}
@@ -34,4 +34,4 @@
{{ $key }}: {{ $value }}
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/helm-charts/gerrit-slave/values.yaml b/helm-charts/gerrit-replica/values.yaml
similarity index 91%
rename from helm-charts/gerrit-slave/values.yaml
rename to helm-charts/gerrit-replica/values.yaml
index 8f55c82..f5fb802 100644
--- a/helm-charts/gerrit-slave/values.yaml
+++ b/helm-charts/gerrit-replica/values.yaml
@@ -5,7 +5,7 @@
ImagePullSecret:
# Leave blank, if no ImagePullSecret is needed.
name: image-pull-secret
- # If set to false, the gerrit-slave chart expects either a ImagePullSecret
+ # If set to false, the gerrit-replica chart expects either a ImagePullSecret
# with the name configured above to be present on the cluster or that no
# credentials are needed.
create: false
@@ -135,10 +135,10 @@
size: 1Gi
-gerritSlave:
+gerritReplica:
images:
gerritInit: k8sgerrit/gerrit-init
- gerritSlave: k8sgerrit/gerrit-slave
+ gerritReplica: k8sgerrit/gerrit-replica
replicas: 1
maxSurge: 25%
@@ -146,7 +146,7 @@
# work.
maxUnavailable: 100%
- # If you only intend to test the Gerrit slave and do not wish to actually
+ # If you only intend to test the Gerrit replica and do not wish to actually
# replicate repositories, activate this option to initialize a new site,
# including a notedb.
initializeTestSite:
@@ -186,7 +186,7 @@
-----END RSA PRIVATE KEY-----
- # `gerritSlave.keystore` expects a base64-encoded Java-keystore
+ # `gerritReplica.keystore` expects a base64-encoded Java-keystore
# Since Java keystores are binary files, adding the unencoded content and
# automatic encoding using helm does not work here.
keystore:
@@ -198,7 +198,7 @@
gerrit: |-
[gerrit]
basePath = git # FIXED
- serverId = gerrit-slave-1
+ serverId = gerrit-replica-1
# The canonical web URL has to be set to the Ingress host, if an Ingress
# is used. If a LoadBalancer-service is used, this should be set to the
# LoadBalancer's external IP. This can only be done manually after installing
@@ -225,16 +225,16 @@
directory = cache
[container]
user = gerrit # FIXED
- slave = true # FIXED
+ replica = true # FIXED
javaHome = /usr/lib/jvm/java-1.8-openjdk # FIXED
javaOptions = -Djavax.net.ssl.trustStore=/var/gerrit/etc/keystore # FIXED
javaOptions = -Xms200m
- # Has to be lower than 'gerritSlave.resources.limits.memory'. Also
+ # Has to be lower than 'gerritReplica.resources.limits.memory'. Also
# consider memories used by other applications in the container.
javaOptions = -Xmx4g
secure: |-
- # Password for the keystore added as value for 'gerritSlave.keystore'
+ # Password for the keystore added as value for 'gerritReplica.keystore'
# Only needed, if SSL is enabled.
#[httpd]
# sslKeyPassword = gerrit
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.ingress.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.ingress.yaml
deleted file mode 100644
index 946d5e4..0000000
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.ingress.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ .Release.Name }}-gerrit-slave-ingress
- labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
- {{ if .Values.gerritSlave.ingress.additionalAnnotations -}}
- annotations:
-{{ toYaml .Values.gerritSlave.ingress.additionalAnnotations | indent 4 }}
- {{- end }}
-spec:
- {{ if .Values.gerritSlave.ingress.tls.enabled -}}
- tls:
- - hosts:
- - {{ .Values.gerritSlave.ingress.host }}
- secretName: {{ .Release.Name }}-gerrit-slave-tls-secret
- {{- end }}
- rules:
- - host: {{required "A host URL is required for the Gerrit slave Ingress. Please set 'gerritSlave.ingress.host'" .Values.gerritSlave.ingress.host }}
- http:
- paths:
- - backend:
- serviceName: {{ .Release.Name }}-gerrit-slave-service
- servicePort: {{ .Values.gerritSlave.service.http.port }}
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.secrets.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.secrets.yaml
deleted file mode 100644
index ef41a8d..0000000
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.secrets.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ .Release.Name }}-gerrit-slave-secure-config
- labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-data:
- {{ if .Values.gerritSlave.keystore -}}
- keystore: {{ .Values.gerritSlave.keystore }}
- {{- end }}
- secure.config: {{ .Values.gerritSlave.config.secure | b64enc }}
-type: Opaque
----
-{{ if .Values.gerritSlave.ingress.tls.enabled -}}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ .Release.Name }}-gerrit-slave-tls-secret
- labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-type: kubernetes.io/tls
-data:
- {{ with .Values.gerritSlave.ingress.tls -}}
- tls.crt: {{ .cert | b64enc }}
- tls.key: {{ .key | b64enc }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.service.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.service.yaml
deleted file mode 100644
index 6591ac0..0000000
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Release.Name }}-gerrit-slave-service
- labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-spec:
- {{ with .Values.gerritSlave.service }}
- ports:
- - name: http
- port: {{ .http.port }}
- targetPort: 8080
- selector:
- app: gerrit-slave
- type: {{ .type }}
- {{- end }}
\ No newline at end of file
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.storage.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.storage.yaml
deleted file mode 100644
index b45c874..0000000
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.storage.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ if .Values.gerritSlave.persistence.enabled -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-gerrit-slave-pvc
- labels:
- app: gerrit-slave
- chart: {{ template "gerrit-slave.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: {{ .Values.gerritSlave.persistence.size }}
- storageClassName: {{ .Values.storageClasses.default.name }}
-{{- end }}
diff --git a/supplements/gerrit-master.minikube.values.yaml b/supplements/gerrit-master.minikube.values.yaml
index 9f1ba31..d8bd646 100644
--- a/supplements/gerrit-master.minikube.values.yaml
+++ b/supplements/gerrit-master.minikube.values.yaml
@@ -69,7 +69,7 @@
javaOptions = -Xmx300m
secure: |-
- [remote "slave"]
+ [remote "replica"]
username = git
password = secret
@@ -79,7 +79,7 @@
replicateOnStartup = true
defaultForceUpdate = true
- [remote "slave"]
- url = http://gerrit-slave-git-backend-service/git/${name}.git
+ [remote "replica"]
+ url = http://gerrit-replica-git-backend-service/git/${name}.git
replicationDelay = 0
timeout = 30
diff --git a/supplements/gerrit-slave.minikube.values.yaml b/supplements/gerrit-slave.minikube.values.yaml
index 9eabab4..c1f43aa 100644
--- a/supplements/gerrit-slave.minikube.values.yaml
+++ b/supplements/gerrit-slave.minikube.values.yaml
@@ -39,7 +39,7 @@
persistence:
enabled: false
-gerritSlave:
+gerritReplica:
initializeTestSite:
enabled: true
@@ -55,14 +55,14 @@
enabled: false
ingress:
- host: slave.gerrit
+ host: replica.gerrit
config:
gerrit: |-
[gerrit]
basePath = git
- serverId = gerrit-slave-1
- canonicalWebUrl = http://slave.gerrit
+ serverId = gerrit-replica-1
+ canonicalWebUrl = http://replica.gerrit
[index]
type = LUCENE
[auth]
@@ -81,7 +81,7 @@
directory = cache
[container]
user = gerrit
- slave = true
+ replica = true
javaHome = /usr/lib/jvm/java-8-openjdk-amd64
javaOptions = -Djavax.net.ssl.trustStore=/var/gerrit/etc/keystore
javaOptions = -Xms300m
diff --git a/tests/conftest.py b/tests/conftest.py
index de47dff..497ae0f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -340,13 +340,15 @@
@pytest.fixture(scope="session")
-def gerrit_slave_image(
+def gerrit_replica_image(
request, container_images, docker_build, docker_push, base_image, gerrit_base_image
):
- gerrit_slave_image = docker_build(container_images["gerrit-slave"], "gerrit-slave")
+ gerrit_replica_image = docker_build(
+ container_images["gerrit-replica"], "gerrit-replica"
+ )
if request.config.getoption("--push"):
- docker_push("gerrit-slave")
- return gerrit_slave_image
+ docker_push("gerrit-replica")
+ return gerrit_replica_image
@pytest.fixture(scope="session")
diff --git a/tests/container-images/gerrit-slave/test_container_build_gerrit_slave.py b/tests/container-images/gerrit-replica/test_container_build_gerrit_replica.py
similarity index 85%
rename from tests/container-images/gerrit-slave/test_container_build_gerrit_slave.py
rename to tests/container-images/gerrit-replica/test_container_build_gerrit_replica.py
index 88fa51c..151b0aa 100644
--- a/tests/container-images/gerrit-slave/test_container_build_gerrit_slave.py
+++ b/tests/container-images/gerrit-replica/test_container_build_gerrit_replica.py
@@ -16,7 +16,7 @@
@pytest.mark.structure
-def test_build_gerrit_slave(gerrit_slave_image, tag_of_cached_container):
+def test_build_gerrit_replica(gerrit_replica_image, tag_of_cached_container):
if tag_of_cached_container:
pytest.skip("Cached image used for testing. Build will not be tested.")
- assert gerrit_slave_image.id is not None
+ assert gerrit_replica_image.id is not None
diff --git a/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py b/tests/container-images/gerrit-replica/test_container_integration_gerrit_replica.py
similarity index 80%
rename from tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py
rename to tests/container-images/gerrit-replica/test_container_integration_gerrit_replica.py
index 9753258..9f8c27f 100644
--- a/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py
+++ b/tests/container-images/gerrit-replica/test_container_integration_gerrit_replica.py
@@ -27,7 +27,7 @@
@pytest.fixture(scope="module")
def tmp_dir(tmp_path_factory):
- return tmp_path_factory.mktemp("gerrit-slave-test")
+ return tmp_path_factory.mktemp("gerrit-replica-test")
@pytest.fixture(scope="class")
@@ -36,7 +36,7 @@
docker_client,
docker_network,
tmp_dir,
- gerrit_slave_image,
+ gerrit_replica_image,
gerrit_container_factory,
):
configs = {
@@ -48,7 +48,7 @@
listenUrl = http://*:8081
[container]
- slave = true
+ replica = true
[test]
success = True
@@ -60,7 +60,7 @@
}
test_setup = gerrit_container_factory(
- docker_client, docker_network, tmp_dir, gerrit_slave_image, configs, 8081
+ docker_client, docker_network, tmp_dir, gerrit_replica_image, configs, 8081
)
test_setup.start()
@@ -73,7 +73,7 @@
@pytest.mark.incremental
@pytest.mark.integration
@pytest.mark.slow
-class TestGerritSlave:
+class TestGerritReplica:
@pytest.fixture(params=CONFIG_FILES)
def config_file_to_test(self, request):
return request.param
@@ -83,7 +83,7 @@
return request.param
@pytest.mark.timeout(60)
- def test_gerrit_slave_gerrit_starts_up(self, container_run):
+ def test_gerrit_replica_gerrit_starts_up(self, container_run):
def wait_for_gerrit_start():
log = container_run.logs().decode("utf-8")
return re.search(r"Gerrit Code Review .+ ready", log)
@@ -91,7 +91,7 @@
while not wait_for_gerrit_start():
continue
- def test_gerrit_slave_custom_gerrit_config_available(
+ def test_gerrit_replica_custom_gerrit_config_available(
self, container_run, config_file_to_test
):
exit_code, output = container_run.exec_run(
@@ -102,19 +102,19 @@
assert exit_code == 0
assert output == "True"
- def test_gerrit_slave_repository_exists(self, container_run, expected_repository):
+ def test_gerrit_replica_repository_exists(self, container_run, expected_repository):
exit_code, _ = container_run.exec_run(
"test -d /var/gerrit/git/%s" % expected_repository
)
assert exit_code == 0
- def test_gerrit_slave_clone_repo_works(self, container_run, tmp_path_factory):
+ def test_gerrit_replica_clone_repo_works(self, container_run, tmp_path_factory):
container_run.exec_run("git init --bare /var/gerrit/git/test.git")
- clone_dest = tmp_path_factory.mktemp("gerrit_slave_clone_test")
+ clone_dest = tmp_path_factory.mktemp("gerrit_replica_clone_test")
repo = git.Repo.clone_from("http://localhost:8081/test.git", clone_dest)
assert repo.git_dir == os.path.join(clone_dest, ".git")
- def test_gerrit_slave_webui_not_accessible(self, container_run):
+ def test_gerrit_replica_webui_not_accessible(self, container_run):
response = requests.get("http://localhost:8081")
assert response.status_code == 404
assert response.text == "Not Found"
diff --git a/tests/container-images/gerrit-slave/test_container_structure_gerrit_slave.py b/tests/container-images/gerrit-replica/test_container_structure_gerrit_replica.py
similarity index 79%
rename from tests/container-images/gerrit-slave/test_container_structure_gerrit_slave.py
rename to tests/container-images/gerrit-replica/test_container_structure_gerrit_replica.py
index e22114c..530d6c9 100755
--- a/tests/container-images/gerrit-slave/test_container_structure_gerrit_slave.py
+++ b/tests/container-images/gerrit-replica/test_container_structure_gerrit_replica.py
@@ -18,8 +18,8 @@
@pytest.fixture(scope="module")
-def container_run(docker_client, container_endless_run_factory, gerrit_slave_image):
- container_run = container_endless_run_factory(docker_client, gerrit_slave_image)
+def container_run(docker_client, container_endless_run_factory, gerrit_replica_image):
+ container_run = container_endless_run_factory(docker_client, gerrit_replica_image)
yield container_run
container_run.stop(timeout=1)
@@ -31,31 +31,31 @@
# pylint: disable=E1101
@pytest.mark.structure
-def test_gerrit_slave_inherits_from_gerrit_base(gerrit_slave_image):
+def test_gerrit_replica_inherits_from_gerrit_base(gerrit_replica_image):
assert utils.check_if_ancestor_image_is_inherited(
- gerrit_slave_image, "gerrit-base:latest"
+ gerrit_replica_image, "gerrit-base:latest"
)
@pytest.mark.docker
@pytest.mark.structure
-def test_gerrit_slave_contains_expected_scripts(container_run, expected_script):
+def test_gerrit_replica_contains_expected_scripts(container_run, expected_script):
exit_code, _ = container_run.exec_run("test -f %s" % expected_script)
assert exit_code == 0
@pytest.mark.docker
@pytest.mark.structure
-def test_gerrit_slave_contains_initialized_gerrit_site(container_run):
+def test_gerrit_replica_contains_initialized_gerrit_site(container_run):
exit_code, _ = container_run.exec_run("/var/gerrit/bin/gerrit.sh check")
assert exit_code == 3
@pytest.mark.docker
@pytest.mark.structure
-def test_gerrit_slave_gerrit_is_configured_slave(container_run):
+def test_gerrit_replica_gerrit_is_configured_replica(container_run):
exit_code, output = container_run.exec_run(
- "git config -f /var/gerrit/etc/gerrit.config --get container.slave"
+ "git config -f /var/gerrit/etc/gerrit.config --get container.replica"
)
output = output.decode("utf-8").strip().lower()
assert exit_code == 0
