Rename git-filesystem with git-repositories
Change-Id: I7d96d80c435550fc0c9ae4cf3f9d233dbb62c175
diff --git a/helm-charts/gerrit-replica/README.md b/helm-charts/gerrit-replica/README.md
index cf25ec4..65d7103 100644
--- a/helm-charts/gerrit-replica/README.md
+++ b/helm-charts/gerrit-replica/README.md
@@ -127,13 +127,13 @@
### Storage for Git repositories
-| Parameter | Description | Default |
-|-----------------------------------------|----------------------------------------------------------------------------|----------------------|
-| `gitRepositoryStorage.externalPVC.use` | Whether to use a PVC deployed outside the chart | `false` |
-| `gitRepositoryStorage.externalPVC.name` | Name of the external PVC | `git-filesystem-pvc` |
-| `gitRepositoryStorage.size` | Size of the volume storing the Git repositories | `5Gi` |
-| `gitRepositoryStorage.nfs.enabled` | Whether the volume used is an NFS-volume | `false` |
-| `gitRepositoryStorage.nfs.idDomain` | The ID-domain that should be used to map user-/group-IDs for the NFS mount | `localdomain.com` |
+| Parameter | Description | Default |
+|-----------------------------------------|----------------------------------------------------------------------------|------------------------|
+| `gitRepositoryStorage.externalPVC.use` | Whether to use a PVC deployed outside the chart | `false` |
+| `gitRepositoryStorage.externalPVC.name` | Name of the external PVC | `git-repositories-pvc` |
+| `gitRepositoryStorage.size` | Size of the volume storing the Git repositories | `5Gi` |
+| `gitRepositoryStorage.nfs.enabled` | Whether the volume used is an NFS-volume | `false` |
+| `gitRepositoryStorage.nfs.idDomain` | The ID-domain that should be used to map user-/group-IDs for the NFS mount | `localdomain.com` |
If the git repositories should be persisted even if the chart is deleted and in
a way that the volume containing them can be mounted by the reinstalled chart,
diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
index 4e208bf..c148556 100644
--- a/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
@@ -103,7 +103,7 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
{{- if .Values.gitRepositoryStorage.nfs.enabled }}
- name: nfs-config
@@ -135,7 +135,7 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
{{- if .Values.gitRepositoryStorage.nfs.enabled }}
- name: nfs-config
@@ -198,12 +198,12 @@
{{ else -}}
emptyDir: {}
{{- end }}
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
{{- if and .Values.gerritReplica.plugins.cache.enabled .Values.gerritReplica.plugins.downloaded }}
- name: gerrit-plugin-cache
diff --git a/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml b/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
index b46f071..61540f6 100644
--- a/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
+++ b/helm-charts/gerrit-replica/templates/git-backend.deployment.yaml
@@ -75,7 +75,7 @@
{{- end }}
{{ toYaml .Values.gitBackend.readinessProbe | indent 10 }}
volumeMounts:
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/gerrit/git"
{{- if .Values.gitRepositoryStorage.nfs.enabled }}
- name: nfs-config
@@ -99,12 +99,12 @@
- name: apache-logs
mountPath: "/var/log/apache2"
volumes:
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
- name: git-backend-secret
secret:
diff --git a/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml b/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
index 4cb8e88..fac1eba 100644
--- a/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
+++ b/helm-charts/gerrit-replica/templates/git-gc.cronjob.yaml
@@ -33,17 +33,17 @@
resources:
{{ toYaml .Values.gitGC.resources | indent 14 }}
volumeMounts:
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/gerrit/git"
- name: git-gc-logs
mountPath: "/var/log/git"
volumes:
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
- name: git-gc-logs
{{ if .Values.gitGC.logging.persistence.enabled -}}
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 93832f1..e2c46aa 100644
--- a/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml
+++ b/helm-charts/gerrit-replica/templates/git-repositories-init.job.yaml
@@ -1,7 +1,7 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ .Release.Name }}-git-filesystem-init
+ name: {{ .Release.Name }}-git-repositories-init
labels:
app: gerrit-replica
chart: {{ template "gerrit-replica.chart" . }}
@@ -32,7 +32,7 @@
- |
chown -R 1000:100 /var/mnt/git
volumeMounts:
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
- name: nfs-config
mountPath: "/etc/idmapd.conf"
@@ -63,7 +63,7 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
- name: gerrit-init-config
mountPath: "/var/config/gerrit-init.yaml"
@@ -74,12 +74,12 @@
volumes:
- name: gerrit-site
emptyDir: {}
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
- name: gerrit-init-config
configMap:
diff --git a/helm-charts/gerrit-replica/templates/git-repositories.storage.yaml b/helm-charts/gerrit-replica/templates/git-repositories.pvc.yaml
similarity index 85%
rename from helm-charts/gerrit-replica/templates/git-repositories.storage.yaml
rename to helm-charts/gerrit-replica/templates/git-repositories.pvc.yaml
index 543654e..0788165 100644
--- a/helm-charts/gerrit-replica/templates/git-repositories.storage.yaml
+++ b/helm-charts/gerrit-replica/templates/git-repositories.pvc.yaml
@@ -2,7 +2,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
- name: {{ .Release.Name }}-git-filesystem-pvc
+ name: {{ .Release.Name }}-git-repositories-pvc
spec:
accessModes:
- ReadWriteMany
diff --git a/helm-charts/gerrit-replica/values.yaml b/helm-charts/gerrit-replica/values.yaml
index 879a894..6314753 100644
--- a/helm-charts/gerrit-replica/values.yaml
+++ b/helm-charts/gerrit-replica/values.yaml
@@ -45,7 +45,7 @@
gitRepositoryStorage:
externalPVC:
use: false
- name: git-filesystem-pvc
+ name: git-repositories-pvc
size: 5Gi
nfs:
enabled: false
diff --git a/helm-charts/gerrit/README.md b/helm-charts/gerrit/README.md
index 81f5533..0cb0264 100644
--- a/helm-charts/gerrit/README.md
+++ b/helm-charts/gerrit/README.md
@@ -106,11 +106,11 @@
### Storage for Git repositories
-| Parameter | Description | Default |
-|-----------------------------------------|-------------------------------------------------|----------------------|
-| `gitRepositoryStorage.externalPVC.use` | Whether to use a PVC deployed outside the chart | `false` |
-| `gitRepositoryStorage.externalPVC.name` | Name of the external PVC | `git-filesystem-pvc` |
-| `gitRepositoryStorage.size` | Size of the volume storing the Git repositories | `5Gi` |
+| Parameter | Description | Default |
+|-----------------------------------------|-------------------------------------------------|------------------------|
+| `gitRepositoryStorage.externalPVC.use` | Whether to use a PVC deployed outside the chart | `false` |
+| `gitRepositoryStorage.externalPVC.name` | Name of the external PVC | `git-repositories-pvc` |
+| `gitRepositoryStorage.size` | Size of the volume storing the Git repositories | `5Gi` |
If the git repositories should be persisted even if the chart is deleted and in
a way that the volume containing them can be mounted by the reinstalled chart,
diff --git a/helm-charts/gerrit/templates/gerrit.stateful-set.yaml b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
index 6216aa4..c3c04a6 100644
--- a/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
+++ b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
@@ -79,7 +79,7 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
- name: gerrit-init-config
mountPath: "/var/config/gerrit-init.yaml"
@@ -102,7 +102,7 @@
volumeMounts:
- name: gerrit-site
mountPath: "/var/gerrit"
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/mnt/git"
- name: gerrit-config
mountPath: "/var/mnt/etc/config"
@@ -130,12 +130,12 @@
persistentVolumeClaim:
claimName: {{ .Release.Name }}-plugin-cache-pvc
{{- end }}
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
- name: gerrit-init-config
configMap:
diff --git a/helm-charts/gerrit/templates/git-gc.cronjob.yaml b/helm-charts/gerrit/templates/git-gc.cronjob.yaml
index 687e619..68dedcf 100644
--- a/helm-charts/gerrit/templates/git-gc.cronjob.yaml
+++ b/helm-charts/gerrit/templates/git-gc.cronjob.yaml
@@ -28,17 +28,17 @@
resources:
{{ toYaml .Values.gitGC.resources | indent 14 }}
volumeMounts:
- - name: git-filesystem
+ - name: git-repositories
mountPath: "/var/gerrit/git"
- name: git-gc-logs
mountPath: "/var/log/git"
volumes:
- - name: git-filesystem
+ - name: git-repositories
persistentVolumeClaim:
{{- if .Values.gitRepositoryStorage.externalPVC.use }}
claimName: {{ .Values.gitRepositoryStorage.externalPVC.name }}
{{- else }}
- claimName: {{ .Release.Name }}-git-filesystem-pvc
+ claimName: {{ .Release.Name }}-git-repositories-pvc
{{- end }}
- name: git-gc-logs
{{ if .Values.gitGC.logging.persistence.enabled -}}
diff --git a/helm-charts/gerrit/templates/git-repositories.storage.yaml b/helm-charts/gerrit/templates/git-repositories.storage.yaml
index 64a93d8..503acf4 100644
--- a/helm-charts/gerrit/templates/git-repositories.storage.yaml
+++ b/helm-charts/gerrit/templates/git-repositories.storage.yaml
@@ -2,7 +2,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
- name: {{ .Release.Name }}-git-filesystem-pvc
+ name: {{ .Release.Name }}-git-repositories-pvc
labels:
app: gerrit
chart: {{ template "gerrit.chart" . }}
diff --git a/helm-charts/gerrit/values.yaml b/helm-charts/gerrit/values.yaml
index 226b6d6..f033fbf 100644
--- a/helm-charts/gerrit/values.yaml
+++ b/helm-charts/gerrit/values.yaml
@@ -45,7 +45,7 @@
gitRepositoryStorage:
externalPVC:
use: false
- name: git-filesystem-pvc
+ name: git-repositories-pvc
size: 5Gi
