Merge pull request #291 from helxplatform/develop

Develop
helxplatform · Sep 26, 2023 · 148cddf · 148cddf
2 parents 37c66b1 + b816519
commit 148cddf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/tycho/__init__.py b/tycho/__init__.py
@@ -1 +1 @@
-VERSION = "1.14.1"
+VERSION = "1.15.0"
diff --git a/tycho/model.py b/tycho/model.py
@@ -236,6 +236,8 @@ def __init__(self, config, name, principal, service_account, conn_string, proxy_
         """init security context"""
         self.init_security_context = init_security_context
         """Resources and limits for the init container"""
+        self.init_image_repository = os.environ.get("TYCHO_APP_INIT_IMAGE_REPOSITORY", "busybox")
+        self.init_image_tag = os.environ.get("TYCHO_APP_INIT_IMAGE_TAG", "latest")
         self.init_cpus = os.environ.get("TYCHO_APP_INIT_CPUS", "250m")
         self.init_memory = os.environ.get("TYCHO_APP_INIT_MEMORY", "250Mi")
         self.gpu_resource_name = os.environ.get("TYCHO_APP_GPU_RESOURCE_NAME", "nvidia.com/gpu")

diff --git a/tycho/template/pod.yaml b/tycho/template/pod.yaml
@@ -48,7 +48,7 @@ spec:
 {% if (system.enable_init_container == "true") and (system.create_home_dirs == "true") and (system.dev_phase != "test") %}
   initContainers:
   - name: volume-tasks
-    image: busybox:1.28
+    image: {{ system.init_image_repository }}:{{ system.init_image_tag }}
     {% if system.init_security_context.run_as_user or system.init_security_context.run_as_group %}
     securityContext:
       {% if system.init_security_context.run_as_user %}