Merge changes If0c89cda,Ibd55d02d,Ib646e0cf
* changes:
Document that graceful shutdown does not work with ingresses
Set terminationGracePeriodSeconds for Gerrit pods
Set gracefulStopTimeout by default
diff --git a/README.md b/README.md
index 709ff47..cb1f345 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,8 @@
# Docker images
-This project provides the sources for docker images based on the 3.1.7 Gerrit
-release used by the helm-charts. The images are also provided on
-[Dockerhub](https://hub.docker.com/u/k8sgerrit).
+This project provides the sources for docker images used by the helm-charts.
+The images are also provided on [Dockerhub](https://hub.docker.com/u/k8sgerrit).
The project also provides script to build and publish the images, so that custom
versions can be used by the helm-charts. This requires however a docker registry
diff --git a/container-images/apache-git-http-backend/README.md b/container-images/apache-git-http-backend/README.md
index 957ee23..bb31024 100644
--- a/container-images/apache-git-http-backend/README.md
+++ b/container-images/apache-git-http-backend/README.md
@@ -10,12 +10,7 @@
* Apache configurations for http
* 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 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
- downported to 2.16
+ repository over http.
* `tools/start`: start script, configures and starts Apache
webserver
diff --git a/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml b/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml
index 72c92e6..650bd7f 100644
--- a/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml
+++ b/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml
@@ -122,9 +122,11 @@
- name: gerrit-config
configMap:
name: {{ .Release.Name }}-gerrit-replica-configmap
+ {{ if .Values.caCert -}}
- name: tls-ca
secret:
secretName: {{ .Release.Name }}-tls-ca
+ {{- end }}
{{- if .Values.nfsWorkaround.enabled }}
- name: nfs-config
configMap:
diff --git a/istio/src/istiod-deployment.yaml b/istio/src/istiod-deployment.yaml
index d982ce1..54568d6 100755
--- a/istio/src/istiod-deployment.yaml
+++ b/istio/src/istiod-deployment.yaml
@@ -9,14 +9,14 @@
name: istiod
namespace: istio-system
spec:
- replicas: 1
+ replicas: 2
selector:
matchLabels:
istio: pilot
strategy:
rollingUpdate:
maxSurge: 100%
- maxUnavailable: 25%
+ maxUnavailable: 50%
template:
metadata:
annotations:
diff --git a/istio/src/istiod-hpa.yaml b/istio/src/istiod-hpa.yaml
index e85f03e..33d020c 100755
--- a/istio/src/istiod-hpa.yaml
+++ b/istio/src/istiod-hpa.yaml
@@ -18,7 +18,7 @@
name: cpu
targetAverageUtilization: 80
type: Resource
- minReplicas: 1
+ minReplicas: 2
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
