Wire the used container image.

metal-stack · Jun 4, 2024 · a663894 · a663894
1 parent 90a9688
commit a663894
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/control-plane/roles/metal/README.md b/control-plane/roles/metal/README.md
@@ -25,7 +25,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya
 ### Images
 
 | Name                                   | Mandatory | Description                             |
-|----------------------------------------|-----------|-----------------------------------------|
+| -------------------------------------- | --------- | --------------------------------------- |
 | metal_api_image_name                   | yes       | Image version of the metal-api          |
 | metal_api_image_tag                    | yes       | Image tag of the metal-api              |
 | metal_api_image_pull_policy            |           | Image pull policy of the metal-api      |
@@ -38,6 +38,8 @@ You can look up all the default values of this role [here](defaults/main/main.ya
 | metal_masterdata_api_image_name        | yes       | Image version of the masterdata-api     |
 | metal_masterdata_api_image_tag         | yes       | Image tag of the masterdata-api         |
 | metal_masterdata_api_image_pull_policy |           | Image pull policy of the masterdata-api |
+| metal_ipam_image_name                  | yes       | Image version of the ipam               |
+| metal_ipam_image_tag                   | yes       | Image tag of the ipam                   |
 
 ### Service Ports
 

diff --git a/control-plane/roles/metal/tasks/main.yaml b/control-plane/roles/metal/tasks/main.yaml
@@ -18,8 +18,8 @@
       - metal_masterdata_api_tls_cert_key is defined
       - metal_masterdata_api_tls_client_cert is defined
       - metal_masterdata_api_tls_client_key is defined
-      - ipam_image_name is defined
-      - ipam_image_tag is defined
+      - metal_ipam_image_name is defined
+      - metal_ipam_image_tag is defined
       - metal_console_image_name is defined
       - metal_console_image_tag is defined
       - metal_helm_chart_local_path is not none or metal_helm_chart_repo is defined

diff --git a/control-plane/roles/metal/templates/metal-values.j2 b/control-plane/roles/metal/templates/metal-values.j2
@@ -21,6 +21,10 @@ images:
     image: "{{ metal_masterdata_api_image_name }}"
     imagePullPolicy: "{{ metal_masterdata_api_image_pull_policy }}"
     tag: "{{ metal_masterdata_api_image_tag }}"
+  ipam:
+    image: "{{ metal_ipam_image_name }}"
+    imagePullPolicy: "{{ metal_console_image_pull_policy }}"
+    tag: "{{ metal_ipam_image_tag }}"
 
 resources:
 {% if metal_api_resources %}

diff --git a/defaults/main.yaml b/defaults/main.yaml
@@ -20,8 +20,8 @@ metal_stack_release:
     metal_masterdata_api_image_name: "docker-images.metal-stack.control-plane.masterdata-api.name"
     metal_console_image_tag: "docker-images.metal-stack.control-plane.metal-console.tag"
     metal_console_image_name: "docker-images.metal-stack.control-plane.metal-console.name"
-    ipam_image_tag: "docker-images.metal-stack.control-plane.ipam.tag"
-    ipam_image_name: "docker-images.metal-stack.control-plane.ipam.name"
+    metal_ipam_image_tag: "docker-images.metal-stack.control-plane.ipam.tag"
+    metal_ipam_image_name: "docker-images.metal-stack.control-plane.ipam.name"
     metal_metrics_exporter_image_tag: "docker-images.metal-stack.control-plane.metal-metrics-exporter.tag"
     metal_metrics_exporter_image_name: "docker-images.metal-stack.control-plane.metal-metrics-exporter.name"
     rethinkdb_exporter_name: "docker-images.metal-stack.control-plane.rethinkdb-exporter.name"