remove shell implementation of image-build

- Get source package version from the public altlinux api.
- Add build options: --dry-run, --push, --skip-build, --latest
- Separate build and push stages of images

README.md

@@ -1,5 +1,22 @@
 # image-forge
 
+## Wrapper
+
+### Examples
+
+From the repository
+
+```shell
+image-build -b sisyphus -r registry.altlinux.org --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+From a task
+
+```shell
+image-build -b sisyphus -r test.registry.altlinux.org -t 335250 --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+
 ## alt images
 To build `alt` images, run:
 ```bash
@@ -26,64 +43,6 @@ the organization `<ORGANIZATION>`, run:
 ```
 If you push to the users repository, then organiztion is your username.
 
-## info.yaml format
-
-- `is_versioned`: **bool** (REQUIRED)
-
-  Whether to use package version as a tag for this image
-
-- `source_packages`: **list of strings** (REQUIRED)
-
-  List of source packages (src.rpm) this image depends on.
-  If contains jinja2 template syntax, `--package-version`
-  CLI option must be specified.
-
-- `version_template`: **string** (OPTIONAL)
-
-  template to apply when construction the tag,
-  `version` string variable is available in the template
-
-### examples
-
-
-#### org/k8s/flannel-cni-plugin
-
-```yaml
-is_versioned: true
-version_template: v{{ version.rsplit('.', 1) | first  }}-flannel{{ version.rsplit('.', 1) | last }}
-source_packages:
-  - cni-plugin-flannel
-```
-
-```bash
-./build.py -i k8s/flannel-cni-plugin
-```
-
-#### org/k8s/kube-apiserver
-
-```yaml
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-```
-
-```bash
-./build.py -b sisyphus -i k8s/kube-apiserver --package-version '{"k8s/kube-apiserver": "1.31"}'
-```
-
-#### org/k8s/pause
-
-```yaml
-is_versioned: true
-source_packages:
-  - kubernetes-pause
-```
-
-```bash
-./build.py -i k8s/pause
-```
-
 ## Dependencies
 On x86_64 machine using p10 branch you need:
 - `python3-module-tomli`

build.py

@@ -6,61 +6,26 @@ import json
 import re
 import subprocess
 import textwrap
-from dataclasses import dataclass
 from graphlib import TopologicalSorter
 from pathlib import Path
 
-import requests
 import tomli
-import yaml
 from jinja2 import Template
 
+
 ORG_DIR = Path("org")
 
-PKG_VERSIONS: dict | None = None
+PKG_VERSION: str = ""
 
-
-@dataclass
 class Image:
-    canonical_name: str
+    def __init__(self, canonical_name):
-    is_versioned: bool | None
-    verion_template: str | None
-    source_packages: list[str] | None
-
-    def __init__(self, canonical_name: str):
         self.canonical_name = canonical_name
         self.path = ORG_DIR / canonical_name
         self.base_name = re.sub("^[^/]+/", "", canonical_name)
 
-        info_file = self.path / "info.yaml"
+    def __str__(self):
-        if not info_file.exists():
+        return (f'Image(canonical_name="{self.canonical_name}", '
-            self.is_versioned = None
+                f'path="{self.path}", base_name="{self.base_name}")')
-            self.source_packages = None
-            return
-
-        info: dict = yaml.safe_load(info_file.read_text())
-
-        if "is_versioned" not in info:
-            raise RuntimeError(
-                f"info.yaml for {self.canonical_name} doesn't contain 'is_versioned' key"
-            )
-
-        if "source_packages" not in info:
-            raise RuntimeError(
-                f"info.yaml for {self.canonical_name} doesn't contain 'source_packages' key"
-            )
-
-        self.is_versioned = info["is_versioned"]
-        self.source_packages = info["source_packages"]
-
-        if self.is_versioned and not self.source_packages:
-            raise RuntimeError(
-                f"source_packages for {self.canonical_name} doesn't contain any values"
-            )
-
-        self.version_template = None
-        if "version_template" in info:
-            self.version_template = info["version_template"]
 
 
 class Tasks:
@@ -85,67 +50,18 @@ class Tasks:
                 ]
 
 
