From 770fb7021ed21940c29daf7c550a3ff2aadb0b37 Mon Sep 17 00:00:00 2001
From: Alexey Kostarev <kaf@altlinux.org>
Date: Wed, 22 May 2024 12:54:45 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B1=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=20=D1=81=D0=BE=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=81=D0=BD=D0=BE=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BC=20=D0=B4=D0=BE=D0=B3=D0=BE=D0=B2=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D1=8F=D0=BC,=20=D1=81?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5?=
 =?UTF-8?q?=20images.yml=20=D0=B4=D0=BB=D1=8F=20k8s,=20flannel,=20cert-man?=
 =?UTF-8?q?ager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 branch/sisyphus/apache/Dockerfile             |  17 -
 branch/sisyphus/cert-manager/images.yml       | 403 +++++++++
 .../cni/flannel/flannel-cni-plugin/Dockerfile |  13 -
 .../sisyphus/cni/flannel/flannel/Dockerfile   |  28 -
 branch/sisyphus/flannel/images.yml            | 147 +++
 branch/sisyphus/k8s/coredns                   |   1 +
 .../sisyphus/k8s/deckhouse/coredns/image.yml  |   7 -
 .../k8s/deckhouse/deckhouse/images.yml        |  65 --
 branch/sisyphus/k8s/deckhouse/images.yml      |  65 --
 .../k8s/deckhouse/kube-apiserver/image.yml    |   7 -
 .../kube-controller-manager/image.yml         |   7 -
 .../k8s/deckhouse/kube-proxy/image.yml        |   7 -
 .../k8s/deckhouse/kube-scheduler/image.yml    |   7 -
 branch/sisyphus/k8s/deckhouse/pause/image.yml |   7 -
 branch/sisyphus/k8s/etcd                      |   1 +
 branch/sisyphus/k8s/etcd/Dockerfile           |  13 -
 branch/sisyphus/k8s/images.yml                | 836 +++++++++++++++++-
 .../{k8s => target}/coredns/Dockerfile        |   0
 .../{k8s => target}/coredns/image.yml         |   0
 branch/sisyphus/{ => target}/etcd/Dockerfile  |   0
 branch/sisyphus/{ => target}/etcd/image.yml   |   0
 branch/sisyphus/{ => target}/gitea/Dockerfile |   0
 branch/sisyphus/{ => target}/gitea/image.yml  |   0
 branch/sisyphus/{ => target}/nginx/Dockerfile |   0
 branch/sisyphus/{ => target}/nginx/image.yml  |   0
 .../{ => target}/prometheus/Dockerfile        |   0
 .../{ => target}/prometheus/image.yml         |   0
 .../sisyphus/{ => target}/python/Dockerfile   |   0
 branch/sisyphus/{ => target}/python/image.yml |   0
 .../sisyphus/{ => target}/registry/Dockerfile |   0
 .../sisyphus/{ => target}/registry/image.yml  |   0
 branch/sisyphus/{ => target}/ruby/Dockerfile  |   0
 branch/sisyphus/{ => target}/ruby/image.yml   |   0
 branch/sisyphus/{ => target}/trivy/Dockerfile |   0
 branch/sisyphus/{ => target}/trivy/image.yml  |   0
 .../sisyphus/trivy-node-collector/Dockerfile  |  17 -
 36 files changed, 1351 insertions(+), 297 deletions(-)
 delete mode 100644 branch/sisyphus/apache/Dockerfile
 create mode 100644 branch/sisyphus/cert-manager/images.yml
 delete mode 100644 branch/sisyphus/cni/flannel/flannel-cni-plugin/Dockerfile
 delete mode 100644 branch/sisyphus/cni/flannel/flannel/Dockerfile
 create mode 100644 branch/sisyphus/flannel/images.yml
 create mode 120000 branch/sisyphus/k8s/coredns
 delete mode 100644 branch/sisyphus/k8s/deckhouse/coredns/image.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/deckhouse/images.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/images.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/kube-apiserver/image.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/kube-controller-manager/image.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/kube-proxy/image.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/kube-scheduler/image.yml
 delete mode 100644 branch/sisyphus/k8s/deckhouse/pause/image.yml
 create mode 120000 branch/sisyphus/k8s/etcd
 delete mode 100644 branch/sisyphus/k8s/etcd/Dockerfile
 rename branch/sisyphus/{k8s => target}/coredns/Dockerfile (100%)
 rename branch/sisyphus/{k8s => target}/coredns/image.yml (100%)
 rename branch/sisyphus/{ => target}/etcd/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/etcd/image.yml (100%)
 rename branch/sisyphus/{ => target}/gitea/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/gitea/image.yml (100%)
 rename branch/sisyphus/{ => target}/nginx/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/nginx/image.yml (100%)
 rename branch/sisyphus/{ => target}/prometheus/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/prometheus/image.yml (100%)
 rename branch/sisyphus/{ => target}/python/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/python/image.yml (100%)
 rename branch/sisyphus/{ => target}/registry/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/registry/image.yml (100%)
 rename branch/sisyphus/{ => target}/ruby/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/ruby/image.yml (100%)
 rename branch/sisyphus/{ => target}/trivy/Dockerfile (100%)
 rename branch/sisyphus/{ => target}/trivy/image.yml (100%)
 delete mode 100644 branch/sisyphus/trivy-node-collector/Dockerfile

