Rename 'gerrit-slave-init' image to 'gerrit-init' The 'gerrit-slave-init' image was also used to initialize the gerrit master in the gerrit-master helm chart. To better reflect this in the naming, the image is renamed to gerrit-init with this change. Change-Id: I117f61cc4f998ba587afff1e28e6676463ca5a74
diff --git a/README.md b/README.md index c22f560..20cd4f8 100644 --- a/README.md +++ b/README.md
@@ -81,7 +81,7 @@ ``` The `<component-name>` is one of: `apache-git-http-backend`, `git-gc`, -`gerrit-slave`, `gerrit-master`, `gerrit-slave-init`. +`gerrit-slave`, `gerrit-master`, `gerrit-init`. If a specific version of the image should be used, the `--tag TAG`-option can be used to provide the image tag:
diff --git a/build b/build index d3765f6..a2cde51 100755 --- a/build +++ b/build
@@ -61,7 +61,7 @@ if test $# -eq 0 ; then docker_build_gerrit_base - for IMAGE in apache-git-http-backend gerrit-master gerrit-slave git-gc mysql-replication-init gerrit-slave-init; do + for IMAGE in apache-git-http-backend gerrit-master gerrit-slave git-gc mysql-replication-init gerrit-init; do docker_build $IMAGE done else
diff --git a/container-images/gerrit-slave-init/Dockerfile b/container-images/gerrit-init/Dockerfile similarity index 100% rename from container-images/gerrit-slave-init/Dockerfile rename to container-images/gerrit-init/Dockerfile
diff --git a/container-images/gerrit-slave-init/README.md b/container-images/gerrit-init/README.md similarity index 100% rename from container-images/gerrit-slave-init/README.md rename to container-images/gerrit-init/README.md
diff --git a/container-images/gerrit-slave-init/start b/container-images/gerrit-init/start similarity index 100% rename from container-images/gerrit-slave-init/start rename to container-images/gerrit-init/start
diff --git a/container-images/gerrit-slave-init/tools/start b/container-images/gerrit-init/tools/start similarity index 100% rename from container-images/gerrit-slave-init/tools/start rename to container-images/gerrit-init/tools/start
diff --git a/container-images/gerrit-slave-init/tools/verify_fs_permissions b/container-images/gerrit-init/tools/verify_fs_permissions similarity index 100% rename from container-images/gerrit-slave-init/tools/verify_fs_permissions rename to container-images/gerrit-init/tools/verify_fs_permissions
diff --git a/helm-charts/gerrit-master/README.md b/helm-charts/gerrit-master/README.md index 1ae4497..109e0f0 100644 --- a/helm-charts/gerrit-master/README.md +++ b/helm-charts/gerrit-master/README.md
@@ -148,7 +148,7 @@ | Parameter | Description | Default | |-----------------------------------------------|-------------------------------------------------------------------------------------------------|-----------------------------------| -| `gerritMaster.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-slave-init` | +| `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.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` | | | | `requests.memory: 5Gi` |
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.deployment.yaml b/helm-charts/gerrit-master/templates/gerrit-master.deployment.yaml index d4b5e90..5243005 100644 --- a/helm-charts/gerrit-master/templates/gerrit-master.deployment.yaml +++ b/helm-charts/gerrit-master/templates/gerrit-master.deployment.yaml
@@ -24,7 +24,7 @@ - name: {{ .Values.images.registry.ImagePullSecret.name }} {{- end }} initContainers: - - name: gerrit-master-init + - name: gerrit-init image: {{ template "registry" . }}{{ .Values.gerritMaster.images.gerritInit }}:{{ .Values.images.version }} imagePullPolicy: {{ .Values.images.imagePullPolicy }} command:
diff --git a/helm-charts/gerrit-master/values.yaml b/helm-charts/gerrit-master/values.yaml index 30a9cc3..1b5630f 100644 --- a/helm-charts/gerrit-master/values.yaml +++ b/helm-charts/gerrit-master/values.yaml
@@ -67,7 +67,7 @@ gerritMaster: images: - gerritInit: k8sgerrit/gerrit-slave-init + gerritInit: k8sgerrit/gerrit-init gerritMaster: k8sgerrit/gerrit-master # The memory limit has to be higher than the configures heap-size for Java! @@ -286,4 +286,4 @@ key: |- -----BEGIN RSA PRIVATE KEY----- - -----END RSA PRIVATE KEY----- \ No newline at end of file + -----END RSA PRIVATE KEY-----
diff --git a/helm-charts/gerrit-slave/README.md b/helm-charts/gerrit-slave/README.md index 44e4cef..8bd2d5e 100644 --- a/helm-charts/gerrit-slave/README.md +++ b/helm-charts/gerrit-slave/README.md
@@ -197,7 +197,7 @@ | Parameter | Description | Default | |----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|-----------------------------------| -| `gerritMaster.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-slave-init` | +| `gerritMaster.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` | | `gerritMaster.images.gerritSlave` | Image name of the Gerrit slave container image | `k8s-gerrit/gerrit-slave` | | `gerritSlave.initializeTestSite.enabled` | Enable the initialization of a site. USE ONLY for testing, if you do not plan to replicate repositories or the database. | `true` | | `gerritSlave.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml index 238c8bb..db26d27 100644 --- a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml +++ b/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
@@ -24,7 +24,7 @@ - name: {{ .Values.images.registry.ImagePullSecret.name }} {{- end }} initContainers: - - name: gerrit-slave-init + - name: gerrit-init image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritInit }}:{{ .Values.images.version }} imagePullPolicy: {{ .Values.images.imagePullPolicy }} command:
diff --git a/helm-charts/gerrit-slave/values.yaml b/helm-charts/gerrit-slave/values.yaml index 06a77f3..941e291 100644 --- a/helm-charts/gerrit-slave/values.yaml +++ b/helm-charts/gerrit-slave/values.yaml
@@ -150,7 +150,7 @@ gerritSlave: images: - gerritInit: k8sgerrit/gerrit-slave-init + gerritInit: k8sgerrit/gerrit-init gerritSlave: k8sgerrit/gerrit-slave # If you only intend to test the Gerrit slave and do not wish to actually @@ -383,4 +383,4 @@ key: |- -----BEGIN RSA PRIVATE KEY----- - -----END RSA PRIVATE KEY----- \ No newline at end of file + -----END RSA PRIVATE KEY-----
diff --git a/start b/start index e0458f2..d493a40 100755 --- a/start +++ b/start
@@ -89,7 +89,7 @@ container-images/$NAME/start "$MODE" "$NAME" "$SITE" "$REGISTRY" "$TAG" "$OWNER_UID" "$OWNER_GID" "$ENV" ;; -gerrit-slave-init) +gerrit-init) container-images/$NAME/start "$MODE" "$NAME" "$SITE" "$REGISTRY" "$TAG" "$OWNER_UID" "$OWNER_GID" "$ENV" ;;