-def api_get_source_package_version(branch: str, package_name: str) -> str:
-    api_url = "https://rdb.altlinux.org/api/site/package_versions_from_tasks"
-    params = {"branch": branch, "name": package_name}
-    response = requests.get(api_url, params)
-    if response.status_code != 200:
-        print(response)
-        raise RuntimeError(
-            f"failed to retrieve source package version: source package {package_name!r}, branch {branch!r} "
-        )
-
-    result = response.json()
-
-    return result["versions"][0]["version"]
-
-
 class Tags:
-    def __init__(self, tags_file: str | None, latest: str):
+    def __init__(self, tags_file, latest):
         if tags_file is None:
             self._tags = None
         else:
-            self._tags = tomli.loads(Path(tags_file).read_text())
+            tags_file = Path(tags_file)
+            self._tags = tomli.loads(tags_file.read_text())
         self._latest = latest
 
-    def tags(self, branch: str, image: Image):
+    def tags(self, branch, image: Image):
         if self._tags is None:
-            if image.is_versioned and image.source_packages:
+            tags = [branch]
-                package_name = image.source_packages[0]
-
-                if re.search("{%.*%}", package_name):
-                    package_name = Template(package_name).render(branch=branch).strip()
-                    print(f"{package_name=}")
-
-                if re.search("{{.*}}", package_name):
-                    if PKG_VERSIONS is None:
-                        raise RuntimeError(
-                            f"--package-versions option is not specified, required for {image.canonical_name!r}"
-                        )
-
-                    if image.canonical_name not in PKG_VERSIONS:
-                        raise RuntimeError(
-                            f"--package-versions option does not contain version for image {image.canonical_name!r}"
-                        )
-
-                    if not PKG_VERSIONS[image.canonical_name]:
-                        raise RuntimeError(
-                            f"invalid version for image {image.canonical_name!r}: {PKG_VERSIONS[image.canonical_name]!r}"
-                        )
-
-                    package_name = Template(package_name).render(
-                        version=PKG_VERSIONS[image.canonical_name]
-                    )
-                version = api_get_source_package_version(branch, package_name)
-
-                if image.version_template is not None:
-                    version = (
-                        Template(image.version_template).render(version=version).strip()
-                    )
-
-                tags = [version]
-            else:
-                tags = [branch]
         else:
             tags = self._tags[image.canonical_name][branch].copy()
         if branch == self._latest:
@@ -663,14 +579,9 @@ class DockerBuilder:
             "--force-rm",
             f"--manifest={manifest}",
             f"--platform={platforms}",
+            f'--build-arg=PKG_VERSION={PKG_VERSION}',
             ".",
         ]
-
-        if PKG_VERSIONS is not None and image.canonical_name in PKG_VERSIONS:
-            build_cmd.insert(
-                -1, f"--build-arg=PKG_VERSION={PKG_VERSIONS[image.canonical_name]}"
-            )
-
         self.run(build_cmd, cwd=image.path)
 
         for tag in tags[1:]:
@@ -841,9 +752,8 @@ def parse_args():
         help="list of stages to skip",
     )
     parser.add_argument(
-        "--package-versions",
+        "--package-version",
-        type=json.loads,
+        help="from which package to build",
-        help="json string where key is image name, value is the package version",
     )
     args = parser.parse_args()
 
@@ -856,10 +766,10 @@ def parse_args():
 
 
 def main():
-    global PKG_VERSIONS
+    global PKG_VERSION
 
     args = parse_args()
-    PKG_VERSIONS = args.package_versions
+    PKG_VERSION = args.package_version
     arches = args.arches
     images_info = ImagesInfo()
     tags = Tags(args.tags, args.latest)

image-build.md

@@ -0,0 +1,7 @@
+## Examples
+
+Build `kube-apisever` image from package `kubernetes1.31`:
+
+```bash
+./image-build.py -b sisyphus -r registry.altlinux.org kube-apiserver kubernetes1.31
+```

image-build.py

