Rename Gerrit master to Gerrit
The name Gerrit master was redundant and 'master' could be considered
to be offensive. Thus, the chart is now only called 'gerrit'.
Issue: 13046
Change-Id: Ic1a7dfb87a548f3ed575f6a093072561ed2402b9
diff --git a/Documentation/minikube.md b/Documentation/minikube.md
index 62ca54a..18af7cc 100644
--- a/Documentation/minikube.md
+++ b/Documentation/minikube.md
@@ -3,8 +3,8 @@
To test Gerrit on Kubernetes locally, a one-node cluster can be set up using
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-replica helm charts to it. Note, that due to limited compute
+This tutorial will guide through setting up Minikube to deploy the gerrit 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-replica charts are configured to work with the default
+The gerrit 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 replica setup with reasonable startup
+To install a full Gerrit 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,10 +94,10 @@
of all the hostnames:
```sh
-echo "$(minikube ip) master.gerrit backend.gerrit replica.gerrit" | sudo tee -a /etc/hosts
+echo "$(minikube ip) primary.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
+The host names (e.g. `primary.gerrit`) are the defaults, when using the values.yaml
files provided as and example for minikube. Change them accordingly, if a different
one is chosen.
This will only redirect traffic from the computer running Minikube.
@@ -140,22 +140,22 @@
-f ./supplements/nfs.minikube.values.yaml
```
-## Installing the gerrit-master helm chart
+## Installing the gerrit helm chart
-A configuration file to configure the gerrit-master chart is provided at
-`./supplements/gerrit-master.minikube.values.yaml`. To install the gerrit-master
+A configuration file to configure the gerrit chart is provided at
+`./supplements/gerrit.minikube.values.yaml`. To install the gerrit
chart on Minikube, run:
```sh
-helm install gerrit-master \
- ./helm-charts/gerrit-master \
- -f ./supplements/gerrit-master.minikube.values.yaml
+helm install gerrit \
+ ./helm-charts/gerrit \
+ -f ./supplements/gerrit.minikube.values.yaml
```
Startup may take some time, especially when allowing only a small amount of
resources to the containers. Check progress with `kubectl get pods -w` until
-it says that the pod `gerrit-master-gerrit-master-stateful-set-0` is `Running`.
-Then use `kubectl logs -f gerrit-master-gerrit-master-stateful-set-0` to follow
+it says that the pod `gerrit-gerrit-stateful-set-0` is `Running`.
+Then use `kubectl logs -f gerrit-gerrit-stateful-set-0` to follow
the startup process of Gerrit until a line like this shows that Gerrit is ready:
```sh
@@ -165,7 +165,7 @@
To open Gerrit's UI, run:
```sh
-open http://master.gerrit
+open http://primary.gerrit
```
## Installing the gerrit-replica helm chart
@@ -185,7 +185,7 @@
kubectl logs -f gerrit-replica-gerrit-replica-deployment-<id>
```
-Replication of repositories has to be started on the Gerrit master, e.g. by making
+Replication of repositories has to be started on the Gerrit, e.g. by making
a change in the respective repositories. Only then previous changes to the
repositories will be available on the replica.
diff --git a/README.md b/README.md
index 56c32f1..64447d3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
# Docker images
-Images to run a Gerrit master and Gerrit replica setup based on the 3.1.7 Gerrit release.
+Images to run a Gerrit and Gerrit replica setup based on the 3.1.7 Gerrit release.
## Building images
@@ -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 replica on a Kubernetes cluster. A helm version newer
+Gerrit 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
@@ -103,11 +103,11 @@
* Create an EFS volume on AWS
* Install a NFS server on Kubernetes cluster which doesn't have read-write-many
Persistent Volumes available using
-[NFS-provisioner](helm-charts/gerrit-master/docs/nfs-provisioner.md)
+[NFS-provisioner](helm-charts/gerrit/docs/nfs-provisioner.md)
-## Gerrit Master
+## Gerrit
-* Install a [Gerrit master](helm-charts/gerrit-master/README.md)
+* Install a [Gerrit](helm-charts/gerrit/README.md)
## Gerrit Replica
diff --git a/build b/build
index 693e5c9..6511309 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-replica git-gc gerrit-init; do
+ for IMAGE in apache-git-http-backend gerrit 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 01bbfb1..946e301 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 replica.
+from a Gerrit 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 replica,
+ if a new repository on the Gerrit 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 16ac57e..06fb97d 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 replica images.
+Gerrit base image for Gerrit and Gerrit replica images.
It is only used in the build process and not published on Dockerhub.
## Content
diff --git a/container-images/gerrit-master/Dockerfile b/container-images/gerrit/Dockerfile
similarity index 100%
rename from container-images/gerrit-master/Dockerfile
rename to container-images/gerrit/Dockerfile
diff --git a/container-images/gerrit-master/README.md b/container-images/gerrit/README.md
similarity index 85%
rename from container-images/gerrit-master/README.md
rename to container-images/gerrit/README.md
index 8739cbb..1c11dcf 100644
--- a/container-images/gerrit-master/README.md
+++ b/container-images/gerrit/README.md
@@ -1,6 +1,6 @@
-# Gerrit master image
+# Gerrit image
-Gerrit master image for a Gerrit master
+Gerrit image for a primary Gerrit instance
## Content
diff --git a/container-images/gerrit-master/tools/start b/container-images/gerrit/tools/start
similarity index 100%
rename from container-images/gerrit-master/tools/start
rename to container-images/gerrit/tools/start
diff --git a/helm-charts/gerrit-master/templates/NOTES.txt b/helm-charts/gerrit-master/templates/NOTES.txt
deleted file mode 100644
index 4dce62c..0000000
--- a/helm-charts/gerrit-master/templates/NOTES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-A Gerrit master has been deployed.
-==================================
-
-Gerrit may be accessed under: {{ .Values.gerritMaster.ingress.host }}
\ No newline at end of file
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.configmap.yaml b/helm-charts/gerrit-master/templates/gerrit-master.configmap.yaml
deleted file mode 100644
index 814fb68..0000000
--- a/helm-charts/gerrit-master/templates/gerrit-master.configmap.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ .Release.Name }}-gerrit-master-configmap
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-data:
- gerrit.config: |-
-{{ .Values.gerritMaster.config.gerrit | indent 4 }}
- replication.config: |-
-{{ .Values.gerritMaster.config.replication | indent 4 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ .Release.Name }}-gerrit-init-configmap
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-data:
- gerrit-init.yaml: |-
- pluginCache: {{ .Values.gerritMaster.plugins.cache.enabled }}
- pluginCacheDir: /var/mnt/plugins
- {{- if .Values.gerritMaster.plugins.packaged }}
- packagedPlugins:
-{{ toYaml .Values.gerritMaster.plugins.packaged | indent 6}}
- {{- end }}
- {{- if .Values.gerritMaster.plugins.downloaded }}
- downloadedPlugins:
-{{ toYaml .Values.gerritMaster.plugins.downloaded | indent 6 }}
- {{- end }}
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.ingress.yaml b/helm-charts/gerrit-master/templates/gerrit-master.ingress.yaml
deleted file mode 100644
index 5eb3f32..0000000
--- a/helm-charts/gerrit-master/templates/gerrit-master.ingress.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ .Release.Name }}-gerrit-master-ingress
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
- annotations:
- nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.gerritMaster.ingress.maxBodySize | default "50m" }}
- {{- if .Values.gerritMaster.ingress.additionalAnnotations }}
-{{ toYaml .Values.gerritMaster.ingress.additionalAnnotations | indent 4 }}
- {{- end }}
-spec:
- {{ if .Values.gerritMaster.ingress.tls.enabled -}}
- tls:
- - hosts:
- - {{ .Values.gerritMaster.ingress.host }}
- secretName: {{ .Release.Name }}-gerrit-master-tls-secret
- {{- end }}
- rules:
- - host: {{required "A host URL is required for the Gerrit master Ingress. Please set 'gerritMaster.ingress.host'" .Values.gerritMaster.ingress.host }}
- http:
- paths:
- - backend:
- serviceName: {{ .Release.Name }}-gerrit-master-service
- servicePort: {{ .Values.gerritMaster.service.http.port }}
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.secrets.yaml b/helm-charts/gerrit-master/templates/gerrit-master.secrets.yaml
deleted file mode 100644
index 25c4543..0000000
--- a/helm-charts/gerrit-master/templates/gerrit-master.secrets.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ .Release.Name }}-gerrit-master-secure-config
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-data:
- {{ if .Values.gerritMaster.keystore -}}
- keystore: {{ .Values.gerritMaster.keystore }}
- {{- end }}
- secure.config: {{ .Values.gerritMaster.config.secure | b64enc }}
-type: Opaque
----
-{{ if .Values.gerritMaster.ingress.tls.enabled -}}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ .Release.Name }}-gerrit-master-tls-secret
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-type: kubernetes.io/tls
-data:
- {{ with .Values.gerritMaster.ingress.tls -}}
- tls.crt: {{ .cert | b64enc }}
- tls.key: {{ .key | b64enc }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.service.yaml b/helm-charts/gerrit-master/templates/gerrit-master.service.yaml
deleted file mode 100644
index d932d78..0000000
--- a/helm-charts/gerrit-master/templates/gerrit-master.service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Release.Name }}-gerrit-master-service
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-spec:
- {{ with .Values.gerritMaster.service }}
- ports:
- - name: http
- port: {{ .http.port }}
- targetPort: 8080
- selector:
- app: gerrit-master
- type: {{ .type }}
- {{- end }}
\ No newline at end of file
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.storage.yaml b/helm-charts/gerrit-master/templates/gerrit-master.storage.yaml
deleted file mode 100644
index 300afa6..0000000
--- a/helm-charts/gerrit-master/templates/gerrit-master.storage.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and .Values.gerritMaster.plugins.cache.enabled .Values.gerritMaster.plugins.downloaded }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-plugin-cache-pvc
- labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-spec:
- accessModes:
- - ReadWriteMany
- resources:
- requests:
- storage: {{ .Values.gerritMaster.plugins.cache.size }}
- storageClassName: {{ .Values.storageClasses.shared.name }}
-{{- end }}
diff --git a/helm-charts/gerrit-replica/Chart.yaml b/helm-charts/gerrit-replica/Chart.yaml
index 944978b..291ada9 100644
--- a/helm-charts/gerrit-replica/Chart.yaml
+++ b/helm-charts/gerrit-replica/Chart.yaml
@@ -2,8 +2,8 @@
appVersion: 3.1.7
description: |-
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.
+ that it receives from a Gerrit instance via replication. It can be used to
+ reduce the load on Gerrit instances.
name: gerrit-replica
version: 0.2.0
maintainers:
diff --git a/helm-charts/gerrit-replica/README.md b/helm-charts/gerrit-replica/README.md
index a3ff603..14fa35f 100644
--- a/helm-charts/gerrit-replica/README.md
+++ b/helm-charts/gerrit-replica/README.md
@@ -3,12 +3,12 @@
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,
+(e.g. by `git fetch` operations). To take some load of the Gerrit server,
Gerrit replicas can be deployed to serve 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.
+Gerrit. 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
@@ -66,15 +66,15 @@
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 replica pod and to clone the repositories from the Gerrit master (Make
+the Gerrit replica pod and to clone the repositories from the primary Gerrit (Make
sure that you have the correct access rights do so.):
```sh
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
+gerrit@<gerrit-replica-pod>:/var/gerrit/git$ git clone "http://gerrit.com/All-Projects" --mirror
Cloning into bare repository 'All-Projects.git'...
-gerrit@<gerrit-replica-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Users" --mirror
+gerrit@<gerrit-replica-pod>:/var/gerrit/git$ git clone "http://gerrit.com/All-Users" --mirror
Cloning into bare repository 'All-Users.git'...
```
diff --git a/helm-charts/gerrit-replica/templates/NOTES.txt b/helm-charts/gerrit-replica/templates/NOTES.txt
index a673eb0..8872a88 100644
--- a/helm-charts/gerrit-replica/templates/NOTES.txt
+++ b/helm-charts/gerrit-replica/templates/NOTES.txt
@@ -2,7 +2,7 @@
=================================
The Apache-Git-HTTP-Backend is now ready to receive replication requests from the
-Gerrit master. Please configure the replication plugin of the Gerrit-master to
+primary Gerrit. Please configure the replication plugin of the primary Gerrit to
push the repositories to:
{{ if .Values.gitBackend.ingress.enabled -}}
diff --git a/helm-charts/gerrit-master/.helmignore b/helm-charts/gerrit/.helmignore
similarity index 100%
rename from helm-charts/gerrit-master/.helmignore
rename to helm-charts/gerrit/.helmignore
diff --git a/helm-charts/gerrit-master/Chart.yaml b/helm-charts/gerrit/Chart.yaml
similarity index 97%
rename from helm-charts/gerrit-master/Chart.yaml
rename to helm-charts/gerrit/Chart.yaml
index af01037..71e1329 100644
--- a/helm-charts/gerrit-master/Chart.yaml
+++ b/helm-charts/gerrit/Chart.yaml
@@ -7,7 +7,7 @@
Git, a distributed version control system. [1]
[1](https://en.wikipedia.org/wiki/Gerrit_(software)
-name: gerrit-master
+name: gerrit
version: 0.2.0
maintainers:
- name: Thomas Draebing
diff --git a/helm-charts/gerrit-master/LICENSE b/helm-charts/gerrit/LICENSE
similarity index 100%
rename from helm-charts/gerrit-master/LICENSE
rename to helm-charts/gerrit/LICENSE
diff --git a/helm-charts/gerrit-master/README.md b/helm-charts/gerrit/README.md
similarity index 62%
rename from helm-charts/gerrit-master/README.md
rename to helm-charts/gerrit/README.md
index 6f7e36d..0df1817 100644
--- a/helm-charts/gerrit-master/README.md
+++ b/helm-charts/gerrit/README.md
@@ -24,7 +24,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-master/docs/nfs-provisioner.md) of how to
+ [this guide](/helm-charts/gerrit/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
@@ -38,18 +38,18 @@
## Installing the Chart
***note
-**ATTENTION:** The value for `gerritMaster.ingress.host` is required for rendering
+**ATTENTION:** The value for `gerrit.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-master`, execute:
+To install the chart with the release name `gerrit`, execute:
```sh
cd $(git rev-parse --show-toplevel)/helm-charts
helm install \
- gerrit-master \ # release name
- ./gerrit-master \ # path to chart
+ gerrit \ # release name
+ ./gerrit \ # path to chart
-f <path-to-custom-values>.yaml
```
@@ -69,8 +69,8 @@
```sh
cd $(git rev-parse --show-toplevel)/helm-charts
helm install \
- gerrit-master \ # release name
- ./gerrit-master \ # path to chart
+ gerrit \ # release name
+ ./gerrit \ # path to chart
--set=gitRepositoryStorage.size=100Gi
```
@@ -135,7 +135,7 @@
***note
The way the Jetty servlet used by Gerrit works, the Gerrit component of the
-gerrit-master chart actually requires the URL to be known, when the chart is installed.
+gerrit 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!
@@ -146,44 +146,44 @@
is mandatory, if access to Gerrit is required!
***
-| Parameter | Description | Default |
-|----------------------------------------------|-------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------|
-| `gerritMaster.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` |
-| `gerritMaster.images.gerritMaster` | Image name of the Gerrit master container image | `k8s-gerrit/gerrit-master` |
-| `gerritMaster.replicas` | Number of replica pods to deploy | `1` |
-| `gerritMaster.updatePartition` | Number of pods to update simultaneously | `1` |
-| `gerritMaster.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
-| | | `requests.memory: 5Gi` |
-| | | `limits.cpu: 1` |
-| | | `limits.memory: 6Gi` |
-| `gerritMaster.persistence.enabled` | Whether to persist the Gerrit site | `true` |
-| `gerritMaster.persistence.size` | Storage size for persisted Gerrit site | `10Gi` |
-| `gerritMaster.service.type` | Which kind of Service to deploy | `NodePort` |
-| `gerritMaster.service.http.port` | Port over which to expose HTTP | `80` |
-| `gerritMaster.ingress.host` | REQUIRED: Host name to use for the Ingress (required for Ingress) | `nil` |
-| `gerritMaster.ingress.additionalAnnotations` | Additional annotations for the Ingress | `nil` |
-| `gerritMaster.ingress.tls.enabled` | Whether to enable TLS termination in the Ingress | `false` |
-| `gerritMaster.ingress.tls.cert` | Public SSL server certificate | `-----BEGIN CERTIFICATE-----` |
-| `gerritMaster.ingress.tls.key` | Private SSL server certificate | `-----BEGIN RSA PRIVATE KEY-----` |
-| `gerritMaster.keystore` | base64-encoded Java keystore (`cat keystore.jks | base64`) to be used by Gerrit, when using SSL | `nil` |
-| `gerritMaster.plugins.packaged` | List of Gerrit plugins that are packaged into the Gerrit-war-file to install | `["commit-message-length-validator", "download-commands", "replication", "reviewnotes"]` |
-| `gerritMaster.plugins.downloaded` | List of Gerrit plugins that will be downloaded | `nil` |
-| `gerritMaster.plugins.downloaded[0].name` | Name of plugin | `nil` |
-| `gerritMaster.plugins.downloaded[0].url` | Download url of plugin | `nil` |
-| `gerritMaster.plugins.downloaded[0].sha1` | SHA1 sum of plugin jar used to ensure file integrity and version (optional) | `nil` |
-| `gerritMaster.plugins.cache.enabled` | Whether to cache downloaded plugins | `false` |
-| `gerritMaster.plugins.cache.size` | Size of the volume used to store cached plugins | `1Gi` |
-| `gerritMaster.config.gerrit` | The contents of the gerrit.config | [see here](#Gerrit-config-files) |
-| `gerritMaster.config.secure` | The contents of the secure.config | [see here](#Gerrit-config-files) |
-| `gerritMaster.config.replication` | The contents of the replication.config | [see here](#Gerrit-config-files) |
+| Parameter | Description | Default |
+|----------------------------------------|-------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------|
+| `gerrit.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` |
+| `gerrit.images.gerrit` | Image name of the Gerrit container image | `k8s-gerrit/gerrit` |
+| `gerrit.replicas` | Number of replica pods to deploy | `1` |
+| `gerrit.updatePartition` | Number of pods to update simultaneously | `1` |
+| `gerrit.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
+| | | `requests.memory: 5Gi` |
+| | | `limits.cpu: 1` |
+| | | `limits.memory: 6Gi` |
+| `gerrit.persistence.enabled` | Whether to persist the Gerrit site | `true` |
+| `gerrit.persistence.size` | Storage size for persisted Gerrit site | `10Gi` |
+| `gerrit.service.type` | Which kind of Service to deploy | `NodePort` |
+| `gerrit.service.http.port` | Port over which to expose HTTP | `80` |
+| `gerrit.ingress.host` | REQUIRED: Host name to use for the Ingress (required for Ingress) | `nil` |
+| `gerrit.ingress.additionalAnnotations` | Additional annotations for the Ingress | `nil` |
+| `gerrit.ingress.tls.enabled` | Whether to enable TLS termination in the Ingress | `false` |
+| `gerrit.ingress.tls.cert` | Public SSL server certificate | `-----BEGIN CERTIFICATE-----` |
+| `gerrit.ingress.tls.key` | Private SSL server certificate | `-----BEGIN RSA PRIVATE KEY-----` |
+| `gerrit.keystore` | base64-encoded Java keystore (`cat keystore.jks | base64`) to be used by Gerrit, when using SSL | `nil` |
+| `gerrit.plugins.packaged` | List of Gerrit plugins that are packaged into the Gerrit-war-file to install | `["commit-message-length-validator", "download-commands", "replication", "reviewnotes"]` |
+| `gerrit.plugins.downloaded` | List of Gerrit plugins that will be downloaded | `nil` |
+| `gerrit.plugins.downloaded[0].name` | Name of plugin | `nil` |
+| `gerrit.plugins.downloaded[0].url` | Download url of plugin | `nil` |
+| `gerrit.plugins.downloaded[0].sha1` | SHA1 sum of plugin jar used to ensure file integrity and version (optional) | `nil` |
+| `gerrit.plugins.cache.enabled` | Whether to cache downloaded plugins | `false` |
+| `gerrit.plugins.cache.size` | Size of the volume used to store cached plugins | `1Gi` |
+| `gerrit.config.gerrit` | The contents of the gerrit.config | [see here](#Gerrit-config-files) |
+| `gerrit.config.secure` | The contents of the secure.config | [see here](#Gerrit-config-files) |
+| `gerrit.config.replication` | The contents of the replication.config | [see here](#Gerrit-config-files) |
### Gerrit config files
-The gerrit-master chart provides a ConfigMap containing the `gerrit.config` as well
+The gerrit chart provides a ConfigMap containing the `gerrit.config` as well
as `replication.config` and a Secret containing the `secure.config` to configure
the Gerrit installation in the Gerrit component. The content of the config files
-can be set in the `values.yaml` under the keys `gerritMaster.config.gerrit`,
-`gerritMaster.config.replication` and `gerritMaster.config.secure` respectively.
+can be set in the `values.yaml` under the keys `gerrit.config.gerrit`,
+`gerrit.config.replication` and `gerrit.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 Gerrit to work as
@@ -248,7 +248,7 @@
## Upgrading the Chart
-To upgrade an existing installation of the gerrit-master chart, e.g. to install
+To upgrade an existing installation of the gerrit chart, e.g. to install
a newer chart version or to use an updated custom `values.yaml`-file, execute
the following command:
@@ -256,7 +256,7 @@
cd $(git rev-parse --show-toplevel)/helm-charts
helm upgrade \
<release-name> \
- ./gerrit-master \ # path to chart
+ ./gerrit \ # path to chart
-f <path-to-custom-values>.yaml
```
diff --git a/helm-charts/gerrit-master/docs/nfs-provisioner.md b/helm-charts/gerrit/docs/nfs-provisioner.md
similarity index 90%
rename from helm-charts/gerrit-master/docs/nfs-provisioner.md
rename to helm-charts/gerrit/docs/nfs-provisioner.md
index 412a529..9e83d47 100644
--- a/helm-charts/gerrit-master/docs/nfs-provisioner.md
+++ b/helm-charts/gerrit/docs/nfs-provisioner.md
@@ -20,14 +20,14 @@
A custom `values.yaml`-file containing a configuration tested with the
gerrit charts can be found in the `supplements/nfs`-directory in the
-gerrit-master chart's root directory. In addition a file stating the tested
+gerrit 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-master/supplements/nfs
+cd $(git rev-parse --show-toplevel)/helm-charts/gerrit/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-master chart:
+the gerrit 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-master chart for `storageClasses.shared.name`
+ one defined in the gerrit 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-master/supplements/nfs/VERSION b/helm-charts/gerrit/supplements/nfs/VERSION
similarity index 100%
rename from helm-charts/gerrit-master/supplements/nfs/VERSION
rename to helm-charts/gerrit/supplements/nfs/VERSION
diff --git a/helm-charts/gerrit-master/supplements/nfs/values.yaml b/helm-charts/gerrit/supplements/nfs/values.yaml
similarity index 92%
rename from helm-charts/gerrit-master/supplements/nfs/values.yaml
rename to helm-charts/gerrit/supplements/nfs/values.yaml
index 05163c3..a413d8a 100644
--- a/helm-charts/gerrit-master/supplements/nfs/values.yaml
+++ b/helm-charts/gerrit/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-master chart for `storageClasses.shared.name`
+ # gerrit chart for `storageClasses.shared.name`
name: shared-storage
parameters:
# Required!
diff --git a/helm-charts/gerrit/templates/NOTES.txt b/helm-charts/gerrit/templates/NOTES.txt
new file mode 100644
index 0000000..7b6d808
--- /dev/null
+++ b/helm-charts/gerrit/templates/NOTES.txt
@@ -0,0 +1,4 @@
+A primary Gerrit instance has been deployed.
+==================================
+
+Gerrit may be accessed under: {{ .Values.gerrit.ingress.host }}
diff --git a/helm-charts/gerrit-master/templates/_helpers.tpl b/helm-charts/gerrit/templates/_helpers.tpl
similarity index 94%
rename from helm-charts/gerrit-master/templates/_helpers.tpl
rename to helm-charts/gerrit/templates/_helpers.tpl
index 44b8af8..bace6fe 100644
--- a/helm-charts/gerrit-master/templates/_helpers.tpl
+++ b/helm-charts/gerrit/templates/_helpers.tpl
@@ -1,7 +1,7 @@
{{/*
Create chart name and version as used by the chart label.
*/}}
-{{- define "gerrit-master.chart" -}}
+{{- define "gerrit.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/templates/gerrit.configmap.yaml b/helm-charts/gerrit/templates/gerrit.configmap.yaml
new file mode 100644
index 0000000..b14bd30
--- /dev/null
+++ b/helm-charts/gerrit/templates/gerrit.configmap.yaml
@@ -0,0 +1,36 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ .Release.Name }}-gerrit-configmap
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+data:
+ gerrit.config: |-
+{{ .Values.gerrit.config.gerrit | indent 4 }}
+ replication.config: |-
+{{ .Values.gerrit.config.replication | indent 4 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ .Release.Name }}-gerrit-init-configmap
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+data:
+ gerrit-init.yaml: |-
+ pluginCache: {{ .Values.gerrit.plugins.cache.enabled }}
+ pluginCacheDir: /var/mnt/plugins
+ {{- if .Values.gerrit.plugins.packaged }}
+ packagedPlugins:
+{{ toYaml .Values.gerrit.plugins.packaged | indent 6}}
+ {{- end }}
+ {{- if .Values.gerrit.plugins.downloaded }}
+ downloadedPlugins:
+{{ toYaml .Values.gerrit.plugins.downloaded | indent 6 }}
+ {{- end }}
diff --git a/helm-charts/gerrit/templates/gerrit.ingress.yaml b/helm-charts/gerrit/templates/gerrit.ingress.yaml
new file mode 100644
index 0000000..645a47c
--- /dev/null
+++ b/helm-charts/gerrit/templates/gerrit.ingress.yaml
@@ -0,0 +1,28 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ .Release.Name }}-gerrit-ingress
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ annotations:
+ nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.gerrit.ingress.maxBodySize | default "50m" }}
+ {{- if .Values.gerrit.ingress.additionalAnnotations }}
+{{ toYaml .Values.gerrit.ingress.additionalAnnotations | indent 4 }}
+ {{- end }}
+spec:
+ {{ if .Values.gerrit.ingress.tls.enabled -}}
+ tls:
+ - hosts:
+ - {{ .Values.gerrit.ingress.host }}
+ secretName: {{ .Release.Name }}-gerrit-tls-secret
+ {{- end }}
+ rules:
+ - host: {{required "A host URL is required for the Gerrit Ingress. Please set 'gerrit.ingress.host'" .Values.gerrit.ingress.host }}
+ http:
+ paths:
+ - backend:
+ serviceName: {{ .Release.Name }}-gerrit-service
+ servicePort: {{ .Values.gerrit.service.http.port }}
diff --git a/helm-charts/gerrit/templates/gerrit.secrets.yaml b/helm-charts/gerrit/templates/gerrit.secrets.yaml
new file mode 100644
index 0000000..c9707d2
--- /dev/null
+++ b/helm-charts/gerrit/templates/gerrit.secrets.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Release.Name }}-gerrit-secure-config
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+data:
+ {{ if .Values.gerrit.keystore -}}
+ keystore: {{ .Values.gerrit.keystore }}
+ {{- end }}
+ secure.config: {{ .Values.gerrit.config.secure | b64enc }}
+type: Opaque
+---
+{{ if .Values.gerrit.ingress.tls.enabled -}}
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Release.Name }}-gerrit-tls-secret
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+type: kubernetes.io/tls
+data:
+ {{ with .Values.gerrit.ingress.tls -}}
+ tls.crt: {{ .cert | b64enc }}
+ tls.key: {{ .key | b64enc }}
+ {{- end }}
+{{- end }}
diff --git a/helm-charts/gerrit/templates/gerrit.service.yaml b/helm-charts/gerrit/templates/gerrit.service.yaml
new file mode 100644
index 0000000..4fab1ef
--- /dev/null
+++ b/helm-charts/gerrit/templates/gerrit.service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ .Release.Name }}-gerrit-service
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ {{ with .Values.gerrit.service }}
+ ports:
+ - name: http
+ port: {{ .http.port }}
+ targetPort: 8080
+ selector:
+ app: gerrit
+ type: {{ .type }}
+ {{- end }}
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
similarity index 71%
rename from helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
rename to helm-charts/gerrit/templates/gerrit.stateful-set.yaml
index 9907f28..432330f 100644
--- a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
+++ b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
@@ -1,26 +1,26 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
- name: {{ .Release.Name }}-gerrit-master-stateful-set
+ name: {{ .Release.Name }}-gerrit-stateful-set
labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
- serviceName: {{ .Release.Name }}-gerrit-master-service
- replicas: {{ .Values.gerritMaster.replicas | default 1 }}
+ serviceName: {{ .Release.Name }}-gerrit-service
+ replicas: {{ .Values.gerrit.replicas | default 1 }}
updateStrategy:
rollingUpdate:
- partition: {{ .Values.gerritMaster.updatePartition }}
+ partition: {{ .Values.gerrit.updatePartition }}
selector:
matchLabels:
- app: gerrit-master
+ app: gerrit
template:
metadata:
labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
annotations:
@@ -51,7 +51,7 @@
- name: gerrit-site
mountPath: "/var/gerrit"
- name: gerrit-init
- image: {{ template "registry" . }}{{ .Values.gerritMaster.images.gerritInit }}:{{ .Values.images.version }}
+ image: {{ template "registry" . }}{{ .Values.gerrit.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- /bin/ash
@@ -59,7 +59,7 @@
args:
- |
symlink_config_to_site(){
- {{ if .Values.gerritMaster.keystore -}}
+ {{ if .Values.gerrit.keystore -}}
ln -s /var/config/keystore /var/gerrit/etc/keystore
{{- end }}
ln -sf /var/config/gerrit.config /var/gerrit/etc/gerrit.config
@@ -86,24 +86,24 @@
- name: gerrit-init-config
mountPath: "/var/config/gerrit-init.yaml"
subPath: gerrit-init.yaml
- {{- if and .Values.gerritMaster.plugins.cache.enabled .Values.gerritMaster.plugins.downloaded }}
+ {{- if and .Values.gerrit.plugins.cache.enabled .Values.gerrit.plugins.downloaded }}
- name: gerrit-plugin-cache
mountPath: "/var/mnt/plugins"
{{- end }}
- name: gerrit-config
mountPath: "/var/config/gerrit.config"
subPath: gerrit.config
- - name: gerrit-master-secure-config
+ - name: gerrit-secure-config
mountPath: "/var/config/secure.config"
subPath: secure.config
- {{ if .Values.gerritMaster.keystore -}}
- - name: gerrit-master-secure-config
+ {{ if .Values.gerrit.keystore -}}
+ - name: gerrit--secure-config
mountPath: "/var/config/keystore"
subPath: keystore
{{- end }}
containers:
- - name: gerrit-master
- image: {{ template "registry" . }}{{ .Values.gerritMaster.images.gerritMaster }}:{{ .Values.images.version }}
+ - name: gerrit
+ image: {{ template "registry" . }}{{ .Values.gerrit.images.gerrit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
ports:
- name: gerrit-port
@@ -119,32 +119,32 @@
- name: gerrit-config
mountPath: "/var/config/replication.config"
subPath: replication.config
- - name: gerrit-master-secure-config
+ - name: gerrit-secure-config
mountPath: "/var/config/secure.config"
subPath: secure.config
- {{ if .Values.gerritMaster.keystore -}}
- - name: gerrit-master-secure-config
+ {{ if .Values.gerrit.keystore -}}
+ - name: gerrit-secure-config
mountPath: "/var/config/keystore"
subPath: keystore
{{- end }}
resources:
-{{ toYaml .Values.gerritMaster.resources | indent 10 }}
+{{ toYaml .Values.gerrit.resources | indent 10 }}
livenessProbe:
httpGet:
path: /config/server/version
port: gerrit-port
-{{ toYaml .Values.gerritMaster.livenessProbe | indent 10 }}
+{{ toYaml .Values.gerrit.livenessProbe | indent 10 }}
readinessProbe:
httpGet:
path: /config/server/version
port: gerrit-port
-{{ toYaml .Values.gerritMaster.readinessProbe | indent 10 }}
+{{ toYaml .Values.gerrit.readinessProbe | indent 10 }}
volumes:
- {{ if not .Values.gerritMaster.persistence.enabled -}}
+ {{ if not .Values.gerrit.persistence.enabled -}}
- name: gerrit-site
emptyDir: {}
{{- end }}
- {{- if and .Values.gerritMaster.plugins.cache.enabled .Values.gerritMaster.plugins.downloaded }}
+ {{- if and .Values.gerrit.plugins.cache.enabled .Values.gerrit.plugins.downloaded }}
- name: gerrit-plugin-cache
persistentVolumeClaim:
claimName: {{ .Release.Name }}-plugin-cache-pvc
@@ -161,17 +161,17 @@
name: {{ .Release.Name }}-gerrit-init-configmap
- name: gerrit-config
configMap:
- name: {{ .Release.Name }}-gerrit-master-configmap
- - name: gerrit-master-secure-config
+ name: {{ .Release.Name }}-gerrit-configmap
+ - name: gerrit-secure-config
secret:
- secretName: {{ .Release.Name }}-gerrit-master-secure-config
+ secretName: {{ .Release.Name }}-gerrit-secure-config
volumeClaimTemplates:
- {{ if .Values.gerritMaster.persistence.enabled -}}
+ {{ if .Values.gerrit.persistence.enabled -}}
- metadata:
name: gerrit-site
labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
@@ -179,6 +179,6 @@
- ReadWriteOnce
resources:
requests:
- storage: {{ .Values.gerritMaster.persistence.size }}
+ storage: {{ .Values.gerrit.persistence.size }}
storageClassName: {{ .Values.storageClasses.default.name }}
{{- end }}
diff --git a/helm-charts/gerrit/templates/gerrit.storage.yaml b/helm-charts/gerrit/templates/gerrit.storage.yaml
new file mode 100644
index 0000000..60d0a0d
--- /dev/null
+++ b/helm-charts/gerrit/templates/gerrit.storage.yaml
@@ -0,0 +1,18 @@
+{{- if and .Values.gerrit.plugins.cache.enabled .Values.gerrit.plugins.downloaded }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+ name: {{ .Release.Name }}-plugin-cache-pvc
+ labels:
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ accessModes:
+ - ReadWriteMany
+ resources:
+ requests:
+ storage: {{ .Values.gerrit.plugins.cache.size }}
+ storageClassName: {{ .Values.storageClasses.shared.name }}
+{{- end }}
diff --git a/helm-charts/gerrit-master/templates/git-gc.cronjob.yaml b/helm-charts/gerrit/templates/git-gc.cronjob.yaml
similarity index 96%
rename from helm-charts/gerrit-master/templates/git-gc.cronjob.yaml
rename to helm-charts/gerrit/templates/git-gc.cronjob.yaml
index a0bf240..687e619 100644
--- a/helm-charts/gerrit-master/templates/git-gc.cronjob.yaml
+++ b/helm-charts/gerrit/templates/git-gc.cronjob.yaml
@@ -4,7 +4,7 @@
name: {{ .Release.Name }}-git-gc
labels:
app: git-gc
- chart: {{ template "gerrit-master.chart" . }}
+ chart: {{ template "gerrit.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
diff --git a/helm-charts/gerrit-master/templates/git-gc.storage.yaml b/helm-charts/gerrit/templates/git-gc.storage.yaml
similarity index 89%
rename from helm-charts/gerrit-master/templates/git-gc.storage.yaml
rename to helm-charts/gerrit/templates/git-gc.storage.yaml
index 56954aa..bc22aa2 100644
--- a/helm-charts/gerrit-master/templates/git-gc.storage.yaml
+++ b/helm-charts/gerrit/templates/git-gc.storage.yaml
@@ -5,7 +5,7 @@
name: {{ .Release.Name }}-git-gc-logs-pvc
labels:
app: git-gc
- chart: {{ template "gerrit-master.chart" . }}
+ chart: {{ template "gerrit.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-master/templates/git-repositories.storage.yaml b/helm-charts/gerrit/templates/git-repositories.storage.yaml
similarity index 85%
rename from helm-charts/gerrit-master/templates/git-repositories.storage.yaml
rename to helm-charts/gerrit/templates/git-repositories.storage.yaml
index cc6d9cb..64a93d8 100644
--- a/helm-charts/gerrit-master/templates/git-repositories.storage.yaml
+++ b/helm-charts/gerrit/templates/git-repositories.storage.yaml
@@ -4,8 +4,8 @@
metadata:
name: {{ .Release.Name }}-git-filesystem-pvc
labels:
- app: gerrit-master
- chart: {{ template "gerrit-master.chart" . }}
+ app: gerrit
+ chart: {{ template "gerrit.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
diff --git a/helm-charts/gerrit-master/templates/image-pull.secret.yaml b/helm-charts/gerrit/templates/image-pull.secret.yaml
similarity index 100%
rename from helm-charts/gerrit-master/templates/image-pull.secret.yaml
rename to helm-charts/gerrit/templates/image-pull.secret.yaml
diff --git a/helm-charts/gerrit-master/templates/storageclasses.yaml b/helm-charts/gerrit/templates/storageclasses.yaml
similarity index 91%
rename from helm-charts/gerrit-master/templates/storageclasses.yaml
rename to helm-charts/gerrit/templates/storageclasses.yaml
index 0311e8a..14a2ffc 100644
--- a/helm-charts/gerrit-master/templates/storageclasses.yaml
+++ b/helm-charts/gerrit/templates/storageclasses.yaml
@@ -4,7 +4,7 @@
metadata:
name: {{ .Values.storageClasses.default.name }}
labels:
- chart: {{ template "gerrit-master.chart" . }}
+ chart: {{ template "gerrit.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-master.chart" . }}
+ chart: {{ template "gerrit.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-master/values.yaml b/helm-charts/gerrit/values.yaml
similarity index 94%
rename from helm-charts/gerrit-master/values.yaml
rename to helm-charts/gerrit/values.yaml
index bd0f9ca..76947e0 100644
--- a/helm-charts/gerrit-master/values.yaml
+++ b/helm-charts/gerrit/values.yaml
@@ -5,7 +5,7 @@
ImagePullSecret:
# Leave blank, if no ImagePullSecret is needed.
name: image-pull-secret
- # If set to false, the gerrit-master chart expects either a ImagePullSecret
+ # If set to false, the gerrit chart expects either a ImagePullSecret
# with the name configured above to be present on the cluster or that no
# credentials are needed.
create: false
@@ -68,10 +68,10 @@
size: 1Gi
-gerritMaster:
+gerrit:
images:
gerritInit: k8sgerrit/gerrit-init
- gerritMaster: k8sgerrit/gerrit-master
+ gerrit: k8sgerrit/gerrit
replicas: 1
updatePartition: 0
@@ -121,7 +121,7 @@
-----END RSA PRIVATE KEY-----
- # `gerritMaster.keystore` expects a base64-encoded Java-keystore
+ # `gerrit.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:
@@ -150,7 +150,7 @@
gerrit: |-
[gerrit]
basePath = git # FIXED
- serverId = gerrit-master-1
+ serverId = gerrit-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
@@ -180,7 +180,7 @@
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 'gerritMaster.resources.limits.memory'. Also
+ # Has to be lower than 'gerrit.resources.limits.memory'. Also
# consider memories used by other applications in the container.
javaOptions = -Xmx4g
diff --git a/supplements/gerrit-master.minikube.values.yaml b/supplements/gerrit-master.minikube.values.yaml
index d8bd646..a3bb990 100644
--- a/supplements/gerrit-master.minikube.values.yaml
+++ b/supplements/gerrit-master.minikube.values.yaml
@@ -19,7 +19,7 @@
persistence:
enabled: false
-gerritMaster:
+gerrit:
resources:
requests:
@@ -37,14 +37,14 @@
periodSeconds: 5
ingress:
- host: master.gerrit
+ host: primary.gerrit
config:
gerrit: |-
[gerrit]
basePath = git
- serverId = gerrit-master-1
- canonicalWebUrl = http://master.gerrit
+ serverId = gerrit-1
+ canonicalWebUrl = http://primary.gerrit
[index]
type = LUCENE
[auth]
diff --git a/supplements/nfs.minikube.values.yaml b/supplements/nfs.minikube.values.yaml
index 87a2cbc..dee0761 100644
--- a/supplements/nfs.minikube.values.yaml
+++ b/supplements/nfs.minikube.values.yaml
@@ -4,7 +4,7 @@
create: true
defaultClass: false
# The name of the StorageClass has to be the same as the one defined in the
- # gerrit-master chart for `storageClasses.shared.name`
+ # gerrit chart for `storageClasses.shared.name`
name: shared-storage
parameters:
# Required!
@@ -17,4 +17,4 @@
memory: 256Mi
limits:
cpu: 100m
- memory: 256Mi
\ No newline at end of file
+ memory: 256Mi
diff --git a/tests/conftest.py b/tests/conftest.py
index 497ae0f..c429b33 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -328,15 +328,13 @@
@pytest.fixture(scope="session")
-def gerrit_master_image(
+def gerrit_image(
request, container_images, docker_build, docker_push, base_image, gerrit_base_image
):
- gerrit_master_image = docker_build(
- container_images["gerrit-master"], "gerrit-master"
- )
+ gerrit_image = docker_build(container_images["gerrit"], "gerrit")
if request.config.getoption("--push"):
- docker_push("gerrit-master")
- return gerrit_master_image
+ docker_push("gerrit")
+ return gerrit_image
@pytest.fixture(scope="session")
diff --git a/tests/container-images/gerrit-master/test_container_build_gerrit_master.py b/tests/container-images/gerrit/test_container_build_gerrit.py
similarity index 85%
rename from tests/container-images/gerrit-master/test_container_build_gerrit_master.py
rename to tests/container-images/gerrit/test_container_build_gerrit.py
index 6c7c784..a2c3dd5 100644
--- a/tests/container-images/gerrit-master/test_container_build_gerrit_master.py
+++ b/tests/container-images/gerrit/test_container_build_gerrit.py
@@ -16,7 +16,7 @@
@pytest.mark.structure
-def test_build_gerrit_master(gerrit_master_image, tag_of_cached_container):
+def test_build_gerrit(gerrit_image, tag_of_cached_container):
if tag_of_cached_container:
pytest.skip("Cached image used for testing. Build will not be tested.")
- assert gerrit_master_image.id is not None
+ assert gerrit_image.id is not None
diff --git a/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py b/tests/container-images/gerrit/test_container_integration_gerrit.py
similarity index 83%
rename from tests/container-images/gerrit-master/test_container_integration_gerrit_master.py
rename to tests/container-images/gerrit/test_container_integration_gerrit.py
index 0cbdaf4..1c4ff02 100644
--- a/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py
+++ b/tests/container-images/gerrit/test_container_integration_gerrit.py
@@ -23,16 +23,12 @@
@pytest.fixture(scope="module")
def tmp_dir(tmp_path_factory):
- return tmp_path_factory.mktemp("gerrit-master-test")
+ return tmp_path_factory.mktemp("gerrit-test")
@pytest.fixture(scope="class")
def container_run(
- docker_client,
- docker_network,
- tmp_dir,
- gerrit_master_image,
- gerrit_container_factory,
+ docker_client, docker_network, tmp_dir, gerrit_image, gerrit_container_factory
):
configs = {
"gerrit.config": """
@@ -55,7 +51,7 @@
""",
}
test_setup = gerrit_container_factory(
- docker_client, docker_network, tmp_dir, gerrit_master_image, configs, 8081
+ docker_client, docker_network, tmp_dir, gerrit_image, configs, 8081
)
test_setup.start()
@@ -73,9 +69,9 @@
@pytest.mark.incremental
@pytest.mark.integration
@pytest.mark.slow
-class TestGerritMasterStartScript:
+class TestGerritStartScript:
@pytest.mark.timeout(60)
- def test_gerrit_master_gerrit_starts_up(self, container_run):
+ def test_gerrit_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)
@@ -83,7 +79,7 @@
while not wait_for_gerrit_start:
continue
- def test_gerrit_master_custom_gerrit_config_available(
+ def test_gerrit_custom_gerrit_config_available(
self, container_run, config_file_to_test
):
exit_code, output = container_run.exec_run(
@@ -95,7 +91,7 @@
assert output == "True"
@pytest.mark.timeout(60)
- def test_gerrit_master_httpd_is_responding(self, container_run):
+ def test_gerrit_httpd_is_responding(self, container_run):
status = None
while not status == 200:
try:
diff --git a/tests/container-images/gerrit-master/test_container_structure_gerrit_master.py b/tests/container-images/gerrit/test_container_structure_gerrit.py
similarity index 82%
rename from tests/container-images/gerrit-master/test_container_structure_gerrit_master.py
rename to tests/container-images/gerrit/test_container_structure_gerrit.py
index 51ead4d..7ece25e 100755
--- a/tests/container-images/gerrit-master/test_container_structure_gerrit_master.py
+++ b/tests/container-images/gerrit/test_container_structure_gerrit.py
@@ -18,22 +18,22 @@
@pytest.fixture(scope="module")
-def container_run(docker_client, container_endless_run_factory, gerrit_master_image):
- container_run = container_endless_run_factory(docker_client, gerrit_master_image)
+def container_run(docker_client, container_endless_run_factory, gerrit_image):
+ container_run = container_endless_run_factory(docker_client, gerrit_image)
yield container_run
container_run.stop(timeout=1)
# pylint: disable=E1101
@pytest.mark.structure
-def test_gerrit_master_inherits_from_gerrit_base(gerrit_master_image):
+def test_gerrit_inherits_from_gerrit_base(gerrit_image):
assert utils.check_if_ancestor_image_is_inherited(
- gerrit_master_image, "gerrit-base:latest"
+ gerrit_image, "gerrit-base:latest"
)
@pytest.mark.docker
@pytest.mark.structure
-def test_gerrit_master_contains_start_script(container_run):
+def test_gerrit_contains_start_script(container_run):
exit_code, _ = container_run.exec_run("test -f /var/tools/start")
assert exit_code == 0
diff --git a/tests/helm-charts/gerrit-master/conftest.py b/tests/helm-charts/gerrit/conftest.py
similarity index 78%
rename from tests/helm-charts/gerrit-master/conftest.py
rename to tests/helm-charts/gerrit/conftest.py
index 72cda78..2091700 100644
--- a/tests/helm-charts/gerrit-master/conftest.py
+++ b/tests/helm-charts/gerrit/conftest.py
@@ -22,22 +22,22 @@
import utils
-GERRIT_MASTER_STARTUP_TIMEOUT = 240
+GERRIT_STARTUP_TIMEOUT = 240
@pytest.fixture(scope="session")
-def gerrit_master_deployment_factory(
+def gerrit_deployment_factory(
request,
repository_root,
test_cluster,
docker_tag,
- gerrit_master_image,
+ gerrit_image,
gitgc_image,
gerrit_init_image,
):
def install_chart(chart_opts, wait=True):
- chart_path = os.path.join(repository_root, "helm-charts", "gerrit-master")
- chart_name = "gerrit-master-" + utils.create_random_string()
+ chart_path = os.path.join(repository_root, "helm-charts", "gerrit")
+ chart_name = "gerrit-" + utils.create_random_string()
namespace_name = utils.create_random_string()
test_cluster.create_namespace(namespace_name)
@@ -77,16 +77,13 @@
@pytest.fixture(scope="module")
-def gerrit_master_deployment(
- request, docker_tag, test_cluster, gerrit_master_deployment_factory
-):
+def gerrit_deployment(request, docker_tag, test_cluster, gerrit_deployment_factory):
chart_opts = {
"images.registry.name": request.config.getoption("--registry"),
"images.version": docker_tag,
- "gerritMaster.ingress.host": "master.%s"
- % request.config.getoption("--ingress-url"),
+ "gerrit.ingress.host": "primary.%s" % request.config.getoption("--ingress-url"),
}
- chart = gerrit_master_deployment_factory(chart_opts)
+ chart = gerrit_deployment_factory(chart_opts)
yield chart
@@ -95,17 +92,16 @@
@pytest.fixture(scope="module")
-def gerrit_master_ready_deployment(gerrit_master_deployment):
+def gerrit_ready_deployment(gerrit_deployment):
- pod_labels = "app=gerrit-master,release=%s" % gerrit_master_deployment["name"]
+ pod_labels = "app=gerrit,release=%s" % gerrit_deployment["name"]
finished_in_time = utils.wait_for_pod_readiness(
- pod_labels, timeout=GERRIT_MASTER_STARTUP_TIMEOUT
+ pod_labels, timeout=GERRIT_STARTUP_TIMEOUT
)
if not finished_in_time:
raise utils.TimeOutException(
- "Gerrit master pod was not ready in time (%d s)."
- % GERRIT_MASTER_STARTUP_TIMEOUT
+ "Gerrit pod was not ready in time (%d s)." % GERRIT_STARTUP_TIMEOUT
)
yield finished_in_time
diff --git a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_plugins.py b/tests/helm-charts/gerrit/test_chart_gerrit_plugins.py
similarity index 68%
rename from tests/helm-charts/gerrit-master/test_chart_gerrit_master_plugins.py
rename to tests/helm-charts/gerrit/test_chart_gerrit_plugins.py
index 467a8ef..a70d547 100644
--- a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_plugins.py
+++ b/tests/helm-charts/gerrit/test_chart_gerrit_plugins.py
@@ -35,7 +35,7 @@
for plugin in PLUGINS:
url = (
"https://gerrit-ci.gerritforge.com/view/Plugins-stable-{gerrit_version}/"
- "job/plugin-{plugin}-bazel-master-stable-{gerrit_version}/lastSuccessfulBuild/"
+ "job/plugin-{plugin}-bazel-stable-{gerrit_version}/lastSuccessfulBuild/"
"artifact/bazel-bin/plugins/{plugin}/{plugin}.jar"
).format(plugin=plugin, gerrit_version=GERRIT_VERSION)
jar = requests.get(url, verify=False).content
@@ -46,15 +46,13 @@
@pytest.fixture(scope="class")
-def gerrit_master_deployment_with_plugins_factory(
- request, gerrit_master_deployment_factory
-):
+def gerrit_deployment_with_plugins_factory(request, gerrit_deployment_factory):
def install_chart(chart_opts):
- chart = gerrit_master_deployment_factory(chart_opts)
- pod_labels = "app=gerrit-master,release=%s" % chart["name"]
+ chart = gerrit_deployment_factory(chart_opts)
+ pod_labels = "app=gerrit,release=%s" % chart["name"]
finished_in_time = utils.wait_for_pod_readiness(pod_labels, timeout=300)
if not finished_in_time:
- raise utils.TimeOutException("Gerrit master pod was not ready in time.")
+ raise utils.TimeOutException("Gerrit pod was not ready in time.")
return chart
@@ -66,8 +64,8 @@
params=[["replication"], ["replication", "download-commands"]],
ids=["single-packaged-plugin", "multiple-packaged-plugins"],
)
-def gerrit_master_deployment_with_packaged_plugins(
- request, docker_tag, test_cluster, gerrit_master_deployment_with_plugins_factory
+def gerrit_deployment_with_packaged_plugins(
+ request, docker_tag, test_cluster, gerrit_deployment_with_plugins_factory
):
plugins_opts_string = "{%s}" % (",".join(request.param))
@@ -75,11 +73,10 @@
"images.registry.name": request.config.getoption("--registry"),
"images.version": docker_tag,
"images.ImagePullPolicy": "IfNotPresent",
- "gerritMaster.ingress.host": "master.%s"
- % request.config.getoption("--ingress-url"),
- "gerritMaster.plugins.packaged": plugins_opts_string,
+ "gerrit.ingress.host": "primary.%s" % request.config.getoption("--ingress-url"),
+ "gerrit.plugins.packaged": plugins_opts_string,
}
- chart = gerrit_master_deployment_with_plugins_factory(chart_opts)
+ chart = gerrit_deployment_with_plugins_factory(chart_opts)
chart["installed_plugins"] = request.param
yield chart
@@ -91,30 +88,25 @@
@pytest.fixture(
scope="class", params=[1, 2], ids=["single-other-plugin", "multiple-other-plugins"]
)
-def gerrit_master_deployment_with_other_plugins(
+def gerrit_deployment_with_other_plugins(
request,
docker_tag,
test_cluster,
plugin_list,
- gerrit_master_deployment_with_plugins_factory,
+ gerrit_deployment_with_plugins_factory,
):
chart_opts = {
"images.registry.name": request.config.getoption("--registry"),
"images.version": docker_tag,
"images.ImagePullPolicy": "IfNotPresent",
- "gerritMaster.ingress.host": "master.%s"
- % request.config.getoption("--ingress-url"),
+ "gerrit.ingress.host": "primary.%s" % request.config.getoption("--ingress-url"),
}
selected_plugins = plugin_list[: request.param]
for counter, plugin in enumerate(selected_plugins):
- chart_opts["gerritMaster.plugins.downloaded[%d].name" % counter] = plugin[
- "name"
- ]
- chart_opts["gerritMaster.plugins.downloaded[%d].url" % counter] = plugin["url"]
- chart_opts["gerritMaster.plugins.downloaded[%d].sha1" % counter] = plugin[
- "sha1"
- ]
- chart = gerrit_master_deployment_with_plugins_factory(chart_opts)
+ chart_opts["gerrit.plugins.downloaded[%d].name" % counter] = plugin["name"]
+ chart_opts["gerrit.plugins.downloaded[%d].url" % counter] = plugin["url"]
+ chart_opts["gerrit.plugins.downloaded[%d].sha1" % counter] = plugin["sha1"]
+ chart = gerrit_deployment_with_plugins_factory(chart_opts)
chart["installed_plugins"] = selected_plugins
yield chart
@@ -123,21 +115,20 @@
@pytest.fixture()
-def gerrit_master_deployment_with_other_plugin_wrong_sha(
- request, docker_tag, test_cluster, plugin_list, gerrit_master_deployment_factory
+def gerrit_deployment_with_other_plugin_wrong_sha(
+ request, docker_tag, test_cluster, plugin_list, gerrit_deployment_factory
):
chart_opts = {
"images.registry.name": request.config.getoption("--registry"),
"images.version": docker_tag,
"images.ImagePullPolicy": "IfNotPresent",
- "gerritMaster.ingress.host": "master.%s"
- % request.config.getoption("--ingress-url"),
+ "gerrit.ingress.host": "primary.%s" % request.config.getoption("--ingress-url"),
}
plugin = plugin_list[0]
- chart_opts["gerritMaster.plugins.downloaded[0].name"] = plugin["name"]
- chart_opts["gerritMaster.plugins.downloaded[0].url"] = plugin["url"]
- chart_opts["gerritMaster.plugins.downloaded[0].sha1"] = "notAValidSha"
- chart = gerrit_master_deployment_factory(chart_opts, wait=False)
+ chart_opts["gerrit.plugins.downloaded[0].name"] = plugin["name"]
+ chart_opts["gerrit.plugins.downloaded[0].url"] = plugin["url"]
+ chart_opts["gerrit.plugins.downloaded[0].sha1"] = "notAValidSha"
+ chart = gerrit_deployment_factory(chart_opts, wait=False)
chart["installed_plugins"] = plugin
yield chart
@@ -169,7 +160,7 @@
@pytest.mark.incremental
@pytest.mark.integration
@pytest.mark.kubernetes
-class TestGerritMasterChartPackagedPluginInstall:
+class TestgerritChartPackagedPluginInstall:
def _assert_installed_plugins(self, expected_plugins, installed_plugins):
for plugin in expected_plugins:
assert plugin in installed_plugins
@@ -177,41 +168,38 @@
@pytest.mark.timeout(300)
def test_install_packaged_plugins(
- self, request, test_cluster, gerrit_master_deployment_with_packaged_plugins
+ self, request, test_cluster, gerrit_deployment_with_packaged_plugins
):
response = None
while not response:
try:
response = get_gerrit_plugin_list(
- "http://master.%s" % (request.config.getoption("--ingress-url"))
+ "http://primary.%s" % (request.config.getoption("--ingress-url"))
)
except requests.exceptions.ConnectionError:
time.sleep(1)
self._assert_installed_plugins(
- gerrit_master_deployment_with_packaged_plugins["installed_plugins"],
- response,
+ gerrit_deployment_with_packaged_plugins["installed_plugins"], response
)
@pytest.mark.timeout(300)
def test_install_packaged_plugins_are_removed_with_update(
- self, request, test_cluster, gerrit_master_deployment_with_packaged_plugins
+ self, request, test_cluster, gerrit_deployment_with_packaged_plugins
):
- chart = gerrit_master_deployment_with_packaged_plugins
+ chart = gerrit_deployment_with_packaged_plugins
chart["removed_plugin"] = chart["installed_plugins"].pop()
plugins_opts_string = "{%s}" % (",".join(chart["installed_plugins"]))
plugins_opts_string = plugins_opts_string if plugins_opts_string else "false"
update_chart(
- test_cluster.helm,
- chart,
- {"gerritMaster.plugins.packaged": plugins_opts_string},
+ test_cluster.helm, chart, {"gerrit.plugins.packaged": plugins_opts_string}
)
response = None
while True:
try:
response = get_gerrit_plugin_list(
- "http://master.%s" % (request.config.getoption("--ingress-url"))
+ "http://primary.%s" % (request.config.getoption("--ingress-url"))
)
if response is not None and chart["removed_plugin"] not in response:
break
@@ -226,23 +214,23 @@
@pytest.mark.incremental
@pytest.mark.integration
@pytest.mark.kubernetes
-class TestGerritMasterChartOtherPluginInstall:
+class TestgerritChartOtherPluginInstall:
def _remove_plugin_from_install_list(self, installed_plugins):
removed_plugin = installed_plugins.pop()
plugin_install_list = dict()
if installed_plugins:
for counter, plugin in enumerate(installed_plugins):
plugin_install_list[
- "gerritMaster.plugins.downloaded[%d].name" % counter
+ "gerrit.plugins.downloaded[%d].name" % counter
] = plugin["name"]
plugin_install_list[
- "gerritMaster.plugins.downloaded[%d].url" % counter
+ "gerrit.plugins.downloaded[%d].url" % counter
] = plugin["url"]
plugin_install_list[
- "gerritMaster.plugins.downloaded[%d].sha1" % counter
+ "gerrit.plugins.downloaded[%d].sha1" % counter
] = plugin["sha1"]
else:
- plugin_install_list["gerritMaster.plugins.downloaded"] = "false"
+ plugin_install_list["gerrit.plugins.downloaded"] = "false"
return plugin_install_list, removed_plugin, installed_plugins
def _assert_installed_plugins(self, expected_plugins, installed_plugins):
@@ -255,25 +243,25 @@
@pytest.mark.timeout(300)
def test_install_other_plugins(
- self, request, test_cluster, gerrit_master_deployment_with_other_plugins
+ self, request, test_cluster, gerrit_deployment_with_other_plugins
):
response = None
while not response:
try:
response = get_gerrit_plugin_list(
- "http://master.%s" % (request.config.getoption("--ingress-url"))
+ "http://primary.%s" % (request.config.getoption("--ingress-url"))
)
except requests.exceptions.ConnectionError:
continue
self._assert_installed_plugins(
- gerrit_master_deployment_with_other_plugins["installed_plugins"], response
+ gerrit_deployment_with_other_plugins["installed_plugins"], response
)
@pytest.mark.timeout(300)
def test_install_other_plugins_are_removed_with_update(
- self, request, test_cluster, gerrit_master_deployment_with_other_plugins
+ self, request, test_cluster, gerrit_deployment_with_other_plugins
):
- chart = gerrit_master_deployment_with_other_plugins
+ chart = gerrit_deployment_with_other_plugins
chart_opts, chart["removed_plugin"], chart[
"installed_plugin"
] = self._remove_plugin_from_install_list(chart["installed_plugins"])
@@ -283,7 +271,7 @@
while True:
try:
response = get_gerrit_plugin_list(
- "http://master.%s" % (request.config.getoption("--ingress-url"))
+ "http://primary.%s" % (request.config.getoption("--ingress-url"))
)
if (
response is not None
@@ -301,29 +289,27 @@
@pytest.mark.kubernetes
@pytest.mark.timeout(180)
def test_install_other_plugins_fails_wrong_sha(
- request, test_cluster, gerrit_master_deployment_with_other_plugin_wrong_sha
+ request, test_cluster, gerrit_deployment_with_other_plugin_wrong_sha
):
- pod_labels = "app=gerrit-master,release=%s" % (
- gerrit_master_deployment_with_other_plugin_wrong_sha["name"]
+ pod_labels = "app=gerrit,release=%s" % (
+ gerrit_deployment_with_other_plugin_wrong_sha["name"]
)
core_v1 = client.CoreV1Api()
pod_name = ""
while not pod_name:
pod_list = core_v1.list_namespaced_pod(
- namespace=gerrit_master_deployment_with_other_plugin_wrong_sha["namespace"],
+ namespace=gerrit_deployment_with_other_plugin_wrong_sha["namespace"],
watch=False,
label_selector=pod_labels,
)
if len(pod_list.items) > 1:
- raise RuntimeError(
- "Too many gerrit-master pods with the same release name."
- )
+ raise RuntimeError("Too many gerrit pods with the same release name.")
pod_name = pod_list.items[0].metadata.name
current_status = None
while not current_status:
pod = core_v1.read_namespaced_pod_status(
- pod_name, gerrit_master_deployment_with_other_plugin_wrong_sha["namespace"]
+ pod_name, gerrit_deployment_with_other_plugin_wrong_sha["namespace"]
)
if not pod.status.init_container_statuses:
time.sleep(1)
diff --git a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_setup.py b/tests/helm-charts/gerrit/test_chart_gerrit_setup.py
similarity index 65%
rename from tests/helm-charts/gerrit-master/test_chart_gerrit_master_setup.py
rename to tests/helm-charts/gerrit/test_chart_gerrit_setup.py
index cdbf0a7..d51cf2f 100644
--- a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_setup.py
+++ b/tests/helm-charts/gerrit/test_chart_gerrit_setup.py
@@ -19,11 +19,11 @@
@pytest.mark.integration
@pytest.mark.kubernetes
-def test_deployment(test_cluster, gerrit_master_deployment):
- installed_charts = test_cluster.helm.list(gerrit_master_deployment["namespace"])
- gerrit_master_chart = None
+def test_deployment(test_cluster, gerrit_deployment):
+ installed_charts = test_cluster.helm.list(gerrit_deployment["namespace"])
+ gerrit_chart = None
for chart in installed_charts:
- if chart["name"].startswith("gerrit-master"):
- gerrit_master_chart = chart
- assert gerrit_master_chart is not None
- assert gerrit_master_chart["status"].lower() == "deployed"
+ if chart["name"].startswith("gerrit"):
+ gerrit_chart = chart
+ assert gerrit_chart is not None
+ assert gerrit_chart["status"].lower() == "deployed"
diff --git a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_smoke_test.py b/tests/helm-charts/gerrit/test_chart_gerrit_smoke_test.py
similarity index 96%
rename from tests/helm-charts/gerrit-master/test_chart_gerrit_master_smoke_test.py
rename to tests/helm-charts/gerrit/test_chart_gerrit_smoke_test.py
index 09e7b74..ef4c4f1 100644
--- a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_smoke_test.py
+++ b/tests/helm-charts/gerrit/test_chart_gerrit_smoke_test.py
@@ -36,7 +36,7 @@
@pytest.fixture(scope="class")
def tmp_test_repo(request, tmp_path_factory):
- tmp_dir = tmp_path_factory.mktemp("gerrit_master_chart_clone_test")
+ tmp_dir = tmp_path_factory.mktemp("gerrit_chart_clone_test")
yield tmp_dir
shutil.rmtree(tmp_dir)
@@ -55,7 +55,7 @@
@pytest.mark.smoke
@pytest.mark.incremental
-class TestGerritMasterRestGitCalls:
+class TestGerritRestGitCalls:
def _is_delete_project_plugin_enabled(self, gerrit_url, user, pwd):
url = "%s/a/plugins/delete-project/gerrit~status" % gerrit_url
response = requests.get(url, auth=(user, pwd))
diff --git a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_ssl.py b/tests/helm-charts/gerrit/test_chart_gerrit_ssl.py
similarity index 62%
rename from tests/helm-charts/gerrit-master/test_chart_gerrit_master_ssl.py
rename to tests/helm-charts/gerrit/test_chart_gerrit_ssl.py
index 0c277a6..20c9674 100644
--- a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_ssl.py
+++ b/tests/helm-charts/gerrit/test_chart_gerrit_ssl.py
@@ -24,37 +24,36 @@
@pytest.fixture(scope="module")
def cert_dir(tmp_path_factory):
- return tmp_path_factory.mktemp("gerrit-master-cert")
+ return tmp_path_factory.mktemp("gerrit-cert")
@pytest.fixture(scope="class")
def ssl_certificate(request, cert_dir):
- url = "master.%s" % request.config.getoption("--ingress-url")
- keypair = mock_ssl.MockSSLKeyPair("master.k8sgerrit.test", url)
+ url = "primary.%s" % request.config.getoption("--ingress-url")
+ keypair = mock_ssl.MockSSLKeyPair("primary.k8sgerrit.test", url)
open(os.path.join(cert_dir, "server.crt"), "wb").write(keypair.get_cert())
open(os.path.join(cert_dir, "server.key"), "wb").write(keypair.get_key())
return keypair
@pytest.fixture(scope="class")
-def gerrit_master_deployment_with_ssl(
- request, docker_tag, test_cluster, ssl_certificate, gerrit_master_deployment_factory
+def gerrit_deployment_with_ssl(
+ request, docker_tag, test_cluster, ssl_certificate, gerrit_deployment_factory
):
chart_opts = {
"images.registry.name": request.config.getoption("--registry"),
"images.version": docker_tag,
"images.ImagePullPolicy": "IfNotPresent",
- "gerritMaster.ingress.host": "master.%s"
- % request.config.getoption("--ingress-url"),
- "gerritMaster.ingress.tls.enabled": "true",
- "gerritMaster.ingress.tls.cert": ssl_certificate.get_cert().decode(),
- "gerritMaster.ingress.tls.key": ssl_certificate.get_key().decode(),
+ "gerrit.ingress.host": "primary.%s" % request.config.getoption("--ingress-url"),
+ "gerrit.ingress.tls.enabled": "true",
+ "gerrit.ingress.tls.cert": ssl_certificate.get_cert().decode(),
+ "gerrit.ingress.tls.key": ssl_certificate.get_key().decode(),
}
- chart = gerrit_master_deployment_factory(chart_opts)
- pod_labels = "app=gerrit-master,release=%s" % chart["name"]
+ chart = gerrit_deployment_factory(chart_opts)
+ pod_labels = "app=gerrit,release=%s" % chart["name"]
finished_in_time = utils.wait_for_pod_readiness(pod_labels, timeout=300)
if not finished_in_time:
- raise utils.TimeOutException("Gerrit master pod was not ready in time.")
+ raise utils.TimeOutException("Gerrit pod was not ready in time.")
yield chart
@@ -65,12 +64,10 @@
@pytest.mark.integration
@pytest.mark.kubernetes
@pytest.mark.slow
-class TestGerritMasterChartSetup:
+class TestgerritChartSetup:
# pylint: disable=W0613
- def test_create_project_rest(
- self, request, cert_dir, gerrit_master_deployment_with_ssl
- ):
- create_project_url = "https://master.%s/a/projects/test" % (
+ def test_create_project_rest(self, request, cert_dir, gerrit_deployment_with_ssl):
+ create_project_url = "https://primary.%s/a/projects/test" % (
request.config.getoption("--ingress-url")
)
response = requests.put(
@@ -81,10 +78,10 @@
assert response.status_code == 201
def test_cloning_project(
- self, request, tmp_path_factory, test_cluster, gerrit_master_deployment_with_ssl
+ self, request, tmp_path_factory, test_cluster, gerrit_deployment_with_ssl
):
- clone_dest = tmp_path_factory.mktemp("gerrit_master_chart_clone_test")
- repo_url = "https://master.%s/test.git" % (
+ clone_dest = tmp_path_factory.mktemp("gerrit_chart_clone_test")
+ repo_url = "https://primary.%s/test.git" % (
request.config.getoption("--ingress-url")
)
repo = git.Repo.clone_from(
diff --git a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_usage.py b/tests/helm-charts/gerrit/test_chart_gerrit_usage.py
similarity index 75%
rename from tests/helm-charts/gerrit-master/test_chart_gerrit_master_usage.py
rename to tests/helm-charts/gerrit/test_chart_gerrit_usage.py
index e7e376e..c39b8b0 100644
--- a/tests/helm-charts/gerrit-master/test_chart_gerrit_master_usage.py
+++ b/tests/helm-charts/gerrit/test_chart_gerrit_usage.py
@@ -25,12 +25,10 @@
@pytest.mark.incremental
@pytest.mark.integration
@pytest.mark.kubernetes
-class TestGerritMasterChartSetup:
+class TestGerritChartSetup:
@pytest.mark.timeout(240)
- def test_create_project_rest(
- self, request, test_cluster, gerrit_master_ready_deployment
- ):
- create_project_url = "http://master.%s/a/projects/test" % (
+ def test_create_project_rest(self, request, test_cluster, gerrit_ready_deployment):
+ create_project_url = "http://primary.%s/a/projects/test" % (
request.config.getoption("--ingress-url")
)
response = None
@@ -44,10 +42,10 @@
assert response.status_code == 201
def test_cloning_project(
- self, request, tmp_path_factory, test_cluster, gerrit_master_ready_deployment
+ self, request, tmp_path_factory, test_cluster, gerrit_ready_deployment
):
- clone_dest = tmp_path_factory.mktemp("gerrit_master_chart_clone_test")
- repo_url = "http://master.%s/test.git" % (
+ clone_dest = tmp_path_factory.mktemp("gerrit_chart_clone_test")
+ repo_url = "http://primary.%s/test.git" % (
request.config.getoption("--ingress-url")
)
repo = git.Repo.clone_from(repo_url, clone_dest)
