CLOUDP-83092: Add init container images to inventory file (#432)

Author: chatton

.evergreen.yml

@@ -217,11 +217,20 @@ tasks:
     commands:
       - func: clone
       - func: setup_virtualenv
-      - func: build_and_push_image
+      - func: build_and_push_image_sonar
         vars:
-          image: quay.io/mongodb/community-operator-version-upgrade-post-start-hook:${version_id}
-          image_type: versionhook
-          expire_after: 48h
+          image_name: version-post-start-hook-init
+
+  - name: build_readiness_probe_image
+    priority: 60
+    exec_timeout_secs: 600
+    commands:
+      - func: clone
+      - func: setup_virtualenv
+      - func: build_and_push_image_sonar
+        vars:
+          image_name: readiness-probe-init
+
 
   - name: e2e_test_feature_compatibility_version
     commands:
@@ -361,6 +370,8 @@ buildvariants:
         variant: init_test_run
       - name: build_prehook_image
         variant: init_test_run
+      - name: build_readiness_probe_image
+        variant: init_test_run
       - name: build_agent_image_ubuntu
         variant: init_test_run
     tasks:
@@ -379,6 +390,8 @@ buildvariants:
         variant: init_test_run
       - name: build_prehook_image
         variant: init_test_run
+      - name: build_readiness_probe_image
+        variant: init_test_run
       - name: build_agent_image_ubi
         variant: init_test_run
     tasks:
@@ -394,6 +407,7 @@ buildvariants:
       - name: build_prehook_image
       - name: build_agent_image_ubi
       - name: build_agent_image_ubuntu
+      - name: build_readiness_probe_image
 
   - name: release_blocker
     display_name: release_blocker

inventory.yaml

@@ -63,3 +63,36 @@ images:
         output:
           - registry: $(inputs.params.registry)/mongodb-agent-ubi-dev
             tag: $(inputs.params.version_id)
+
+
+  - name: readiness-probe-init
+    vars:
+      context: .
+
+    stages:
+    - name: readiness-probe-init-build
+      task_type: docker_build
+      dockerfile: scripts/dev/dockerfiles/Dockerfile.readiness
+
+      labels:
+        quay.expires-after: 48h
+
+      output:
+        - registry: $(inputs.params.registry)/mongodb-kubernetes-readinessprobe-dev
+          tag: $(inputs.params.version_id)
+
+  - name: version-post-start-hook-init
+    vars:
+      context: .
+
+    stages:
+      - name: version-post-start-hook-init-build
+        task_type: docker_build
+        dockerfile: scripts/dev/dockerfiles/Dockerfile.versionhook
+
+        labels:
+          quay.expires-after: 48h
+
+        output:
+          - registry: $(inputs.params.registry)/mongodb-kubernetes-operator-version-upgrade-post-start-hook-dev
+            tag: $(inputs.params.version_id)

pipeline.py

@@ -7,7 +7,14 @@
 
 from scripts.dev.dev_config import load_config, DevConfig
 
-VALID_IMAGE_NAMES = frozenset(["agent-ubi", "agent-ubuntu"])
+VALID_IMAGE_NAMES = frozenset(
+    [
+        "agent-ubi",
+        "agent-ubuntu",
+        "readiness-probe-init",
+        "version-post-start-hook-init",
+    ]
+)
 
 DEFAULT_IMAGE_TYPE = "ubuntu"
 DEFAULT_NAMESPACE = "default"
@@ -47,6 +54,24 @@ def build_agent_image_ubuntu(config: DevConfig) -> None:
     )
 
 
+def build_readiness_probe_image(config: DevConfig) -> None:
+    sonar_build_image(
+        "readiness-probe-init",
+        args={
+            "registry": config.repo_url,
+        },
+    )
+
+
+def build_version_post_start_hook_image(config: DevConfig) -> None:
+    sonar_build_image(
+        "version-post-start-hook-init",
+        args={
+            "registry": config.repo_url,
+        },
+    )
+
+
 def sonar_build_image(
     image_name: str,
     args: Optional[Dict[str, str]] = None,
@@ -78,12 +103,14 @@ def main() -> int:
         )
         return 1
 
-    agent_build_function = {
+    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]
 
-    agent_build_function(load_config())
+    image_build_function(load_config())
     return 0
 
 

scripts/dev/dockerfile_generator.py

@@ -11,41 +11,6 @@
 GOLANG_TAG = "1.14"
 
 
-def _shared_agent_params() -> DockerParameters:
-    with open("release.json", "r") as f:
-        release = json.loads(f.read())
-
-    return {
-        "template_path": "scripts/dev/templates/agent",
-        "agent_version": release["agent"]["version"],
-        "tools_version": release["agent"]["tools_version"],
-    }
-
-
-def agent_ubuntu_params() -> DockerParameters:
-    params = _shared_agent_params()
-    params.update(
-        {
-            "base_image": "ubuntu:16.04",
-            "tools_distro": "ubuntu1604-x86_64",
-            "agent_distro": "linux_x86_64",
-        }
-    )
-    return params
-
-
-def agent_ubi_params() -> DockerParameters:
-    params = _shared_agent_params()
-    params.update(
-        {
-            "base_image": "registry.access.redhat.com/ubi7/ubi",
-            "tools_distro": "rhel70-x86_64",
-            "agent_distro": "rhel7_x86_64",
-        }
-    )
-    return params
-
-
 def operator_params(files_to_add: List[str]) -> DockerParameters:
     return {
         "builder": True,
@@ -67,8 +32,6 @@ def render(image_name: str, files_to_add: List[str]) -> str:
     param_dict = {
         "e2e": e2e_params(files_to_add),
         "operator": operator_params(files_to_add),
-        "agent_ubi": agent_ubi_params(),
-        "agent_ubuntu": agent_ubuntu_params(),
     }
 
     render_values = param_dict.get(image_name, dict())

scripts/dev/templates/Dockerfile.versionhook renamed to scripts/dev/dockerfiles/Dockerfile.versionhook

@@ -1,4 +1,3 @@
-# TODO: template this
 FROM golang AS builder
 
 ENV GO111MODULE=on