@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+
+import argparse
+import logging
+import re
+import subprocess
+from pathlib import Path
+
+import requests
+
+LOGGING_FORMAT = "%(asctime)s %(name)s %(levelname)s %(message)s"
+logging.basicConfig(format=LOGGING_FORMAT)
+logger = logging.getLogger(__name__)
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="build an OCI image from a package",
+        epilog="""The image is only pushed to the destination registry
+        if the option --push is present.""",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+
+    parser.add_argument("image_name")
+    parser.add_argument("package_name")
+    parser.add_argument(
+        "-b",
+        "--branch",
+        default="sisyphus",
+        help="package repository branch",
+    )
+    parser.add_argument(
+        "-r",
+        "--registry",
+        default="registry.altlinux.org",
+        help="OCI destination registry",
+    )
+    parser.add_argument(
+        "-t",
+        "--task-id",
+        help="install the package from the task with this id",
+    )
+    parser.add_argument(
+        "--prefix",
+        help="image name prefix",
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="only print what would be done",
+    )
+    parser.add_argument(
+        "--latest",
+        action="store_true",
+        help="also tag this image as latest",
+    )
+    parser.add_argument(
+        "--push",
+        action="store_true",
+        help="push the image to the registry after build",
+    )
+    parser.add_argument(
+        "--skip-build",
+        action="store_true",
+        help="if push is true, then skip the build stage",
+    )
+    parser.add_argument(
+        "--log-level",
+        choices=["debug", "info", "warning"],
+        default="warning",
+        help="logging level",
+    )
+
+    return parser.parse_args()
+
+
+def api_get_source_package_version(branch: str, package_name: str) -> str:
+    api_url = "https://rdb.altlinux.org/api/site/package_versions_from_tasks"
+    params = {"branch": branch, "name": package_name}
+    response = requests.get(api_url, params)
+    if response.status_code != 200:
+        raise RuntimeError(
+            f"failed to retrieve package version: package {package_name!r}, branch {branch!r} "
+        )
+
+    result = response.json()
+
+    logger.debug("api/site/package_versions_from_tasks response=%s", result)
+
+    return result["versions"][0]["version"]
+
+
+def api_get_source_package_version_from_task(task_id: int, package_name: str) -> str:
+    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
+    response = requests.get(api_url)
+    if response.status_code != 200:
+        raise RuntimeError(f"failed to retrieve information about task {task_id}")
+
+    result = response.json()
+
+    logger.debug("api/task/packages/%s response=%s", task_id, result)
+
+    for subtask in result["subtasks"]:
+        if subtask["source"]["name"] == package_name:
+            return subtask["source"]["version"]
+
+    raise RuntimeError(
+        f"vailed to retrieve version of package {package_name!r} from task {task_id}"
+    )
+
+
+def main() -> None:
+    args = parse_args()
+    logger.setLevel(args.log_level.upper())
+
+    image = f"k8s/{args.image_name}"
+    version_arg = None
+    tasks_file = None
+
+    if args.task_id is None:
+        version = api_get_source_package_version(args.branch, args.package_name)
+    else:
+        version = api_get_source_package_version_from_task(
+            args.task_id, args.package_name
+        )
+        tasks_file = "/tmp/k8s-tasks.toml"
+        tasks_file_contents = f"['{args.branch}']\n"
+        tasks_file_contents += f"{args.task_id} = ['{image}']\n"
+        Path(tasks_file).write_text(tasks_file_contents)
+
+    tags_file = "/tmp/k8s-tags.toml"
+    tags_file_contents = f"['{image}']\n"
+
+    match args.image_name:
+        case (
+            "etcd"
+            | "flannel"
+            | "flannel-cni-plugin"
+            | "pause"
+            | "cert-manager-acmesolver"
+            | "cert-manager-cainjector"
+            | "cert-manager-controller"
+            | "cert-manager-startupapicheck"
+            | "cert-manager-webhook"
+        ):
+            match args.image_name:
+                case "flannel-cni-plugin":
+                    num_dots = version.count(".")
+                    if num_dots == 2:
+                        tags_file_contents += (
+                            f"{args.branch} = ['v{version}-flannel1']\n"
+                        )
+                    elif num_dots == 3:
+                        flannel_version, flannel_release = version.rsplit(".", 1)
+                        tags_file_contents += f"{args.branch} = ['v{flannel_version}-flannel{flannel_release}']\n"
+                    else:
+                        raise RuntimeError(
+                            f"wrong version for package {args.package_name!r}, version {version!r}"
+                        )
+                case "etcd":
+                    tags_file_contents += f"{args.branch} = ['{version}-0']\n"
+                case "pause":
+                    tags_file_contents += f"{args.branch} = ['{version}']\n"
+                case _:
+                    tags_file_contents += f"{args.branch} = ['v{version}']\n"
+
+        case (
+            "kube-apiserver"
+            | "kube-controller-manager"
+            | "kube-scheduler"
+            | "kube-proxy"
+            | "coredns"
+        ):
+            match args.image_name:
+                case "coredns":
+                    regex_string = "coredns(.+)"
+                case (
+                    "kube-apiserver"
+                    | "kube-controller-manager"
+                    | "kube-scheduler"
+                    | "kube-proxy"
+                ):
+                    regex_string = "kubernetes(.+)"
+
+            version_match = re.search(regex_string, args.package_name)
+            if version_match is None:
+                raise RuntimeError(
+                    f"failed to retrieve version argument from package name: package {args.package_name!r}"
+                )
+
+            version_arg = version_match.group(1)
+
+            tags_file = "/tmp/k8s-tags.toml"
+            tags_file_contents = f"['{image}']\n"
+            tags_file_contents += f"{args.branch} = ['v{version}']\n"
+        case _:
+            raise RuntimeError(f"unknown image {args.image_name!r}")
+
+    Path(tags_file).write_text(tags_file_contents)
+
+    command = [
+        "./build.py",
+        f"--branch={args.branch}",
+        f"--registry={args.registry}",
+        f"--image={image}",
+        f"--tags={tags_file}",
+    ]
+
+    if tasks_file is not None:
+        command.append(f"--tasks={tasks_file}")
+
+    if version_arg is not None:
+        command.append(f"--package-version={version_arg}")
+
+    if args.prefix is not None:
+        command.append(f"--overwrite-organization={args.prefix}")
+
+    if args.latest:
+        command.append(f"--latest={args.branch}")
+
+    if not args.push:
+        command.append("--skip-stages=push")
+    elif args.skip_build:
+        command.append("--stages=push")
+
+    if args.dry_run:
+        command.append("--dry-run")
+
+    logger.debug("Running command: %s", command)
+    subprocess.run(command, check=True)
+
+
+if __name__ == "__main__":
+    main()