diff --git a/branch/sisyphus/apache/Dockerfile b/branch/sisyphus/apache/Dockerfile
deleted file mode 100644
index d2fa10f..0000000
--- a/branch/sisyphus/apache/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-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.opencontainers.image.title="apache2"
-LABEL org.opencontainers.image.description="The most widely used Web server on the Internet"
-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"
-
-RUN alt_install_pakages apache2
-
-EXPOSE 80
-
-CMD ["/usr/sbin/httpd2", "-D", "NO_DETACH", "-k", "start"]
diff --git a/branch/sisyphus/cert-manager/images.yml b/branch/sisyphus/cert-manager/images.yml
new file mode 100644
index 0000000..b5ea35e
--- /dev/null
+++ b/branch/sisyphus/cert-manager/images.yml
@@ -0,0 +1,403 @@
+version: 1.0
+imageSet:
+
+  - version: v1.26.0
+    cert-manager-cainjector:
+      tag: v1.26.0
+    cert-manager-controller:
+      tag: v1.26.0
+    cert-manager-webhook:
+      tag: v1.26.0
+
+  - version: v1.26.1
+    cert-manager-cainjector:
+      tag: v1.26.1
+    cert-manager-controller:
+      tag: v1.26.1
+    cert-manager-webhook:
+      tag: v1.26.1
+
+  - version: v1.26.2
+    cert-manager-cainjector:
+      tag: v1.26.2
+    cert-manager-controller:
+      tag: v1.26.2
+    cert-manager-webhook:
+      tag: v1.26.2
+
+  - version: v1.26.3
+    cert-manager-cainjector:
+      tag: v1.26.3
+    cert-manager-controller:
+      tag: v1.26.3
+    cert-manager-webhook:
+      tag: v1.26.3
+
+  - version: v1.26.4
+    cert-manager-cainjector:
+      tag: v1.26.4
+    cert-manager-controller:
+      tag: v1.26.4
+    cert-manager-webhook:
+      tag: v1.26.4
+
+  - version: v1.26.5
+    cert-manager-cainjector:
+      tag: v1.26.5
+    cert-manager-controller:
+      tag: v1.26.5
+    cert-manager-webhook:
+      tag: v1.26.5
+
+  - version: v1.26.6
+    cert-manager-cainjector:
+      tag: v1.26.6
+    cert-manager-controller:
+      tag: v1.26.6
+    cert-manager-webhook:
+      tag: v1.26.6
+
+  - version: v1.26.7
+    cert-manager-cainjector:
+      tag: v1.26.7
+    cert-manager-controller:
+      tag: v1.26.7
+    cert-manager-webhook:
+      tag: v1.26.7
+
+  - version: v1.26.8
+    cert-manager-cainjector:
+      tag: v1.26.8
+    cert-manager-controller:
+      tag: v1.26.8
+    cert-manager-webhook:
+      tag: v1.26.8
+
+  - version: v1.26.9
+    cert-manager-cainjector:
+      tag: v1.26.9
+    cert-manager-controller:
+      tag: v1.26.9
+    cert-manager-webhook:
+      tag: v1.26.9
+
+  - version: v1.26.10
+    cert-manager-cainjector:
+      tag: v1.26.10
+    cert-manager-controller:
+      tag: v1.26.10
+    cert-manager-webhook:
+      tag: v1.26.10
+
+  - version: v1.26.11
+    cert-manager-cainjector:
+      tag: v1.26.11
+    cert-manager-controller:
+      tag: v1.26.11
+    cert-manager-webhook:
+      tag: v1.26.11
+
+  - version: v1.26.12
+    cert-manager-cainjector:
+      tag: v1.26.12
+    cert-manager-controller:
+      tag: v1.26.12
+    cert-manager-webhook:
+      tag: v1.26.12
+
+  - version: v1.26.13
+    cert-manager-cainjector:
+      tag: v1.26.13
+    cert-manager-controller:
+      tag: v1.26.13
+    cert-manager-webhook:
+      tag: v1.26.13
+
+  - version: v1.26.14
+    cert-manager-cainjector:
+      tag: v1.26.14
+    cert-manager-controller:
+      tag: v1.26.14
+    cert-manager-webhook:
+      tag: v1.26.14
+
+  - version: v1.26.15
+    cert-manager-cainjector:
+      tag: v1.26.15
+    cert-manager-controller:
+      tag: v1.26.15
+    cert-manager-webhook:
+      tag: v1.26.15
+
+  - version: v1.27.0
+    cert-manager-cainjector:
+      tag: v1.27.0
+    cert-manager-controller:
+      tag: v1.27.0
+    cert-manager-webhook:
+      tag: v1.27.0
+
+  - version: v1.27.1
+    cert-manager-cainjector:
+      tag: v1.27.1
+    cert-manager-controller:
+      tag: v1.27.1
+    cert-manager-webhook:
+      tag: v1.27.1
+
+  - version: v1.27.2
+    cert-manager-cainjector:
+      tag: v1.27.2
+    cert-manager-controller:
+      tag: v1.27.2
+    cert-manager-webhook:
+      tag: v1.27.2
+
+  - version: v1.27.3
+    cert-manager-cainjector:
+      tag: v1.27.3
+    cert-manager-controller:
+      tag: v1.27.3
+    cert-manager-webhook:
+      tag: v1.27.3
+
+  - version: v1.27.4
+    cert-manager-cainjector:
+      tag: v1.27.4
+    cert-manager-controller:
+      tag: v1.27.4
+    cert-manager-webhook:
+      tag: v1.27.4
+
+  - version: v1.27.5
+    cert-manager-cainjector:
+      tag: v1.27.5
+    cert-manager-controller:
+      tag: v1.27.5
+    cert-manager-webhook:
+      tag: v1.27.5
+
+  - version: v1.27.6
+    cert-manager-cainjector:
+      tag: v1.27.6
+    cert-manager-controller:
+      tag: v1.27.6
+    cert-manager-webhook:
+      tag: v1.27.6
+
+  - version: v1.27.7
+    cert-manager-cainjector:
+      tag: v1.27.7
+    cert-manager-controller:
+      tag: v1.27.7
+    cert-manager-webhook:
+      tag: v1.27.7
+
+  - version: v1.27.8
+    cert-manager-cainjector:
+      tag: v1.27.8
+    cert-manager-controller:
+      tag: v1.27.8
+    cert-manager-webhook:
+      tag: v1.27.8
+
+  - version: v1.27.9
+    cert-manager-cainjector:
+      tag: v1.27.9
+    cert-manager-controller:
+      tag: v1.27.9
+    cert-manager-webhook:
+      tag: v1.27.9
+
+  - version: v1.27.10
+    cert-manager-cainjector:
+      tag: v1.27.10
+    cert-manager-controller:
+      tag: v1.27.10
+    cert-manager-webhook:
+      tag: v1.27.10
+
+  - version: v1.27.11
+    cert-manager-cainjector:
+      tag: v1.27.11
+    cert-manager-controller:
+      tag: v1.27.11
+    cert-manager-webhook:
+      tag: v1.27.11
+
+  - version: v1.27.12
+    cert-manager-cainjector:
+      tag: v1.27.12
+    cert-manager-controller:
+      tag: v1.27.12
+    cert-manager-webhook:
+      tag: v1.27.12
+
+  - version: v1.27.13
+    cert-manager-cainjector:
+      tag: v1.27.13
+    cert-manager-controller:
+      tag: v1.27.13
+    cert-manager-webhook:
+      tag: v1.27.13
+
+  - version: v1.27.14
+    cert-manager-cainjector:
+      tag: v1.27.14
+    cert-manager-controller:
+      tag: v1.27.14
+    cert-manager-webhook:
+      tag: v1.27.14
+
+  - version: v1.28.0
+    cert-manager-cainjector:
+      tag: v1.28.0
+    cert-manager-controller:
+      tag: v1.28.0
+    cert-manager-webhook:
+      tag: v1.28.0
+
+  - version: v1.28.1
+    cert-manager-cainjector:
+      tag: v1.28.1
+    cert-manager-controller:
+      tag: v1.28.1
+    cert-manager-webhook:
+      tag: v1.28.1
+
+  - version: v1.28.2
+    cert-manager-cainjector:
+      tag: v1.28.2
+    cert-manager-controller:
+      tag: v1.28.2
+    cert-manager-webhook:
+      tag: v1.28.2
+
+  - version: v1.28.3
+    cert-manager-cainjector:
+      tag: v1.28.3
+    cert-manager-controller:
+      tag: v1.28.3
+    cert-manager-webhook:
+      tag: v1.28.3
+
+  - version: v1.28.4
+    cert-manager-cainjector:
+      tag: v1.28.4
+    cert-manager-controller:
+      tag: v1.28.4
+    cert-manager-webhook:
+      tag: v1.28.4
+
+  - version: v1.28.5
+    cert-manager-cainjector:
+      tag: v1.28.5
+    cert-manager-controller:
+      tag: v1.28.5
+    cert-manager-webhook:
+      tag: v1.28.5
+
+  - version: v1.28.6
+    cert-manager-cainjector:
+      tag: v1.28.6
+    cert-manager-controller:
+      tag: v1.28.6
+    cert-manager-webhook:
+      tag: v1.28.6
+
+  - version: v1.28.7
+    cert-manager-cainjector:
+      tag: v1.28.7
+    cert-manager-controller:
+      tag: v1.28.7
+    cert-manager-webhook:
+      tag: v1.28.7
+
+  - version: v1.28.8
+    cert-manager-cainjector:
+      tag: v1.28.8
+    cert-manager-controller:
+      tag: v1.28.8
+    cert-manager-webhook:
+      tag: v1.28.8
+
+  - version: v1.28.9
+    cert-manager-cainjector:
+      tag: v1.28.9
+    cert-manager-controller:
+      tag: v1.28.9
+    cert-manager-webhook:
+      tag: v1.28.9
+
+  - version: v1.28.10
+    cert-manager-cainjector:
+      tag: v1.28.10
+    cert-manager-controller:
+      tag: v1.28.10
+    cert-manager-webhook:
+      tag: v1.28.10
+
+  - version: v1.29.0
+    cert-manager-cainjector:
+      tag: v1.29.0
+    cert-manager-controller:
+      tag: v1.29.0
+    cert-manager-webhook:
+      tag: v1.29.0
+
+  - version: v1.29.1
+    cert-manager-cainjector:
+      tag: v1.29.1
+    cert-manager-controller:
+      tag: v1.29.1
+    cert-manager-webhook:
+      tag: v1.29.1
+
+  - version: v1.29.2
+    cert-manager-cainjector:
+      tag: v1.29.2
+    cert-manager-controller:
+      tag: v1.29.2
+    cert-manager-webhook:
+      tag: v1.29.2
+
+  - version: v1.29.3
+    cert-manager-cainjector:
+      tag: v1.29.3
+    cert-manager-controller:
+      tag: v1.29.3
+    cert-manager-webhook:
+      tag: v1.29.3
+
+  - version: v1.29.4
+    cert-manager-cainjector:
+      tag: v1.29.4
+    cert-manager-controller:
+      tag: v1.29.4
+    cert-manager-webhook:
+      tag: v1.29.4
+
+  - version: v1.29.5
+    cert-manager-cainjector:
+      tag: v1.29.5
+    cert-manager-controller:
+      tag: v1.29.5
+    cert-manager-webhook:
+      tag: v1.29.5
+
+  - version: v1.30.0
+    cert-manager-cainjector:
+      tag: v1.30.0
+    cert-manager-controller:
+      tag: v1.30.0
+    cert-manager-webhook:
+      tag: v1.30.0
+
+  - version: v1.30.1
+    cert-manager-cainjector:
+      tag: v1.30.1
+    cert-manager-controller:
+      tag: v1.30.1
+    cert-manager-webhook:
+      tag: v1.30.1
+
diff --git a/branch/sisyphus/cni/flannel/flannel-cni-plugin/Dockerfile b/branch/sisyphus/cni/flannel/flannel-cni-plugin/Dockerfile
deleted file mode 100644
index 97a81ea..0000000
--- a/branch/sisyphus/cni/flannel/flannel-cni-plugin/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="flannel-cni-plugin"
-LABEL org.opencontainers.image.description="CNI network plugin that is powered by flannel"
-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_pakages("cni-plugin-flannel") }}
-
-RUN cp /usr/libexec/cni/flannel /flannel
diff --git a/branch/sisyphus/cni/flannel/flannel/Dockerfile b/branch/sisyphus/cni/flannel/flannel/Dockerfile
deleted file mode 100644
index 62fc522..0000000
--- a/branch/sisyphus/cni/flannel/flannel/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="flannel"
-LABEL org.opencontainers.image.description="Network fabric for containers"
-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_pakages(
-    "iproute2",
-    "net-tools",
-    "ca-certificates",
-    "iptables",
-    "iptables-nft",
-    "strongswan",
-    "wireguard-tools",
-    "flannel",
-    "wget",
-) }}
-
-RUN update-ca-trust
-
-RUN mkdir -p /opt/bin/ && cp /usr/sbin/flanneld /opt/bin/flanneld
-RUN cp /usr/libexec/flannel/mk-docker-opts.sh /opt/bin/
-
-ENTRYPOINT ["/opt/bin/flanneld"]
diff --git a/branch/sisyphus/flannel/images.yml b/branch/sisyphus/flannel/images.yml
new file mode 100644
index 0000000..79d2e2d
--- /dev/null
+++ b/branch/sisyphus/flannel/images.yml
@@ -0,0 +1,147 @@
+version: 1.0
+imageSet:
+
+  - version: v0.19.0
+    flannel:
+      tag: v0.19.0
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.19.1
+    flannel:
+      tag: v0.19.1
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.19.2
+    flannel:
+      tag: v0.19.2
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.20.0
+    flannel:
+      tag: v0.20.0
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.20.1
+    flannel:
+      tag: v0.20.1
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.20.2
+    flannel:
+      tag: v0.20.2
+    'flannel-cni-plugin':
+      tag: v1.1.0
+
+  - version: v0.21.0
+    flannel:
+      tag: v0.21.0
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.21.1
+    flannel:
+      tag: v0.21.1
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.21.2
+    flannel:
+      tag: v0.21.2
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.21.3
+    flannel:
+      tag: v0.21.3
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.21.4
+    flannel:
+      tag: v0.21.4
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.21.5
+    flannel:
+      tag: v0.21.5
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.22.0
+    flannel:
+      tag: v0.22.0
+    'flannel-cni-plugin':
+      tag: v1.1.2
+
+  - version: v0.22.1
+    flannel:
+      tag: v0.22.1
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.22.2
+    flannel:
+      tag: v0.22.2
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.22.3
+    flannel:
+      tag: v0.22.3
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.23.0
+    flannel:
+      tag: v0.23.0
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.24.0
+    flannel:
+      tag: v0.24.0
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.24.1
+    flannel:
+      tag: v0.24.1
+    'flannel-cni-plugin':
+      tag: v1.2.0
+
+  - version: v0.24.2
+    flannel:
+      tag: v0.24.2
+    'flannel-cni-plugin':
+      tag: v1.4.0-flannel1
+
+  - version: v0.24.3
+    flannel:
+      tag: v0.24.3
+    'flannel-cni-plugin':
+      tag: v1.4.0-flannel1
+
+  - version: v0.24.4
+    flannel:
+      tag: v0.24.4
+    'flannel-cni-plugin':
+      tag: v1.4.0-flannel1
+
+  - version: v0.25.0
+    flannel:
+      tag: v0.25.0
+    'flannel-cni-plugin':
+      tag: v1.4.0-flannel1
+
+  - version: v0.25.1
+    flannel:
+      tag: v0.25.1
+    'flannel-cni-plugin':
+      tag: v1.4.0-flannel1
+
diff --git a/branch/sisyphus/k8s/coredns b/branch/sisyphus/k8s/coredns
new file mode 120000
index 0000000..2ffcb69
--- /dev/null
+++ b/branch/sisyphus/k8s/coredns
@@ -0,0 +1 @@
+../target/coredns/
\ No newline at end of file
diff --git a/branch/sisyphus/k8s/deckhouse/coredns/image.yml b/branch/sisyphus/k8s/deckhouse/coredns/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/coredns/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/deckhouse/deckhouse/images.yml b/branch/sisyphus/k8s/deckhouse/deckhouse/images.yml
deleted file mode 100644
index 7c6e0d1..0000000
--- a/branch/sisyphus/k8s/deckhouse/deckhouse/images.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-version: 1.0
-imageSet:
-
-  - version: 1.26.9
-    images:
-      - kube-apiserver:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-controllermanager:
-          tag: 1.26.9
-          alias: k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-proxy:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-scheduler:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - pause:
-          tag: 3.8
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - coredns:
-          tag: v1.10.0
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - etcd:
-          tag: 3.5.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-          - alt/etcd:3.5.9
-
-  - version: 1.26.14
-    images:
-      - kube-apiserver:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-controllermanager:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-proxy:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-scheduler:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - pause:
-          tag: 3.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - coredns:
-          tag: v1.10.0
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - etcd:
-          tag: 3.5.10
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-          - alt/etcd:3.5.10
diff --git a/branch/sisyphus/k8s/deckhouse/images.yml b/branch/sisyphus/k8s/deckhouse/images.yml
deleted file mode 100644
index 7c6e0d1..0000000
--- a/branch/sisyphus/k8s/deckhouse/images.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-version: 1.0
-imageSet:
-
-  - version: 1.26.9
-    images:
-      - kube-apiserver:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-controllermanager:
-          tag: 1.26.9
-          alias: k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-proxy:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-scheduler:
-          tag: 1.26.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - pause:
-          tag: 3.8
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - coredns:
-          tag: v1.10.0
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - etcd:
-          tag: 3.5.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-          - alt/etcd:3.5.9
-
-  - version: 1.26.14
-    images:
-      - kube-apiserver:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-controllermanager:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-proxy:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - kube-scheduler:
-          tag: 1.26.14
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - pause:
-          tag: 3.9
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - coredns:
-          tag: v1.10.0
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-      - etcd:
-          tag: 3.5.10
-          alias:
-          - k8s-${BRANCH}/${IMAGE}:${TAG}
-          - alt/etcd:3.5.10
diff --git a/branch/sisyphus/k8s/deckhouse/kube-apiserver/image.yml b/branch/sisyphus/k8s/deckhouse/kube-apiserver/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/kube-apiserver/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/deckhouse/kube-controller-manager/image.yml b/branch/sisyphus/k8s/deckhouse/kube-controller-manager/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/kube-controller-manager/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/deckhouse/kube-proxy/image.yml b/branch/sisyphus/k8s/deckhouse/kube-proxy/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/kube-proxy/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/deckhouse/kube-scheduler/image.yml b/branch/sisyphus/k8s/deckhouse/kube-scheduler/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/kube-scheduler/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/deckhouse/pause/image.yml b/branch/sisyphus/k8s/deckhouse/pause/image.yml
deleted file mode 100644
index 8a80ab2..0000000
--- a/branch/sisyphus/k8s/deckhouse/pause/image.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
diff --git a/branch/sisyphus/k8s/etcd b/branch/sisyphus/k8s/etcd
new file mode 120000
index 0000000..1969848
--- /dev/null
+++ b/branch/sisyphus/k8s/etcd
@@ -0,0 +1 @@
+../target/etcd/
\ No newline at end of file
diff --git a/branch/sisyphus/k8s/etcd/Dockerfile b/branch/sisyphus/k8s/etcd/Dockerfile
deleted file mode 100644
index 97231d4..0000000
--- a/branch/sisyphus/k8s/etcd/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-ARG BRANCH REGISTRY=gitea.basealt.ru ALT_IMAGE=base/alt:$BRANCH MAINTAINER=alt-cloud ALT_TESTSCRIPT=/bin/true
-
-FROM $REGISTRY/etcd:$BRANCH
-
-MAINTAINER $MAINTAINER
-
-LABEL org.opencontainers.image.title="coredns"
-LABEL org.opencontainers.image.description="CoreDNS is a DNS server that chains plugins"
-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"
-LABEL  org.altlinux.testscript=$ALT_TESTSCRIPT
-
diff --git a/branch/sisyphus/k8s/images.yml b/branch/sisyphus/k8s/images.yml
index 848cbf7..32fabd7 100644
--- a/branch/sisyphus/k8s/images.yml
+++ b/branch/sisyphus/k8s/images.yml
@@ -1,41 +1,803 @@
 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: v1.26.0
