From 8951442913ed4095d94b65fcfb77293b0c61d778 Mon Sep 17 00:00:00 2001 From: Wes Johnson <8601784-wesjdj@users.noreply.gitlab.com> Date: Fri, 31 Mar 2023 08:15:09 +0000 Subject: [PATCH 1/2] docs: fix yq command for v4.32.2+ --- doc/backup-restore/restore.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/backup-restore/restore.md b/doc/backup-restore/restore.md index dad8c6a05f..ddf4dfd2e9 100644 --- a/doc/backup-restore/restore.md +++ b/doc/backup-restore/restore.md @@ -34,12 +34,12 @@ The GitLab chart expects rails secrets to be provided as a Kubernetes Secret wit 1. Copy the file `/etc/gitlab/gitlab-secrets.json` to the workstation where you run `kubectl` commands. -1. Install the [yq](https://github.com/mikefarah/yq) tool (version 4.21.1 or later) on your workstation. +1. Install the [yq](https://github.com/mikefarah/yq) tool (version 4.32.2 or later) on your workstation. 1. Run the following command to convert your `gitlab-secrets.json` to YAML format: ```shell - yq -P '{"production": .gitlab_rails}' gitlab-secrets.json >> gitlab-secrets.yaml + yq -P '{"production": .gitlab_rails}' gitlab-secrets.json -o yaml >> gitlab-secrets.yaml ``` 1. Check that the new `gitlab-secrets.yaml` file has the following contents: -- GitLab From 48fed742c89bc04ae9ca6075d6ccf77b004f1a40 Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Thu, 6 Apr 2023 07:29:05 +0000 Subject: [PATCH 2/2] fix minimum version for -o flag --- doc/backup-restore/restore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/backup-restore/restore.md b/doc/backup-restore/restore.md index ddf4dfd2e9..4de5a3c9ad 100644 --- a/doc/backup-restore/restore.md +++ b/doc/backup-restore/restore.md @@ -34,7 +34,7 @@ The GitLab chart expects rails secrets to be provided as a Kubernetes Secret wit 1. Copy the file `/etc/gitlab/gitlab-secrets.json` to the workstation where you run `kubectl` commands. -1. Install the [yq](https://github.com/mikefarah/yq) tool (version 4.32.2 or later) on your workstation. +1. Install the [yq](https://github.com/mikefarah/yq) tool (version 4.21.1 or later) on your workstation. 1. Run the following command to convert your `gitlab-secrets.json` to YAML format: -- GitLab