Реализован вариант двухуровневого дерева

Обновить branch/README.md
2024-04-24 14:17:42 +05:00 · 2024-04-23 10:04:32 +03:00 · 2024-04-23 10:03:48 +03:00 · 2024-04-23 11:45:11 +05:00 · 2024-04-23 09:26:37 +03:00 · 2024-04-23 10:54:20 +05:00
46 changed files with 312 additions and 381 deletions
--- a/.gitea/workflows/build-k8s-images.yaml
+++ b/.gitea/workflows/build-k8s-images.yaml
@@ -1,42 +0,0 @@
-name: Build kubernetes images
-on:
-  push:
-    branches:
-      - test-gitea-actions
-    paths:
-      - ".gitea/workflows/build-k8s-images.yaml"
-      - "org/k8s/kube-apiserver/**"
-      - "org/k8s/kube-controller-manager/**"
-      - "org/k8s/kube-scheduler/**"
-      - "org/k8s/kube-proxy/**"
-      - "tags.toml"
-      - "k8s-images.sh"
-  schedule:
-    - cron: "30 3 1 * *"
-
-jobs:
-  build-images:
-    runs-on: alt-latest
-    steps:
-      - name: Install the dependencies
-        run: |
-          apt-get update
-          apt-get install -y \
-          podman \
-          python3-module-tomli \
-          python3-module-jinja2 \
-          qemu-user-static-binfmt-aarch64 \
-          qemu-user-static-binfmt-arm \
-          qemu-user-static-binfmt-ppc
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Log into gitea.basealt.ru
-        run: podman login -u stepchenkoas -p "${{ secrets.ACTIONS_TOKEN }}" gitea.basealt.ru
-      - name: Build docker images for p10 (kube-apiserver, kube-controller-manager, kube-scheduler, kube-proxy)
-        run: ${{ gitea.workspace }}/build-k8s-images.sh gitea.basealt.ru k8s-p10 p10
-      - name: Push docker images for p10 to gitea.basealt.ru
-        run: ${{ gitea.workspace }}/push-k8s-images.sh gitea.basealt.ru k8s-p10 p10
-      - name: Build docker images for sisyphus (kube-apiserver, kube-controller-manager, kube-scheduler, kube-proxy)
-        run: ${{ gitea.workspace }}/build-k8s-images.sh gitea.basealt.ru k8s-sisyphus sisyphus
-      - name: Push docker images for sisyphus to gitea.basealt.ru
-        run: ${{ gitea.workspace }}/push-k8s-images.sh gitea.basealt.ru k8s-sisyphus sisyphus
--- a/.gitea/workflows/wf_full_p10.yaml
+++ b/.gitea/workflows/wf_full_p10.yaml
@@ -1,134 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - '*10*_*'
-
-jobs:
-  build-process:
-    runs-on: alt-p10
-    outputs:
-      branch: ${{ env.BRANCH }}
-      org: ${{ env.ORG }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
-        env:
-          GU: ${{ gitea.server_url }}
-          GR: ${{ gitea.repository }}
-      - name: Set repo for c10f2 (Temporary)
-        if: ${{ contains(github.ref_name, 'c10f2') }}
-        run: |
-          echo "event tag=${{ github.ref_name }}" 
-          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
-          echo "cat /etc/hosts"
-          cat /etc/hosts
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}                                         
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}                              
-          echo "ORG=$org"
-      - name: Login podman gitea
-        run: |
-          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
-        env:
-          P_USER: ${{ secrets.PODMAN_USER }}
-          P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
-        id: build-script
-        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
-          if [[ $BR == 'c10f1' || $BR == 'c10f2' ]]; then build_args="$build_args --skip-arches arm ppc64le"; fi
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
-        env:
-          ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
-        continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"                    
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-p10
-    steps:
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-      - name: Check out current repo
-        uses: https://gitea.com/actions/checkout@v4
-      - name: Test
-        id: test-script
-        continue-on-error: true
-        run: |
-          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
-          cat haserr.log >> ${GITHUB_ENV}
-          echo "test process finished"
-        env:
-          BR: ${{ needs.build-process.outputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          WS: ${{ gitea.workspace }}
-      - name: Send notification if test crashed
-        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
--- a/.gitea/workflows/wf_full_sis.yaml
+++ b/.gitea/workflows/wf_full_sis.yaml
@@ -66,10 +66,12 @@ jobs:
      - name: Send notification if build crashed
        if: ${{ steps.build-script.outcome != 'success' }}
        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
+          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
+          if [[ $issueid != '' ]]; then \
+            body="Building images finish with some errors."; \
+            curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s;\
+            echo "notification about test error is sent to issue $issueid"; \
+          else echo "no issue to send notification"; fi
        env:
          T: ${{ secrets.TOKEN }}
          BR: ${{ env.BRANCH }}
@@ -115,11 +117,13 @@ jobs:
      - name: Send notification if test crashed
        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
+          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
+          if [[ $issueid != '' ]]; then \
+            errors=$(cat errors.log); \
+            body="Testing images finish with some errors. $errors"; \
+            curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s; \
+            echo "notification about test error is sent to issue $issueid"; \
+          else echo "no issue to send notification"; fi               
        env:
          T: ${{ secrets.TOKEN }}
          BR: ${{ needs.build-process.outputs.branch }}
--- a/README.md
+++ b/README.md
@@ -28,9 +28,7 @@ If you push to the users repository, then organiztion is your username.

 ## Dependencies
 On x86_64 machine using p10 branch you need:
- `podman`
 - `python3-module-tomli`
- `python3-module-jinja2`
 - `qemu-user-static-binfmt-aarch64` to build for arm64 architecture
 - `qemu-user-static-binfmt-arm` to build for arm architecture
 - `qemu-user-static-binfmt-ppc` to build for ppc64le architecture
--- a/branch/README.md
+++ b/branch/README.md
@@ -0,0 +1,153 @@
+# Описание структуры каталогов для автоматизации рабочео процесса создания образов
+
+## Общая структура каталогов 
+
+- Вместо каталога `org` предлагается использовать каталог `branch`
+
+- Каталог `branch` содержит подкаталога бранчей (платформ):
+  * `sisyphus`;
+  * `p10`;
+  * `c10f1`;
+  * `c10f2`;
+  * ...
+
+Подкаталоги бранчей содержат дерево групп образов.
+
+Корневая группа `base` содержит образы, которые тегируются по дате создания.
+Остальные группы тегируются по версии основного ПО, входящего в состав образа.
+
+Каталог группы может содержать yml-файл `images.yml` описания группы.
+
+Пример дерева описания образов:  
+<pre>
+branch/sisyphus/
+├── apache
+├── base
+│   ├── alt
+│   ├── buildpack
+│   │   ├── buildpack-deps-curl
+│   │   └── buildpack-deps-scm
+│   ├── devel
+│   ├── distroless
+│   │   ├── distroless-base
+│   │   ├── distroless-builder
+│   │   ├── distroless-devel
+│   │   ├── distroless-gotop
+│   │   ├── distroless-static
+│   │   └── distroless-true
+│   ├── systemd
+│   └── unit
+├── cert-manager
+│   ├── cert-manager-cainjector
+│   ├── cert-manager-controller
+│   └── cert-manager-webhook
+├── cni
+│   └── flannel
+│       ├── flannel
+│       └── flannel-cni-plugin
+├── gitea
+├── k8s
+│   ├── coredns
+│   ├── deckhouse
+│   │   ├── coredns
+│   │   ├── etcd
+│   │   ├── kube-apiserver
+│   │   ├── kube-controller-manager
+│   │   ├── kube-proxy
+│   │   ├── kube-scheduler
+│   │   └── pause
+│   ├── etcd
+│   ├── kube-apiserver
+│   ├── kube-controller-manager
+│   ├── kube-proxy
+│   ├── kube-scheduler
+│   └── pause
+├── nginx
+├── prometheus
+├── python
+├── registry
+├── ruby
+└── trivy
+    └── trivy-node-collector
+</pre>
+
+Конечный каталог дерева содержит файлы:
+
+- **`Dockerfile`** - файл для сборки образа;
+
+- **`image.yml`** - файл описания метаданных для образа. 
+
+Кроме этого конечный каталог может содержать файлы и каталоги, которые помещаются в образ командами `COPY` и `ADD`. 
+
+Все вышележащие до каталога конкретного бранча (`sisyphus`, `p10`, `c10f1`, `c10f2`, ...) описывают группу (возможно пустую), в которую входит образ.
+
+Имя образа формируется как тропа дерева каталогов.
+Например:
+- `sisyphus/apache`
+- `sisyphus/k8s/kube-apiserver` 
+
+Имя тега берется либо из файла `image.yml` описания образа, либо из файла описания группы `images.yml`.
+
+## Конечный каталог описания образа
+
+###  Dockerfile
+
+Предлагается заменить шаблон `Dockerfile.template` заменить на нативный `Dockerfile`.
+Все параметры, подставляемые функцией `render_dockerfiles` скрипта   
+[/build.py](https://gitea.basealt.ru/alt/image-forge/src/branch/feature-new-layout/build.py#L249)
+заменяются на аргументы (`ARG`), инициализируемые непосредственно в `Dockerfile`или передаваемые (с заиещением) при сборко образа параметрами `--build-arg="<ARG>=<VALUE>"`.
+
+За исключением шаблона `{{ install_pakages("<пакет>" ...) }}`
+  
+Предлагается во все базовые дистрибутивы включить `shell-скрипт` `alt_install_pakages`, выполняющий функции аналогичные 
+python-функции [install_pakages](https://gitea.basealt.ru/alt/image-forge/src/branch/feature-new-layout/build.py#L250).
+
+Шаблон `{{ install_pakages("<пакет>" ...) }}` заменяется в `Dockerfile` оператором:
+```
+RUN alt_install_pakages <пакет> ...
+``` 
+
+Пример файла образа `sisyphus/k8s/kube-apiserver`:
+<pre>
+ARG BRANCH REGISTRY=gitea.basealt.ru ALT_IMAGE=base/alt:$BRANCH MAINTAINER=alt-cloud ALT_TESTSCRIPT=/bin/true
+
+FROM $REGISTRY/$ALT_IMAGE:$BRANCH
+
+MAINTAINER $MAINTAINER
+
+LABEL  org.altlinux.testscript=$ALT_TESTSCRIPT
+
+RUN alt_install_pakages kubernetes-master
+
+ENTRYPOINT ["/usr/bin/kube-apiserver"]
+</pre>
+
+### Файл image.yml описания метаданных для образа
+
+В настоящий момент он содержит (жирным шрифтом обязательные элементы):
+
+* **`image.maintainer`** - E-mail майнтейнера для создания и проверки электронной подписи образа;
+ 
+* `image.alias` - список возможных алиасов образа;
+
+* `image.tag` - тер образа (может при сборке перекрываться тегом, взятым из вышележащего файла `images.yml` описания группы)
+  
+* `image.labels` - список дополнительных метов образа, в частности:
+  
+  - `org.altlinux.testscript` - shell код для тестоиования образа при его запуске в режиме `podman ... -it --- <образ>`
+
+Пример файла образа `sisyphus/k8s/kube-apiserver`:
+<pre>
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
+</pre>
+
+
+## Каталог  группы
+
+### Файл `images.yml` описания метаданных группы
--- a/branch/sisyphus/k8s/coredns/image.yml
+++ b/branch/sisyphus/k8s/coredns/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/branch/sisyphus/k8s/images.yml
+++ b/branch/sisyphus/k8s/images.yml
@@ -0,0 +1,41 @@
+version: 1.0
+imageSet:
+  listCmd: ...
+
+  - version: 1.26.9
+    images:
+      - kube-apiserver:
+          tag: 1.26.9
+      - kube-controllermanager:
+          tag: 1.26.9
+      - kube-proxy:
+          tag: 1.26.9
+      - kube-scheduler:
+          tag: 1.26.9
+      - pause:
+          tag: 3.8
+      - coredns:
+          tag: v1.10.0
+      - etcd:
+          tag: 3.5.9
+          alias:
+          - alt/etcd:3.5.9
+
+  - version: 1.26.14
+    images:
+      - kube-apiserver:
+          tag: 1.26.14
+      - kube-controllermanager:
+          tag: 1.26.14
+      - kube-proxy:
+          tag: 1.26.14
+      - kube-scheduler:
+          tag: 1.26.14
+      - pause:
+          tag: 3.9
+      - coredns:
+          tag: v1.10.0
+      - etcd:
+          tag: 3.5.10
+          alias:
+          - alt/etcd:3.5.10
--- a/branch/sisyphus/k8s/kube-apiserver/image.yml
+++ b/branch/sisyphus/k8s/kube-apiserver/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/branch/sisyphus/k8s/kube-controller-manager/image.yml
+++ b/branch/sisyphus/k8s/kube-controller-manager/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/branch/sisyphus/k8s/kube-proxy/image.yml
+++ b/branch/sisyphus/k8s/kube-proxy/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/branch/sisyphus/k8s/kube-scheduler/image.yml
+++ b/branch/sisyphus/k8s/kube-scheduler/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/branch/sisyphus/k8s/pause/image.yml
+++ b/branch/sisyphus/k8s/pause/image.yml
@@ -0,0 +1,7 @@
+version: 1.0
+image:
+  alias:
+  - k8s-${BRANCH}/${IMAGE}:${TAG}
+  labels:
+    org.altlinux.testscript: /bin/true
+  maintainer: stepchenkoas@basealt.ru
--- a/build.py
+++ b/build.py
@@ -225,7 +225,7 @@ class DockerBuilder:
        self,
        template: str,
        organization: str,
-        install_packages=None,
+        install_pakages=None,
        **kwargs,
    ) -> str:
        if self.registry:
@@ -237,7 +237,7 @@ class DockerBuilder:
        rendered = Template(template).render(
            alt_image=alt_image,
            branch=self.branch,
-            install_packages=install_packages,
+            install_pakages=install_pakages,
            organization=organization,
            registry=registry,
            **kwargs,
@@ -247,7 +247,7 @@ class DockerBuilder:

    @forall_images(consume_result=True)
    def render_dockerfiles(self, **kwargs):
-        def install_packages(*names):
+        def install_pakages(*names):
            tasks = self.tasks.get(self.branch, kwargs["image"])
            linux32 = '$([ "$(rpm --eval %_host_cpu)" = i586 ] && echo linux32)'
            if tasks:
@@ -273,7 +273,7 @@ class DockerBuilder:
            rendered = self.render_template(
                dockerfile_template.read_text(),
                self.overwrite_organization,
-                install_packages,
+                install_pakages,
            )
            kwargs["dockerfile"].write_text(rendered + "\n")

@@ -639,7 +639,7 @@ class ImagesInfo:
 def parse_args():
    stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
    arches = ["amd64", "386", "arm64", "arm", "ppc64le"]
-    branches = ["p9", "p10", "sisyphus", "c10f1", "c10f2"]
+    branches = ["p9", "p10", "sisyphus"]
    organizations = list(ORG_DIR.iterdir())
    images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()]
    organizations = [o.name for o in organizations]
@@ -654,8 +654,7 @@ def parse_args():
        nargs="+",
        default=images,
        choices=images,
-        metavar="IMAGE_NAME",
-        help="list of images to build",
+        help="list of branches",
    )
    images_group.add_argument(
        "-o",
@@ -665,14 +664,6 @@ def parse_args():
        choices=organizations,
        help="build all images from these organizations",
    )
-    parser.add_argument(
-        "--skip-images",
-        nargs="+",
-        default=[],
-        choices=images,
-        metavar="IMAGE_NAME",
-        help="list of images to skip",
-    )
    parser.add_argument(
        "-r",
        "--registry",
@@ -705,20 +696,27 @@ def parse_args():
    parser.add_argument(
        "--sign",
    )
+    parser.add_argument(
+        "--skip-images",
+        nargs="+",
+        default=[],
+        choices=images,
+        help="list of skipping images",
+    )
    parser.add_argument(
        "-a",
        "--arches",
        nargs="+",
        default=arches,
        choices=arches,
-        help="build images for these architectures",
+        help="list of arches",
    )
    parser.add_argument(
        "--skip-arches",
        nargs="+",
        default=[],
        choices=arches,
-        help="list of architectures to skip",
+        help="list of skipping arches",
    )
    parser.add_argument(
        "-b",
@@ -726,28 +724,28 @@ def parse_args():
        nargs="+",
        default=branches,
        choices=branches,
-        help="build images for these branches",
+        help="list of branches",
    )
    parser.add_argument(
        "--skip-branches",
        nargs="+",
        default=[],
        choices=branches,
-        help="list of branches to skip",
+        help="list of skipping branches",
    )
    parser.add_argument(
        "--stages",
        nargs="+",
        default=stages,
        choices=stages,
-        help="list of stages to go through",
+        help="list of stages",
    )
    parser.add_argument(
        "--skip-stages",
        nargs="+",
        default=[],
        choices=stages,
-        help="list of stages to skip",
+        help="list of skipping stages",
    )
    args = parser.parse_args()

--- a/k8s-images.sh
+++ b/k8s-images.sh
@@ -1,59 +0,0 @@
-#!/usr/bin/env sh
-
-set -xeuo pipefail
-
-function print_help() {
-    cat <<EOF
-usage:
-$0 (build | push) <REGISTRY> <ORGANIZATION> <BRANCH>
-EOF
-}
-
-if [ "$#" -lt 4 ]; then
-    print_help
-    exit 1
-fi
-
-COMMAND=$1
-REGISTRY=${2:-"gitea.basealt.ru"}
-ORGANIZATION=${3:-"k8s-sisyphus"}
-BRANCH=${4:-"sisyphus"}
-
-shift 4
-
-[ "$COMMAND" == 'build' ] || [ "$COMMAND" == 'push' ] || exit 1
-
-function build() {
-    ./build.py \
-    --branches $BRANCH \
-    --latest $BRANCH \
-    --registry $REGISTRY \
-    --overwrite-organization $ORGANIZATION \
-    --images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-scheduler k8s/kube-proxy \
-    --tags tags.toml \
-    --skip-stages push \
-    "$@"
-}
-
-function push() {
-    ./build.py \
-    --branches $BRANCH \
-    --latest $BRANCH \
-    --registry $REGISTRY \
-    --overwrite-organization $ORGANIZATION \
-    --images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-scheduler k8s/kube-proxy \
-    --tags tags.toml \
-    --stages push \
-    "$@"
-}
-
-for version in 1.26.14 1.27.12 1.28.8; do
-    sed -i "s/kubernetes.*-/kubernetes${version::4}-/g" org/k8s/kube-*/*
-    sed -i "s/$BRANCH = \[ \"v.*\" \]/$BRANCH = \[ \"v$version\" \]/g" tags.toml
-
-    if [ "$COMMAND" == 'build' ]; then
-        build "$@"
-    elif [ "$COMMAND" == 'push' ]; then
-        push "$@"
-    fi
-done
--- a/org/alt/apache2/Dockerfile.template
+++ b/org/alt/apache2/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="http://httpd.apache.org"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("apache2") }}
+{{ install_pakages("apache2") }}

 EXPOSE 80

--- a/org/alt/base/Dockerfile.template
+++ b/org/alt/base/Dockerfile.template
@@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+{{ install_pakages("glibc-gconv-modules", "glibc-locales", "tzdata") }}

 CMD ["bash"]
--- a/org/alt/buildpack-deps-curl/Dockerfile.template
+++ b/org/alt/buildpack-deps-curl/Dockerfile.template
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-curl"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "ca-certificates",
    "curl",
    "gnupg",
--- a/org/alt/buildpack-deps-scm/Dockerfile.template
+++ b/org/alt/buildpack-deps-scm/Dockerfile.template
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-scm"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "git",
    "mercurial",
    "openssh-clients",
--- a/org/alt/buildpack-deps/Dockerfile.template
+++ b/org/alt/buildpack-deps/Dockerfile.template
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "ImageMagick",
    "autoconf",
    "automake",
--- a/org/alt/devel/Dockerfile.template
+++ b/org/alt/devel/Dockerfile.template
@@ -8,27 +8,27 @@ LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

 # install editor
-{{ install_packages("vim-console") }}
+{{ install_pakages("vim-console") }}

 # install debugging tools
-{{ install_packages("strace", "gdb") }}
+{{ install_pakages("strace", "gdb") }}

 # install document viewers
-{{ install_packages("man") }}
+{{ install_pakages("man") }}

 # install version control system
-{{ install_packages("git-core", "perl-Git") }}
+{{ install_pakages("git-core", "perl-Git") }}

 # install network utils
-{{ install_packages("iproute2", "iputils", "wget", "curl") }}
+{{ install_pakages("iproute2", "iputils", "wget", "curl") }}

 # install file utils
-{{ install_packages("lsof", "ripgrep") }}
+{{ install_pakages("lsof", "ripgrep") }}

 # install shell and completions
-{{ install_packages("zsh", "zsh-completions") }}
+{{ install_pakages("zsh", "zsh-completions") }}

 # install compilation utils
-{{ install_packages("make", "gcc", "gcc-c++") }}
+{{ install_pakages("make", "gcc", "gcc-c++") }}

 CMD ["zsh"]
--- a/org/alt/distroless-builder/Dockerfile.template
+++ b/org/alt/distroless-builder/Dockerfile.template
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"

 RUN echo %_excludedocs 1 >> /etc/rpm/macros
 RUN rpm -qalds | awk '/^normal/{print $2}' | xargs rm -rf
-{{ install_packages("python3", "glibc-utils", "apt-repo") }}
+{{ install_pakages("python3", "glibc-utils", "apt-repo") }}
 WORKDIR /usr/src/distroless
 RUN mkdir file-lists
 RUN useradd -m nonroot
--- a/org/alt/etcd/Dockerfile.template
+++ b/org/alt/etcd/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("etcd") }}
+{{ install_pakages("etcd") }}

 VOLUME /data

--- a/org/alt/gitea/Dockerfile.template
+++ b/org/alt/gitea/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/go-gitea/gitea"
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("gitea", "openssh-server", "gosu") }}
+{{ install_pakages("gitea", "openssh-server", "gosu") }}

 ENV USER gitea
 ENV HOME /var/lib/gitea
--- a/org/alt/nginx/Dockerfile.template
+++ b/org/alt/nginx/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://nginx.org/"
 LABEL org.opencontainers.image.licenses="BSD"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("nginx", "apache2-html", "tzdata") }}
+{{ install_pakages("nginx", "apache2-html", "tzdata") }}

 RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .

--- a/org/alt/node/Dockerfile.template
+++ b/org/alt/node/Dockerfile.template
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"
 RUN groupadd --gid 1000 node \
    && useradd --uid 1000 --gid node --shell /bin/bash --create-home node

-{{ install_packages(
+{{ install_pakages(
    "node",
    "npm",
    "yarn"
--- a/org/alt/prometheus/Dockerfile.template
+++ b/org/alt/prometheus/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/prometheus/prometheus"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("prometheus") }}
+{{ install_pakages("prometheus") }}

 WORKDIR /var/lib/prometheus
 USER prometheus
--- a/org/alt/python/Dockerfile.template
+++ b/org/alt/python/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/python/cpython"
 LABEL org.opencontainers.image.licenses="Python"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "python3-module-pip",
    "python3-module-setuptools",
    "python3-dev",
--- a/org/alt/registry/Dockerfile.template
+++ b/org/alt/registry/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/docker/distribution"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("docker-registry") }}
+{{ install_pakages("docker-registry") }}

 RUN ln -sf /usr/bin/docker-registry /bin/registry

--- a/org/alt/ruby/Dockerfile.template
+++ b/org/alt/ruby/Dockerfile.template
@@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/ruby/ruby"
 LABEL org.opencontainers.image.licenses="BSD-2-Clause or Ruby"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("irb") }}
+{{ install_pakages("irb") }}

 CMD ["irb"]
--- a/org/alt/systemd/Dockerfile.template
+++ b/org/alt/systemd/Dockerfile.template
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"

 ENV container docker

-{{ install_packages("systemd-sysvinit") }}
+{{ install_pakages("systemd-sysvinit") }}

 RUN ( \
        cd /lib/systemd/system/sysinit.target.wants/; \
--- a/org/alt/zot/Dockerfile.template
+++ b/org/alt/zot/Dockerfile.template
@@ -1,19 +0,0 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="zot"
-LABEL org.opencontainers.image.description="A production-ready vendor-neutral OCI-native container image registry (purely based on OCI Distribution Specification)"
-LABEL org.opencontainers.image.source="https://github.com/project-zot/zot"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("zot") }}
-
-USER _zot:_zot
-
-VOLUME ["/var/lib/zot"]
-EXPOSE 5000
-
-ENTRYPOINT ["/usr/bin/zot"]
-CMD ["serve", "/etc/zot/config.json"]
--- a/org/alt/zot/test
+++ b/org/alt/zot/test
@@ -1 +0,0 @@
-zot verify /etc/zot/config.json
--- a/org/k8s/cert-manager-cainjector/Dockerfile.template
+++ b/org/k8s/cert-manager-cainjector/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-controller/Dockerfile.template
+++ b/org/k8s/cert-manager-controller/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-webhook/Dockerfile.template
+++ b/org/k8s/cert-manager-webhook/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("coredns") }}
+{{ install_pakages("coredns") }}

 ENTRYPOINT ["/usr/bin/coredns"]
--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("etcd") }}
+{{ install_pakages("etcd") }}

 VOLUME /data

--- a/org/k8s/flannel-cni-plugin/Dockerfile.template
+++ b/org/k8s/flannel-cni-plugin/Dockerfile.template
@@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/cni-plugin"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages("cni-plugin-flannel") }}
+{{ install_pakages("cni-plugin-flannel") }}

 RUN cp /usr/libexec/cni/flannel /flannel
--- a/org/k8s/flannel/Dockerfile.template
+++ b/org/k8s/flannel/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/flannel"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "iproute2",
    "net-tools",
    "ca-certificates",
--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-apiserver"
-LABEL org.opencontainers.image.description="The Kubernetes API server validates and configures data for the api objects which include pods, services, replicationcontrollers, and others."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-apiserver"]
--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/org/k8s/kube-controller-manager/Dockerfile.template
@@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-controller-manager"
-LABEL org.opencontainers.image.description="The Kubernetes controller manager is a daemon that embeds the core control loops shipped with Kubernetes."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-controller-manager"]
--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-proxy"
-LABEL org.opencontainers.image.description="The Kubernetes network proxy runs on each node."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-node") }}
+{{ install_pakages("kubernetes-node") }}

 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy

--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-scheduler"
-LABEL org.opencontainers.image.description="The Kubernetes scheduler is a control plane process which assigns Pods to Nodes."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-scheduler"]
--- a/org/k8s/pause/Dockerfile.template
+++ b/org/k8s/pause/Dockerfile.template
@@ -1,6 +1,6 @@
 FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer

-{{ install_packages("kubernetes-pause") }}
+{{ install_pakages("kubernetes-pause") }}

 FROM scratch

--- a/org/k8s/trivy-node-collector/Dockerfile.template
+++ b/org/k8s/trivy-node-collector/Dockerfile.template
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "k8s-trivy-node-collector"
 ) }}

--- a/tags.toml
+++ b/tags.toml
@@ -1,77 +1,51 @@
 ["k8s/kube-apiserver"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-controller-manager"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-scheduler"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-proxy"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/pause"]
 p10 = [ "3.9" ]
 sisyphus = [ "3.9" ]
-c10f1 = [ "3.9" ]
-c10f2 = [ "3.9" ]

 ["k8s/etcd"]
 p10 = [ "3.5.12-0" ]
 sisyphus = [ "3.5.12-0" ]
-c10f1 = [ "3.5.9-0" ]
-c10f2 = [ "3.5.9-0" ]

 ["k8s/coredns"]
 p10 = [ "v1.10.1" ]
 sisyphus = [ "v1.10.1" ]
-c10f1 = [ "v1.9.3" ]
-c10f2 = [ "v1.9.3" ] 

 ["k8s/cert-manager-cainjector"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/cert-manager-controller"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/cert-manager-webhook"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/flannel"]
 p10 = [ "v0.21.4" ]
 sisyphus = [ "v0.24.2" ]
-c10f1 = [ "v0.21.4" ]
-c10f2 = [ "v0.21.4" ]

 ["k8s/flannel-cni-plugin"]
 p10 = [ "v1.1.2" ]
 sisyphus = [ "v1.2.0" ]
-c10f1 = [ "v1.1.2" ]
-c10f2 = [ "v1.1.2" ]

 ["k8s/trivy-node-collector"]
 p10 = [ "0.0.9" ]
 sisyphus = [ "0.0.9" ]
-c10f1 = [ "0.0.9" ]
-c10f2 = [ "0.0.9" ]
Author	SHA1	Message	Date
Alexey Kostarev	ba60c43424	Реализован вариант двухуровневого дерева	2024-04-24 14:17:42 +05:00
Алексей Костарев	3b652fc6b0	Обновить branch/README.md	2024-04-23 10:04:32 +03:00
Алексей Костарев	2b923e4c96	Обновить branch/README.md	2024-04-23 10:03:48 +03:00
Alexey Kostarev	9175f34e52	Правка документации	2024-04-23 11:45:11 +05:00
Алексей Костарев	f3f74f56dd	Обновить branch/README.md	2024-04-23 09:26:37 +03:00
Alexey Kostarev	31de830d2e	Постоено основное дерево в branch/sisyphus, оформлены основные файлы в группе ranch/sisyphus/k8s	2024-04-23 10:54:20 +05:00