+    kube-apiserver:
+      tag: v1.26.0
+    kube-controllermanager:
+      tag: v1.26.0
+    kube-proxy:
+      tag: v1.26.0
+    kube-scheduler:
+      tag: v1.26.0
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.1
+    kube-apiserver:
+      tag: v1.26.1
+    kube-controllermanager:
+      tag: v1.26.1
+    kube-proxy:
+      tag: v1.26.1
+    kube-scheduler:
+      tag: v1.26.1
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.2
+    kube-apiserver:
+      tag: v1.26.2
+    kube-controllermanager:
+      tag: v1.26.2
+    kube-proxy:
+      tag: v1.26.2
+    kube-scheduler:
+      tag: v1.26.2
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.3
+    kube-apiserver:
+      tag: v1.26.3
+    kube-controllermanager:
+      tag: v1.26.3
+    kube-proxy:
+      tag: v1.26.3
+    kube-scheduler:
+      tag: v1.26.3
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.4
+    kube-apiserver:
+      tag: v1.26.4
+    kube-controllermanager:
+      tag: v1.26.4
+    kube-proxy:
+      tag: v1.26.4
+    kube-scheduler:
+      tag: v1.26.4
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.5
+    kube-apiserver:
+      tag: v1.26.5
+    kube-controllermanager:
+      tag: v1.26.5
+    kube-proxy:
+      tag: v1.26.5
+    kube-scheduler:
+      tag: v1.26.5
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.6
+    kube-apiserver:
+      tag: v1.26.6
+    kube-controllermanager:
+      tag: v1.26.6
+    kube-proxy:
+      tag: v1.26.6
+    kube-scheduler:
+      tag: v1.26.6
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.7
+    kube-apiserver:
+      tag: v1.26.7
+    kube-controllermanager:
+      tag: v1.26.7
+    kube-proxy:
+      tag: v1.26.7
+    kube-scheduler:
+      tag: v1.26.7
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.8
+    kube-apiserver:
+      tag: v1.26.8
+    kube-controllermanager:
+      tag: v1.26.8
+    kube-proxy:
+      tag: v1.26.8
+    kube-scheduler:
+      tag: v1.26.8
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.9
+    kube-apiserver:
+      tag: v1.26.9
+    kube-controllermanager:
+      tag: v1.26.9
+    kube-proxy:
+      tag: v1.26.9
+    kube-scheduler:
+      tag: v1.26.9
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.6-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.10
+    kube-apiserver:
+      tag: v1.26.10
+    kube-controllermanager:
+      tag: v1.26.10
+    kube-proxy:
+      tag: v1.26.10
+    kube-scheduler:
+      tag: v1.26.10
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.11
+    kube-apiserver:
+      tag: v1.26.11
+    kube-controllermanager:
+      tag: v1.26.11
+    kube-proxy:
+      tag: v1.26.11
+    kube-scheduler:
+      tag: v1.26.11
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.12
+    kube-apiserver:
+      tag: v1.26.12
+    kube-controllermanager:
+      tag: v1.26.12
+    kube-proxy:
+      tag: v1.26.12
+    kube-scheduler:
+      tag: v1.26.12
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.13
+    kube-apiserver:
+      tag: v1.26.13
+    kube-controllermanager:
+      tag: v1.26.13
+    kube-proxy:
+      tag: v1.26.13
+    kube-scheduler:
+      tag: v1.26.13
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.14
+    kube-apiserver:
+      tag: v1.26.14
+    kube-controllermanager:
+      tag: v1.26.14
+    kube-proxy:
+      tag: v1.26.14
+    kube-scheduler:
+      tag: v1.26.14
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.26.15
+    kube-apiserver:
+      tag: v1.26.15
+    kube-controllermanager:
+      tag: v1.26.15
+    kube-proxy:
+      tag: v1.26.15
+    kube-scheduler:
+      tag: v1.26.15
+    coredns:
+      tag: v1.9.3
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.0
+    kube-apiserver:
+      tag: v1.27.0
+    kube-controllermanager:
+      tag: v1.27.0
+    kube-proxy:
+      tag: v1.27.0
+    kube-scheduler:
+      tag: v1.27.0
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.1
+    kube-apiserver:
+      tag: v1.27.1
+    kube-controllermanager:
+      tag: v1.27.1
+    kube-proxy:
+      tag: v1.27.1
+    kube-scheduler:
+      tag: v1.27.1
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.2
+    kube-apiserver:
+      tag: v1.27.2
+    kube-controllermanager:
+      tag: v1.27.2
+    kube-proxy:
+      tag: v1.27.2
+    kube-scheduler:
+      tag: v1.27.2
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.3
+    kube-apiserver:
+      tag: v1.27.3
+    kube-controllermanager:
+      tag: v1.27.3
+    kube-proxy:
+      tag: v1.27.3
+    kube-scheduler:
+      tag: v1.27.3
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.4
+    kube-apiserver:
+      tag: v1.27.4
+    kube-controllermanager:
+      tag: v1.27.4
+    kube-proxy:
+      tag: v1.27.4
+    kube-scheduler:
+      tag: v1.27.4
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.5
+    kube-apiserver:
+      tag: v1.27.5
+    kube-controllermanager:
+      tag: v1.27.5
+    kube-proxy:
+      tag: v1.27.5
+    kube-scheduler:
+      tag: v1.27.5
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.6
+    kube-apiserver:
+      tag: v1.27.6
+    kube-controllermanager:
+      tag: v1.27.6
+    kube-proxy:
+      tag: v1.27.6
+    kube-scheduler:
+      tag: v1.27.6
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.7-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.7
+    kube-apiserver:
+      tag: v1.27.7
+    kube-controllermanager:
+      tag: v1.27.7
+    kube-proxy:
+      tag: v1.27.7
+    kube-scheduler:
+      tag: v1.27.7
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.8
+    kube-apiserver:
+      tag: v1.27.8
+    kube-controllermanager:
+      tag: v1.27.8
+    kube-proxy:
+      tag: v1.27.8
+    kube-scheduler:
+      tag: v1.27.8
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.9
+    kube-apiserver:
+      tag: v1.27.9
+    kube-controllermanager:
+      tag: v1.27.9
+    kube-proxy:
+      tag: v1.27.9
+    kube-scheduler:
+      tag: v1.27.9
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.10
+    kube-apiserver:
+      tag: v1.27.10
+    kube-controllermanager:
+      tag: v1.27.10
+    kube-proxy:
+      tag: v1.27.10
+    kube-scheduler:
+      tag: v1.27.10
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.11
+    kube-apiserver:
+      tag: v1.27.11
+    kube-controllermanager:
+      tag: v1.27.11
+    kube-proxy:
+      tag: v1.27.11
+    kube-scheduler:
+      tag: v1.27.11
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.12
+    kube-apiserver:
+      tag: v1.27.12
+    kube-controllermanager:
+      tag: v1.27.12
+    kube-proxy:
+      tag: v1.27.12
+    kube-scheduler:
+      tag: v1.27.12
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.13
+    kube-apiserver:
+      tag: v1.27.13
+    kube-controllermanager:
+      tag: v1.27.13
+    kube-proxy:
+      tag: v1.27.13
+    kube-scheduler:
+      tag: v1.27.13
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.27.14
+    kube-apiserver:
+      tag: v1.27.14
+    kube-controllermanager:
+      tag: v1.27.14
+    kube-proxy:
+      tag: v1.27.14
+    kube-scheduler:
+      tag: v1.27.14
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.0
+    kube-apiserver:
+      tag: v1.28.0
+    kube-controllermanager:
+      tag: v1.28.0
+    kube-proxy:
+      tag: v1.28.0
+    kube-scheduler:
+      tag: v1.28.0
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.1
+    kube-apiserver:
+      tag: v1.28.1
+    kube-controllermanager:
+      tag: v1.28.1
+    kube-proxy:
+      tag: v1.28.1
+    kube-scheduler:
+      tag: v1.28.1
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.2
+    kube-apiserver:
+      tag: v1.28.2
+    kube-controllermanager:
+      tag: v1.28.2
+    kube-proxy:
+      tag: v1.28.2
+    kube-scheduler:
+      tag: v1.28.2
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.3
+    kube-apiserver:
+      tag: v1.28.3
+    kube-controllermanager:
+      tag: v1.28.3
+    kube-proxy:
+      tag: v1.28.3
+    kube-scheduler:
+      tag: v1.28.3
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.4
+    kube-apiserver:
+      tag: v1.28.4
+    kube-controllermanager:
+      tag: v1.28.4
+    kube-proxy:
+      tag: v1.28.4
+    kube-scheduler:
+      tag: v1.28.4
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.5
+    kube-apiserver:
+      tag: v1.28.5
+    kube-controllermanager:
+      tag: v1.28.5
+    kube-proxy:
+      tag: v1.28.5
+    kube-scheduler:
+      tag: v1.28.5
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.9-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.6
+    kube-apiserver:
+      tag: v1.28.6
+    kube-controllermanager:
+      tag: v1.28.6
+    kube-proxy:
+      tag: v1.28.6
+    kube-scheduler:
+      tag: v1.28.6
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.7
+    kube-apiserver:
+      tag: v1.28.7
+    kube-controllermanager:
+      tag: v1.28.7
+    kube-proxy:
+      tag: v1.28.7
+    kube-scheduler:
+      tag: v1.28.7
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.8
+    kube-apiserver:
+      tag: v1.28.8
+    kube-controllermanager:
+      tag: v1.28.8
+    kube-proxy:
+      tag: v1.28.8
+    kube-scheduler:
+      tag: v1.28.8
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.9
+    kube-apiserver:
+      tag: v1.28.9
+    kube-controllermanager:
+      tag: v1.28.9
+    kube-proxy:
+      tag: v1.28.9
+    kube-scheduler:
+      tag: v1.28.9
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.28.10
+    kube-apiserver:
+      tag: v1.28.10
+    kube-controllermanager:
+      tag: v1.28.10
+    kube-proxy:
+      tag: v1.28.10
+    kube-scheduler:
+      tag: v1.28.10
+    coredns:
+      tag: v1.10.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.0
+    kube-apiserver:
+      tag: v1.29.0
+    kube-controllermanager:
+      tag: v1.29.0
+    kube-proxy:
+      tag: v1.29.0
+    kube-scheduler:
+      tag: v1.29.0
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.1
+    kube-apiserver:
+      tag: v1.29.1
+    kube-controllermanager:
+      tag: v1.29.1
+    kube-proxy:
+      tag: v1.29.1
+    kube-scheduler:
+      tag: v1.29.1
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.2
+    kube-apiserver:
+      tag: v1.29.2
+    kube-controllermanager:
+      tag: v1.29.2
+    kube-proxy:
+      tag: v1.29.2
+    kube-scheduler:
+      tag: v1.29.2
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.10-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.3
+    kube-apiserver:
+      tag: v1.29.3
+    kube-controllermanager:
+      tag: v1.29.3
+    kube-proxy:
+      tag: v1.29.3
+    kube-scheduler:
+      tag: v1.29.3
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.4
+    kube-apiserver:
+      tag: v1.29.4
+    kube-controllermanager:
+      tag: v1.29.4
+    kube-proxy:
+      tag: v1.29.4
+    kube-scheduler:
+      tag: v1.29.4
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.29.5
+    kube-apiserver:
+      tag: v1.29.5
+    kube-controllermanager:
+      tag: v1.29.5
+    kube-proxy:
+      tag: v1.29.5
+    kube-scheduler:
+      tag: v1.29.5
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.30.0
+    kube-apiserver:
+      tag: v1.30.0
+    kube-controllermanager:
+      tag: v1.30.0
+    kube-proxy:
+      tag: v1.30.0
+    kube-scheduler:
+      tag: v1.30.0
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.9
+
+  - version: v1.30.1
+    kube-apiserver:
+      tag: v1.30.1
+    kube-controllermanager:
+      tag: v1.30.1
+    kube-proxy:
+      tag: v1.30.1
+    kube-scheduler:
+      tag: v1.30.1
+    coredns:
+      tag: v1.11.1
+    etcd:
+      tag: 3.5.12-0
+    pause:
+      tag: 3.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
diff --git a/branch/sisyphus/k8s/coredns/Dockerfile b/branch/sisyphus/target/coredns/Dockerfile
similarity index 100%
rename from branch/sisyphus/k8s/coredns/Dockerfile
rename to branch/sisyphus/target/coredns/Dockerfile
diff --git a/branch/sisyphus/k8s/coredns/image.yml b/branch/sisyphus/target/coredns/image.yml
similarity index 100%
rename from branch/sisyphus/k8s/coredns/image.yml
rename to branch/sisyphus/target/coredns/image.yml
diff --git a/branch/sisyphus/etcd/Dockerfile b/branch/sisyphus/target/etcd/Dockerfile
similarity index 100%
rename from branch/sisyphus/etcd/Dockerfile
rename to branch/sisyphus/target/etcd/Dockerfile
diff --git a/branch/sisyphus/etcd/image.yml b/branch/sisyphus/target/etcd/image.yml
similarity index 100%
rename from branch/sisyphus/etcd/image.yml
rename to branch/sisyphus/target/etcd/image.yml
diff --git a/branch/sisyphus/gitea/Dockerfile b/branch/sisyphus/target/gitea/Dockerfile
similarity index 100%
rename from branch/sisyphus/gitea/Dockerfile
rename to branch/sisyphus/target/gitea/Dockerfile
diff --git a/branch/sisyphus/gitea/image.yml b/branch/sisyphus/target/gitea/image.yml
similarity index 100%
rename from branch/sisyphus/gitea/image.yml
rename to branch/sisyphus/target/gitea/image.yml
diff --git a/branch/sisyphus/nginx/Dockerfile b/branch/sisyphus/target/nginx/Dockerfile
similarity index 100%
rename from branch/sisyphus/nginx/Dockerfile
rename to branch/sisyphus/target/nginx/Dockerfile
diff --git a/branch/sisyphus/nginx/image.yml b/branch/sisyphus/target/nginx/image.yml
similarity index 100%
rename from branch/sisyphus/nginx/image.yml
rename to branch/sisyphus/target/nginx/image.yml
diff --git a/branch/sisyphus/prometheus/Dockerfile b/branch/sisyphus/target/prometheus/Dockerfile
similarity index 100%
rename from branch/sisyphus/prometheus/Dockerfile
rename to branch/sisyphus/target/prometheus/Dockerfile
diff --git a/branch/sisyphus/prometheus/image.yml b/branch/sisyphus/target/prometheus/image.yml
similarity index 100%
rename from branch/sisyphus/prometheus/image.yml
rename to branch/sisyphus/target/prometheus/image.yml
diff --git a/branch/sisyphus/python/Dockerfile b/branch/sisyphus/target/python/Dockerfile
similarity index 100%
rename from branch/sisyphus/python/Dockerfile
rename to branch/sisyphus/target/python/Dockerfile
diff --git a/branch/sisyphus/python/image.yml b/branch/sisyphus/target/python/image.yml
similarity index 100%
rename from branch/sisyphus/python/image.yml
rename to branch/sisyphus/target/python/image.yml
diff --git a/branch/sisyphus/registry/Dockerfile b/branch/sisyphus/target/registry/Dockerfile
similarity index 100%
rename from branch/sisyphus/registry/Dockerfile
rename to branch/sisyphus/target/registry/Dockerfile
diff --git a/branch/sisyphus/registry/image.yml b/branch/sisyphus/target/registry/image.yml
similarity index 100%
rename from branch/sisyphus/registry/image.yml
rename to branch/sisyphus/target/registry/image.yml
diff --git a/branch/sisyphus/ruby/Dockerfile b/branch/sisyphus/target/ruby/Dockerfile
similarity index 100%
rename from branch/sisyphus/ruby/Dockerfile
rename to branch/sisyphus/target/ruby/Dockerfile
diff --git a/branch/sisyphus/ruby/image.yml b/branch/sisyphus/target/ruby/image.yml
similarity index 100%
rename from branch/sisyphus/ruby/image.yml
rename to branch/sisyphus/target/ruby/image.yml
diff --git a/branch/sisyphus/trivy/Dockerfile b/branch/sisyphus/target/trivy/Dockerfile
similarity index 100%
rename from branch/sisyphus/trivy/Dockerfile
rename to branch/sisyphus/target/trivy/Dockerfile
diff --git a/branch/sisyphus/trivy/image.yml b/branch/sisyphus/target/trivy/image.yml
similarity index 100%
rename from branch/sisyphus/trivy/image.yml
rename to branch/sisyphus/target/trivy/image.yml
diff --git a/branch/sisyphus/trivy-node-collector/Dockerfile b/branch/sisyphus/trivy-node-collector/Dockerfile
deleted file mode 100644
index d8e1b4a..0000000
--- a/branch/sisyphus/trivy-node-collector/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="trivy-node-collector"
-LABEL org.opencontainers.image.description="Open source collector who collect Node information (fs and process data) and output in a table/json format"
-LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-collector"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_pakages(
-    "k8s-trivy-node-collector"
-) }}
-
-RUN ln -s /usr/bin/k8s-trivy-node-collector /usr/bin/node-collector
-
-ENTRYPOINT ["node-collector"]