org/k8s/cert-manager-acmesolver/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
+LABEL org.opencontainers.image.title="cert-manager-acmesolver"
+LABEL org.opencontainers.image.description="HTTP server used to solve ACME challenges."
+LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
@@ -9,9 +15,3 @@ RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-
 USER 1000
 
 ENTRYPOINT ["/usr/bin/acmesolver"]
-
-LABEL org.opencontainers.image.title="cert-manager-acmesolver"
-LABEL org.opencontainers.image.description="HTTP server used to solve ACME challenges."
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/cert-manager-acmesolver/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - cert-manager
-...

org/k8s/cert-manager-cainjector/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
+LABEL org.opencontainers.image.title="cert-manager-cainjector"
+LABEL org.opencontainers.image.description="cert-manager CA injector is a Kubernetes addon to automate the injection of CA data into webhooks and APIServices from cert-manager certificates."
+LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
@@ -9,9 +15,3 @@ RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-
 USER 1000
 
 ENTRYPOINT ["/usr/bin/cainjector"]
-
-LABEL org.opencontainers.image.title="cert-manager-cainjector"
-LABEL org.opencontainers.image.description="cert-manager CA injector is a Kubernetes addon to automate the injection of CA data into webhooks and APIServices from cert-manager certificates."
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/cert-manager-cainjector/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - cert-manager
-...

org/k8s/cert-manager-controller/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
+LABEL org.opencontainers.image.title="cert-manager-controller"
+LABEL org.opencontainers.image.description="Automatically provision and manage TLS certificates in Kubernetes."
+LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
@@ -9,9 +15,3 @@ RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-
 USER 1000
 
 ENTRYPOINT ["/usr/bin/controller"]
-
-LABEL org.opencontainers.image.title="cert-manager-controller"
-LABEL org.opencontainers.image.description="Automatically provision and manage TLS certificates in Kubernetes."
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/cert-manager-controller/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - cert-manager
-...

org/k8s/cert-manager-startupapicheck/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
+LABEL org.opencontainers.image.title="cert-manager-startupapicheck"
+LABEL org.opencontainers.image.description="Check that cert-manager started successfully."
+LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
@@ -9,9 +15,3 @@ RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-
 USER 1000
 
 ENTRYPOINT ["/usr/bin/startupapicheck"]
-
-LABEL org.opencontainers.image.title="cert-manager-startupapicheck"
-LABEL org.opencontainers.image.description="Check that cert-manager started successfully."
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/cert-manager-startupapicheck/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - cert-manager
-...

