CLOUDP-83092: Add release task for init containers (#433)

Author: chatton

.evergreen.yml

@@ -120,6 +120,7 @@ functions:
           - quay_user_name
           - quay_password
           - image_name
+          - release
         working_dir: mongodb-kubernetes-operator
         binary: scripts/ci/build_and_push_image_sonar.sh
 
@@ -345,15 +346,25 @@ tasks:
           new_image: quay.io/mongodb/mongodb-kubernetes-operator
           image_type: mongodb-kubernetes-operator
 
-  - name: release_version_upgrade_hook
+
+  - name: release_version_upgrade_post_start_hook
     commands:
       - func: clone
       - func: setup_virtualenv
-      - func: release_docker_image
+      - func: build_and_push_image_sonar
+        vars:
+          image_type: version-post-start-hook-init
+          release: true
+
+
+  - name: release_readiness_probe
+    commands:
+      - func: clone
+      - func: setup_virtualenv
+      - func: build_and_push_image_sonar
         vars:
-          old_image: quay.io/mongodb/community-operator-version-upgrade-post-start-hook
-          new_image: quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook
-          image_type: version-upgrade-hook
+          image_type: readiness-probe-init
+          release: true
 
 
 buildvariants:
@@ -433,4 +444,5 @@ buildvariants:
       - ubuntu1604-test
     tasks:
     - name: release_operator
-    - name: release_version_upgrade_hook
+    - name: release_version_upgrade_post_start_hook
+    - name: release_readiness_probe

inventory.yaml

@@ -11,6 +11,7 @@ images:
       - name: agent-template-ubuntu
         task_type: dockerfile_template
         distro: ubuntu
+        tags: ["ubuntu"]
 
         inputs:
           - agent_version
@@ -24,6 +25,7 @@ images:
       - name: agent-ubuntu-build
         task_type: docker_build
         dockerfile: scripts/dev/templates/agent/Dockerfile.ubuntu-$(inputs.params.version_id)
+        tags: ["ubuntu"]
 
         labels:
           quay.expires-after: 48h
@@ -42,6 +44,7 @@ images:
       - name: agent-template-ubi
         task_type: dockerfile_template
         distro: ubi
+        tags: ["ubi"]
 
         inputs:
           - agent_version
@@ -56,6 +59,7 @@ images:
       - name: agent-ubi-build
         task_type: docker_build
         dockerfile: scripts/dev/templates/agent/Dockerfile.ubi-$(inputs.params.version_id)
+        tags: ["ubi"]
 
         labels:
           quay.expires-after: 48h
@@ -73,6 +77,7 @@ images:
     - name: readiness-probe-init-build
       task_type: docker_build
       dockerfile: scripts/dev/dockerfiles/Dockerfile.readiness
+      tags: ["readiness-probe"]
 
       labels:
         quay.expires-after: 48h
@@ -81,6 +86,22 @@ images:
         - registry: $(inputs.params.registry)/mongodb-kubernetes-readinessprobe-dev
           tag: $(inputs.params.version_id)
 
+    - name: readiness-probe-init-release
+      task_type: tag_image
+      tags: ["release", "readiness-probe"]
+
+      inputs:
+        - release_version
+
+      source:
+        registry: $(inputs.params.registry)/mongodb-kubernetes-readinessprobe-dev
+        tag: $(inputs.params.version_id)
+
+      destination:
+        - registry: $(inputs.params.registry)/mongodb-kubernetes-readinessprobe
+          tag: $(inputs.params.release_version)
+
+
   - name: version-post-start-hook-init
     vars:
       context: .
@@ -89,10 +110,26 @@ images:
       - name: version-post-start-hook-init-build
         task_type: docker_build
         dockerfile: scripts/dev/dockerfiles/Dockerfile.versionhook
+        tags: ["post-start-hook"]
 
         labels:
           quay.expires-after: 48h
 
         output:
           - registry: $(inputs.params.registry)/mongodb-kubernetes-operator-version-upgrade-post-start-hook-dev
             tag: $(inputs.params.version_id)
+
+      - name: version-post-start-hook-init-build-release
+        task_type: tag_image
+        tags: ["release", "post-start-hook"]
+
+        inputs:
+          - release_version
+
+        source:
+          registry: $(inputs.params.registry)/mongodb-kubernetes-operator-version-upgrade-post-start-hook-dev
+          tag: $(inputs.params.version_id)
+
+        destination:
+          - registry: $(inputs.params.registry)/mongodb-kubernetes-operator-version-upgrade-post-start-hook
+            tag: $(inputs.params.release_version)

pipeline.py

@@ -27,12 +27,16 @@ def build_agent_image_ubi(config: DevConfig) -> None:
     args = {
         "agent_version": release["agent"]["version"],
         "tools_version": release["agent"]["tools_version"],
-        "tools_distro": "ubuntu1604-x86_64",
-        "agent_distro": "linux_x86_64",
+        "tools_distro": "rhel70-x86_64",
+        "agent_distro": "rhel7_x86_64",
         "registry": config.repo_url,
     }
+
+    config.ensure_tag_is_run("ubi")
+
     sonar_build_image(
         image_name,
+        config,
         args=args,
     )
 
@@ -44,36 +48,55 @@ def build_agent_image_ubuntu(config: DevConfig) -> None:
     args = {
         "agent_version": release["agent"]["version"],
         "tools_version": release["agent"]["tools_version"],
-        "tools_distro": "rhel70-x86_64",
-        "agent_distro": "rhel7_x86_64",
+        "tools_distro": "ubuntu1604-x86_64",
+        "agent_distro": "linux_x86_64",
         "registry": config.repo_url,
     }
+
+    config.ensure_tag_is_run("ubuntu")
+
     sonar_build_image(
         image_name,
+        config,
         args=args,
     )
 
 
 def build_readiness_probe_image(config: DevConfig) -> None:
+    with open("release.json") as f:
+        release = json.loads(f.read())
+
+    config.ensure_tag_is_run("readiness-probe")
+
     sonar_build_image(
         "readiness-probe-init",
+        config,
         args={
             "registry": config.repo_url,
+            "release_version": release["readiness-probe"],
         },
     )
 
 
 def build_version_post_start_hook_image(config: DevConfig) -> None:
+    with open("release.json") as f:
+        release = json.loads(f.read())
+
+    config.ensure_tag_is_run("post-start-hook")
+
     sonar_build_image(
         "version-post-start-hook-init",
+        config,
         args={
             "registry": config.repo_url,
+            "release_version": release["version-upgrade-hook"],
         },
     )
 
 
 def sonar_build_image(
     image_name: str,
+    config: DevConfig,
     args: Optional[Dict[str, str]] = None,
     inventory: str = "inventory.yaml",
 ) -> None:
@@ -82,14 +105,15 @@ def sonar_build_image(
         image_name,
         build_args=args,
         inventory=inventory,
-        include_tags=[],
-        skip_tags=[],
+        include_tags=config.include_tags,
+        skip_tags=config.skip_tags,
     )
 
 
 def _parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()
     parser.add_argument("--image-name", type=str)
+    parser.add_argument("--release", type=bool)
     return parser.parse_args()
 
 
@@ -103,14 +127,24 @@ def main() -> int:
         )
         return 1
 
