Skip to content

Commit c9dcdf3

Browse files
Fral738Fral738
authored
chore(docs): fix lists (#820)
Signed-off-by: Evgeniy Frolov <[email protected]>
1 parent 2067cbf commit c9dcdf3

4 files changed

Lines changed: 98 additions & 96 deletions

File tree

‎bin/configurator/static/_includes/en/configurator/partials/ci/argocd_host_project_section.md.liquid‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,52 @@
22

33
1. Apply the following Application CRD to the target cluster to deploy a bundle from the container registry:
44

5-
```shell
6-
kubectl create -f - <<EOF
7-
---
8-
apiVersion: argoproj.io/v1alpha1
9-
kind: Application
10-
metadata:
11-
annotations:
12-
argocd-image-updater.argoproj.io/chart-version: ~ 1.0
13-
argocd-image-updater.argoproj.io/pull-secret: pullsecret:myproject-production/myproject-regcred
14-
name: myproject
15-
namespace: argocd
16-
finalizers:
17-
- resources-finalizer.argocd.argoproj.io
18-
spec:
19-
destination:
20-
namespace: myproject-production
21-
server: https://kubernetes.default.svc
22-
project: default
23-
source:
24-
chart: myproject
25-
repoURL: registry.mycompany.org/myproject
26-
targetRevision: 1.0.0
27-
syncPolicy:
28-
automated:
29-
prune: true
30-
selfHeal: true
31-
EOF
32-
```
33-
34-
The value of `argocd-image-updater.argoproj.io/chart-version="~ 1.0"` means that the operator must automatically deploy the chart updated to the latest patch version in the `SEMVER` range `1.0.*`.
5+
```shell
6+
kubectl create -f - <<EOF
7+
---
8+
apiVersion: argoproj.io/v1alpha1
9+
kind: Application
10+
metadata:
11+
annotations:
12+
argocd-image-updater.argoproj.io/chart-version: ~ 1.0
13+
argocd-image-updater.argoproj.io/pull-secret: pullsecret:myproject-production/myproject-regcred
14+
name: myproject
15+
namespace: argocd
16+
finalizers:
17+
- resources-finalizer.argocd.argoproj.io
18+
spec:
19+
destination:
20+
namespace: myproject-production
21+
server: https://kubernetes.default.svc
22+
project: default
23+
source:
24+
chart: myproject
25+
repoURL: registry.mycompany.org/myproject
26+
targetRevision: 1.0.0
27+
syncPolicy:
28+
automated:
29+
prune: true
30+
selfHeal: true
31+
EOF
32+
```
33+
34+
The value of `argocd-image-updater.argoproj.io/chart-version="~ 1.0"` means that the operator must automatically deploy the chart updated to the latest patch version in the `SEMVER` range `1.0.*`.
3535

3636
2. Create a pull secret to access the project container registry:
3737

38-
```shell
39-
kubectl create -f - <<EOF
40-
---
41-
apiVersion: v1
42-
kind: Secret
43-
metadata:
44-
name: myproject-regcred
45-
namespace: myproject-production
46-
type: kubernetes.io/dockerconfigjson
47-
data:
48-
.dockerconfigjson: BASE64_DOCKER_CONFIG_JSON
49-
EOF
50-
```
38+
```shell
39+
kubectl create -f - <<EOF
40+
---
41+
apiVersion: v1
42+
kind: Secret
43+
metadata:
44+
name: myproject-regcred
45+
namespace: myproject-production
46+
type: kubernetes.io/dockerconfigjson
47+
data:
48+
.dockerconfigjson: BASE64_DOCKER_CONFIG_JSON
49+
EOF
50+
```
5151

5252
### Configuring the GitLab project
5353

‎bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_host_main_section.md.liquid‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ Error: reading JSON file "/run/containers/0/auth.json": no such file or director
3535
**Solution**:
3636

3737
1. Determine Buildah working directory:
38-
{% raw %}
39-
```bash
40-
RUNROOT=$(buildah info --format '{{.store.RunRoot}}') # Typically: /run/user/$(id -u)/containers
41-
```
42-
{% endraw %}
38+
39+
{% raw %}
40+
```bash
41+
RUNROOT=$(buildah info --format '{{.store.RunRoot}}') # Typically: /run/user/$(id -u)/containers
42+
```
43+
{% endraw %}
4344

4445
2. Manually copy Docker authentication settings:
4546
```bash

‎bin/configurator/static/_includes/ru/configurator/partials/ci/argocd_host_project_section.md.liquid‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,52 @@
22

33
1. В целевом кластере примените следующий Application CRD, чтобы развернуть бандл из container registry:
44

5-
```shell
6-
kubectl create -f - <<EOF
7-
---
8-
apiVersion: argoproj.io/v1alpha1
9-
kind: Application
10-
metadata:
11-
annotations:
12-
argocd-image-updater.argoproj.io/chart-version: ~ 1.0
13-
argocd-image-updater.argoproj.io/pull-secret: pullsecret:myproject-production/myproject-regcred
14-
name: myproject
15-
namespace: argocd
16-
finalizers:
17-
- resources-finalizer.argocd.argoproj.io
18-
spec:
19-
destination:
20-
namespace: myproject-production
21-
server: https://kubernetes.default.svc
22-
project: default
23-
source:
24-
chart: myproject
25-
repoURL: registry.mycompany.org/myproject
26-
targetRevision: 1.0.0
27-
syncPolicy:
28-
automated:
29-
prune: true
30-
selfHeal: true
31-
EOF
32-
```
33-
34-
Значение `argocd-image-updater.argoproj.io/chart-version="~ 1.0"` означает, что оператор должен автоматически развернуть чарт с последней версией патча в диапазоне `SEMVER` `1.0.*`.
5+
```shell
6+
kubectl create -f - <<EOF
7+
---
8+
apiVersion: argoproj.io/v1alpha1
9+
kind: Application
10+
metadata:
11+
annotations:
12+
argocd-image-updater.argoproj.io/chart-version: ~ 1.0
13+
argocd-image-updater.argoproj.io/pull-secret: pullsecret:myproject-production/myproject-regcred
14+
name: myproject
15+
namespace: argocd
16+
finalizers:
17+
- resources-finalizer.argocd.argoproj.io
18+
spec:
19+
destination:
20+
namespace: myproject-production
21+
server: https://kubernetes.default.svc
22+
project: default
23+
source:
24+
chart: myproject
25+
repoURL: registry.mycompany.org/myproject
26+
targetRevision: 1.0.0
27+
syncPolicy:
28+
automated:
29+
prune: true
30+
selfHeal: true
31+
EOF
32+
```
33+
34+
Значение `argocd-image-updater.argoproj.io/chart-version="~ 1.0"` означает, что оператор должен автоматически развернуть чарт с последней версией патча в диапазоне `SEMVER` `1.0.*`.
3535

3636
2. Создайте Secret для доступа к container registry проекта:
3737

38-
```shell
39-
kubectl create -f - <<EOF
40-
---
41-
apiVersion: v1
42-
kind: Secret
43-
metadata:
44-
name: myproject-regcred
45-
namespace: myproject-production
46-
type: kubernetes.io/dockerconfigjson
47-
data:
48-
.dockerconfigjson: BASE64_DOCKER_CONFIG_JSON
49-
EOF
50-
```
38+
```shell
39+
kubectl create -f - <<EOF
40+
---
41+
apiVersion: v1
42+
kind: Secret
43+
metadata:
44+
name: myproject-regcred
45+
namespace: myproject-production
46+
type: kubernetes.io/dockerconfigjson
47+
data:
48+
.dockerconfigjson: BASE64_DOCKER_CONFIG_JSON
49+
EOF
50+
```
5151

5252
### Настройка GitLab-проекта
5353

‎bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_host_main_section.md.liquid‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ Error: reading JSON file "/run/containers/0/auth.json": no such file or director
3636
**Решение**:
3737

3838
1. Определяем рабочую директорию Buildah:
39-
{% raw %}
40-
```bash
41-
RUNROOT=$(buildah info --format '{{.store.RunRoot}}') # Обычно: /run/user/$(id -u)/containers
42-
```
43-
{% endraw %}
39+
40+
{% raw %}
41+
```bash
42+
RUNROOT=$(buildah info --format '{{.store.RunRoot}}') # Обычно: /run/user/$(id -u)/containers
43+
```
44+
{% endraw %}
4445

4546
2. Копируем настройки аутентификации Docker вручную:
4647
```bash

0 commit comments

Comments
 (0)