Add CONTROLLER_IMAGE environment variable (openshift#39)

gamli75 · Jul 13, 2020 · b65b4bc · b65b4bc
1 parent 4a9cc5e
commit b65b4bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -204,20 +204,20 @@ or
 make redeploy_all_with_install AGENT_DOCKER_IMAGE=<image to test>
 ```
 
-## Test installer image
+## Test installer image or controller image
 
 ```bash
-make redeploy_all INSTALLER_IMAGE=<image to test>
+make redeploy_all INSTALLER_IMAGE=<image to test> CONTROLLER_IMAGE=<image to test>
 or
-export PULL_SECRET='<pull secret JSON>'; make redeploy_all_with_install INSTALLER_IMAGE=<image to test>
+export PULL_SECRET='<pull secret JSON>'; make redeploy_all_with_install INSTALLER_IMAGE=<image to test> CONTROLLER_IMAGE=<image to test>
 ```
 
-## Test installer, bm-inventory and agent images in the same flow
+## Test installer, controller, bm-inventory and agent images in the same flow
 
 ```bash
 make redeploy_all INSTALLER_IMAGE=<image to test> AGENT_DOCKER_IMAGE=<image to test> SERVICE=<image to test>
 or
-export PULL_SECRET='<pull secret JSON>'; make redeploy_all_with_install INSTALLER_IMAGE=<image to test> AGENT_DOCKER_IMAGE=<image to test>  SERVICE=<image to test>
+export PULL_SECRET='<pull secret JSON>'; make redeploy_all_with_install INSTALLER_IMAGE=<image to test> CONTROLLER_IMAGE=<image to test> AGENT_DOCKER_IMAGE=<image to test> SERVICE=<image to test>
 ```
 
 # Test infra image

diff --git a/discovery-infra/update_bm_inventory_cm.py b/discovery-infra/update_bm_inventory_cm.py
@@ -26,6 +26,7 @@
     ("HW_VALIDATOR_MIN_RAM_GIB_MASTER", "8"),
     ("HW_VALIDATOR_MIN_DISK_SIZE_GIB", "10"),
     ("INSTALLER_IMAGE", ""),
+    ("CONTROLLER_IMAGE", ""),
     ("INVENTORY_URL", ""),
     ("INVENTORY_PORT", ""),
     ("AGENT_DOCKER_IMAGE", ""),

diff --git a/skipper.yaml b/skipper.yaml
@@ -22,6 +22,7 @@ env:
   SERVICE: $SERVICE
   OBJEXP: $OBJEXP
   INSTALLER_IMAGE: $INSTALLER_IMAGE
+  CONTROLLER_IMAGE: $CONTROLLER_IMAGE
   NETWORK_BRIDGE: $NETWORK_BRIDGE
   OPENSHIFT_VERSION: $OPENSHIFT_VERSION
   KUBECONFIG: $KUBECONFIG