+    config = load_config()
+
+    # by default we do not want to run any release tasks. We must explicitly
+    # use the --release flag to run them.
+    config.ensure_skip_tag("release")
+
+    # specify --release to release the image
+    if args.release:
+        config.ensure_tag_is_run("release")
+
     image_build_function = {
         "agent-ubi": build_agent_image_ubi,
         "agent-ubuntu": build_agent_image_ubuntu,
         "readiness-probe-init": build_readiness_probe_image,
         "version-post-start-hook-init": build_version_post_start_hook_image,
     }[image_name]
 
-    image_build_function(load_config())
+    image_build_function(config)
     return 0
 
 

scripts/ci/build_and_push_image_sonar.sh

@@ -7,4 +7,4 @@ set +x
 echo "${quay_password:?}" | docker login "-u=${quay_user_name:?}" quay.io --password-stdin
 
 # shellcheck disable=SC2154
-python3 pipeline.py --image-name "${image_name}"
+python3 pipeline.py --image-name "${image_name}"  --release "${release:-false}"

scripts/dev/dev_config.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Dict, Optional
+from typing import Dict, Optional, List
 from enum import Enum
 import json
 import os
@@ -33,6 +33,14 @@ class DevConfig:
     def __init__(self, config: Dict, distro: Distro):
         self._config = config
         self._distro = distro
+        self.include_tags: List[str] = []
+        self.skip_tags: List[str] = []
+
+    def ensure_tag_is_run(self, tag: str) -> None:
+        if tag not in self.include_tags:
+            self.include_tags.append(tag)
+        if tag in self.skip_tags:
+            self.skip_tags.remove(tag)
 
     @property
     def namespace(self) -> str:
@@ -64,6 +72,10 @@ def agent_image(self) -> str:
             return self._config["agent_image_ubi"]
         return self._config["agent_image_ubuntu"]
 
+    def ensure_skip_tag(self, tag: str) -> None:
+        if tag not in self.skip_tags:
+            self.skip_tags.append(tag)
+
 
 def load_config(
     config_file_path: Optional[str] = None, distro: Distro = Distro.UBUNTU