org/k8s/cert-manager-webhook/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
+LABEL org.opencontainers.image.title="cert-manager-webhook"
+LABEL org.opencontainers.image.description="The webhook component provides API validation, mutation and conversion functionality for cert-manager."
+LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
@@ -9,9 +15,3 @@ RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-
 USER 1000
 
 ENTRYPOINT ["/usr/bin/webhook"]
-
-LABEL org.opencontainers.image.title="cert-manager-webhook"
-LABEL org.opencontainers.image.description="The webhook component provides API validation, mutation and conversion functionality for cert-manager."
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/cert-manager-webhook/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - cert-manager
-...

org/k8s/coredns/Dockerfile.template

@@ -8,13 +8,8 @@ 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"
 
-{% if branch in ["sisyphus", "p11", "c10f2"] %}
 ARG PKG_VERSION
 
 {{ install_packages("coredns${PKG_VERSION}") }}
-{% else %}
-{{ install_packages("coredns") }}
-{% endif %}
-
 
 ENTRYPOINT ["/usr/bin/coredns"]

org/k8s/coredns/info.yaml

@@ -1,11 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - >
-    {% if branch in ["sisyphus", "p11", "c10f2"] %}
-    {% raw %}coredns{{ version }}{% endraw %}
-    {% else %}
-    coredns
-    {% endif %}
-...

org/k8s/etcd/info.yaml

@@ -1,12 +0,0 @@
----
-is_versioned: true
-version_template: >
-  {% set version_patch = version.split(".")[2] | int %}
-  {% if version_patch < 16 %}
-    {{ version }}-0
-  {% else %}
-    v{{ version }}
-  {% endif %}
-source_packages:
-  - etcd
-...

org/k8s/flannel-cni-plugin/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version.rsplit('.', 1) | first  }}-flannel{{ version.rsplit('.', 1) | last }}
-source_packages:
-  - cni-plugin-flannel
-...

org/k8s/flannel/info.yaml

@@ -1,4 +0,0 @@
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - flannel

org/k8s/kube-apiserver/Dockerfile.template

@@ -2,14 +2,14 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-ARG PKG_VERSION
-
-{{ install_packages("kubernetes${PKG_VERSION}-master") }}
-
-ENTRYPOINT ["/usr/bin/kube-apiserver"]
-
 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"
+
+ARG PKG_VERSION
+
+{{ install_packages("kubernetes${PKG_VERSION}-master") }}
+
+ENTRYPOINT ["/usr/bin/kube-apiserver"]

org/k8s/kube-apiserver/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-...

org/k8s/kube-controller-manager/Dockerfile.template

@@ -2,14 +2,14 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-ARG PKG_VERSION
-
-{{ install_packages("kubernetes${PKG_VERSION}-master") }}
-
-ENTRYPOINT ["/usr/bin/kube-controller-manager"]
-
 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"
+
+ARG PKG_VERSION
+
+{{ install_packages("kubernetes${PKG_VERSION}-master") }}
+
+ENTRYPOINT ["/usr/bin/kube-controller-manager"]

org/k8s/kube-controller-manager/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-...

org/k8s/kube-proxy/Dockerfile.template

@@ -2,6 +2,12 @@ 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"
+
 ARG PKG_VERSION
 
 {{ install_packages("kubernetes${PKG_VERSION}-node") }}
@@ -9,9 +15,3 @@ ARG PKG_VERSION
 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy
 
 ENTRYPOINT ["/usr/bin/kube-proxy"]
-
-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"

org/k8s/kube-proxy/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-...

org/k8s/kube-scheduler/Dockerfile.template

@@ -2,14 +2,14 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-ARG PKG_VERSION
-
-{{ install_packages("kubernetes${PKG_VERSION}-master") }}
-
-ENTRYPOINT ["/usr/bin/kube-scheduler"]
-
 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"
+
+ARG PKG_VERSION
+
+{{ install_packages("kubernetes${PKG_VERSION}-master") }}
+
+ENTRYPOINT ["/usr/bin/kube-scheduler"]

org/k8s/kube-scheduler/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-...

org/k8s/kubelet/info.yaml

@@ -1,6 +0,0 @@
----
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-...

org/k8s/pause/info.yaml

@@ -1,5 +0,0 @@
----
-is_versioned: true
-source_packages:
-  - kubernetes-pause
-...

org/k8s/trivy-node-collector/info.yaml

@@ -1,5 +0,0 @@
----
-is_versioned: true
-source_packages:
-  - k8s-trivy-node-collector
-...