Bump default Gerrit version to 3.0.1
Change-Id: Id192203047b12f99609dc9356b887200c039bbf5
diff --git a/container-images/gerrit-base/Dockerfile b/container-images/gerrit-base/Dockerfile
index 9bae02a..241767e 100644
--- a/container-images/gerrit-base/Dockerfile
+++ b/container-images/gerrit-base/Dockerfile
@@ -13,7 +13,7 @@
mkdir -p /var/war
# Download Gerrit release
-ARG GERRIT_WAR_URL=https://gerrit-releases.storage.googleapis.com/gerrit-2.16.9.war
+ARG GERRIT_WAR_URL=https://gerrit-releases.storage.googleapis.com/gerrit-3.0.1.war
RUN curl -k -o /var/war/gerrit.war ${GERRIT_WAR_URL} && ln -s /var/war/gerrit.war /var/gerrit/bin/gerrit.war
# Allow incoming traffic
diff --git a/helm-charts/gerrit-master/Chart.yaml b/helm-charts/gerrit-master/Chart.yaml
index 7fa3744..6f4bed4 100644
--- a/helm-charts/gerrit-master/Chart.yaml
+++ b/helm-charts/gerrit-master/Chart.yaml
@@ -1,5 +1,5 @@
apiVersion: v1
-appVersion: 2.12
+appVersion: 3.0.1
description: |-
Gerrit is a free, web-based team code collaboration tool. Software developers
in a team can review each other's modifications on their source code using
@@ -24,4 +24,4 @@
- https://gerrit.googlesource.com/k8s-gerrit/+/master/
keywords:
- gerrit
-- git
\ No newline at end of file
+- git
diff --git a/helm-charts/gerrit-master/values.yaml b/helm-charts/gerrit-master/values.yaml
index 2084334..ff5a5f9 100644
--- a/helm-charts/gerrit-master/values.yaml
+++ b/helm-charts/gerrit-master/values.yaml
@@ -130,7 +130,7 @@
keystore:
reviewdb:
- enabled: true
+ enabled: false
config:
# Some values are expected to have a specific value for the deployment installed
@@ -147,8 +147,6 @@
# cluster.
canonicalWebUrl = http://example.com/
disableReverseDnsLookup = true
- [database]
- type = h2
[index]
type = LUCENE
[auth]
@@ -176,12 +174,6 @@
javaOptions = -Xmx4g
secure: |-
- # Database credentials should be the same as configured for the database
- # Gerrit-master chart, if the database was installed using the chart.
- [database]
- username = gerrit
- password = secret
-
# Password for the keystore added as value for 'gerritSlave.keystore'
# Only needed, if SSL is enabled.
#[httpd]
diff --git a/helm-charts/gerrit-slave/Chart.yaml b/helm-charts/gerrit-slave/Chart.yaml
index cb29c79..10ef0d6 100644
--- a/helm-charts/gerrit-slave/Chart.yaml
+++ b/helm-charts/gerrit-slave/Chart.yaml
@@ -1,5 +1,5 @@
apiVersion: v1
-appVersion: 2.12
+appVersion: 3.0.1
description: |-
The Gerrit slave serves as a read-only Gerrit instance to serve repositories
that it receives from a Gerrit master instance via replication. It can be
@@ -21,4 +21,4 @@
- https://gerrit.googlesource.com/k8s-gerrit/+/master
keywords:
- gerrit
-- git
\ No newline at end of file
+- git
diff --git a/helm-charts/gerrit-slave/values.yaml b/helm-charts/gerrit-slave/values.yaml
index 919e4f9..3472871 100644
--- a/helm-charts/gerrit-slave/values.yaml
+++ b/helm-charts/gerrit-slave/values.yaml
@@ -193,7 +193,7 @@
keystore:
reviewdb:
- enabled: true
+ enabled: false
config:
# Some values are expected to have a specific value for the deployment installed
@@ -210,8 +210,6 @@
# cluster.
canonicalWebUrl = http://example.com/
disableReverseDnsLookup = true
- [database]
- type = h2
[index]
type = LUCENE
[auth]
@@ -240,12 +238,6 @@
javaOptions = -Xmx4g
secure: |-
- # Database credentials should be the same as configured for the database
- # Gerrit-slave chart, if the database was installed using the chart.
- [database]
- username = gerrit
- password = secret
-
# Password for the keystore added as value for 'gerritSlave.keystore'
# Only needed, if SSL is enabled.
#[httpd]
