Доработано дерево

2024-04-24 15:15:03 +05:00 · 2024-04-24 15:15:03 +05:00 · c7397a6194
commit c7397a6194
parent d34a5e2708
9 changed files with 107 additions and 41 deletions
--- a/branch/sisyphus/flannel/flannel-cni-plugin/Dockerfile
+++ b/branch/sisyphus/flannel/flannel-cni-plugin/Dockerfile
@ -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
--- a/branch/sisyphus/flannel/flannel/Dockerfile
+++ b/branch/sisyphus/flannel/flannel/Dockerfile
@ -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"]
--- a/branch/sisyphus/k8s/deckhouse/coredns/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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/deckhouse/deckhouse/images.yml
+++ b/branch/sisyphus/k8s/deckhouse/deckhouse/images.yml
@ -0,0 +1,65 @@
+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
--- a/branch/sisyphus/k8s/deckhouse/kube-apiserver/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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/deckhouse/kube-controller-manager/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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/deckhouse/kube-proxy/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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/deckhouse/kube-scheduler/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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/deckhouse/pause/image.yml
+++ b/branch/sisyphus/k8s/deckhouse/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