Include lookup of install-template based on version

Author: soukron

Makefile

@@ -25,32 +25,32 @@ version: ## Output the current version.
 ###########
 .ONESHELL:
 merge-scripts: create-main-wrapper ## Merge the scripts in the main script
-	@echo Merging scripts into openshift-install-wrapper
+	@echo Merging scripts into openshift-install-wrapper.
 	cd src/scripts && ./.merge-scripts.sh
 
 merge-templates: ## Merge the install-config templates in the templates file
-	@echo Merging install-config templates into variables file
+	@echo Merging install-config templates into variables file.
 	cd src/config/templates && ./.merge-templates.sh
 
 create-main-wrapper: ## Creates the wrapper with all the src/ content
-	@echo "Combining source files into openshift-install-wrapper"
+	@echo Combining source files into openshift-install-wrapper.
 	@cat src/control/00_init.sh src/config/*.sh src/helpers/*.sh src/actions/*.sh src/control/99_execute.sh > openshift-install-wrapper
 	@chmod +x openshift-install-wrapper
 
 create-binary-wrappers: ## Install helper wrappers for oc, kubectl, openshift-install
-	@echo Preparing wrappers...
+	@echo Preparing binary wrappers.
 	@sed -i 's/^VERSION=.*/VERSION=$(VERSION)/' openshift-install-wrapper
 	@sed -i "s|^__basedir=.*|__basedir=$(TARGETDIR)|" openshift-install-wrapper
 	@sed -i "s|^WRAPPER_BASEDIR=.*|WRAPPER_BASEDIR=$(TARGETDIR)/bin|" bin/openshift-install
 	@sed -i "s|^WRAPPER_BASEDIR=.*|WRAPPER_BASEDIR=$(TARGETDIR)/bin|" bin/oc
 	@sed -i "s|^WRAPPER_BASEDIR=.*|WRAPPER_BASEDIR=$(TARGETDIR)/bin|" bin/kubectl
 
 create-dirs: ## Create directories
-	@echo Creating target directory $(TARGETDIR)...
+	@echo Creating target directory $(TARGETDIR).
 	@mkdir -p $(TARGETDIR)/{bin,clusters,config}
 
 copy-binary-wrappers: ## Copy wrappers to binaries directory
-	@echo Copying wrappers...
+	@echo Copying wrappers.
 	@mv -f openshift-install-wrapper $(TARGETDIR)/bin
 	@cp -f bin/* $(TARGETDIR)/bin
 	@chmod 755 $(TARGETDIR)/bin/openshift-install-wrapper

README.md

@@ -97,6 +97,7 @@ $ openshift-install-wrapper --install \
  ✔  Installer for 4.4.7 found. Continuing.
 → Checking if the cluster directory already exists...
 → Creating install-config.yaml file...
+ ✔  Using specific install-config for aws-4.4.7...
 → Running "openshift-install" to create a cluster...
  ✔  Cluster created!
 To access the cluster as the system:admin user when using 'oc', run 'export KUBECONFIG=/home/sgarcia/.local/ocp4/clusters/sgarcia-ocp447-3.aws.gmbros.net/auth/kubeconfig'

src/config/10_defaults.sh

@@ -2,7 +2,7 @@
 __baseurl=https://mirror.openshift.com/pub/openshift-v4/clients/ocp
 
 # defaults
-VERSION=1.6.0
+VERSION=1.7.0
 VERBOSE=0
 QUIET=0
 FORCE=0

src/config/templates/.merge-templates.sh

@@ -3,12 +3,20 @@
 output_file="../30_templates.sh"
 echo "# install-config templates" > "$output_file"
 
+for platform_dir in $(find . -mindepth 1 -maxdepth 1 -type d); do
+  platform=$(basename "$platform_dir")
+  if [[ ! -f "$platform_dir/default.yaml" ]]; then
+    echo "Error: No default.yaml template for $platform platform. Fix the templates and try again."
+    exit
+  fi
+done
+
 for file in $(find . -type f -name "*.yaml"); do
-    platform=$(basename $(dirname "$file"))
-    filename=$(basename "$file" .yaml)
-    key="${platform}-${filename}"
+  platform=$(basename $(dirname "$file"))
+  filename=$(basename "$file" .yaml)
+  key="${platform}-${filename}"
 
-    base64_content=$(base64 -w 0 "$file")
-    echo "INSTALLTEMPLATES[$key]=\"$base64_content\"" >> "$output_file"
+  base64_content=$(base64 -w 0 "$file")
+  echo "INSTALLTEMPLATES[$key]=\"$base64_content\"" >> "$output_file"
 done
 echo "" >> "$output_file"

src/helpers/30_create_install_config.sh

@@ -15,7 +15,30 @@ create_install_config() {
 
   mkdir -p ${clusterdir}
   out "→ Creating install-config.yaml file..."
-  echo ${INSTALLTEMPLATES[${INSTALLOPTS[platform]}-default]} | base64 -d > ${clusterdir}/install-config.yaml
+  key=${INSTALLOPTS[platform]}-${INSTALLOPTS[version]}
+  if [[ -n "${INSTALLTEMPLATES[$key]}" ]]; then
+    success "Using specific install-config template for ${key}..."
+    installtemplate="${INSTALLTEMPLATES[$key]}"
+  else
+    minor_version="${INSTALLOPTS[version]%.*}"
+    key="${INSTALLOPTS[platform]}-${minor_version}"
+
+    if [[ -n "${INSTALLTEMPLATES[$key]}" ]]; then
+      success "Using specific install-config template for ${key}..."
+      installtemplate="${INSTALLTEMPLATES[$key]}"
+    else
+      key="${INSTALLOPTS[platform]}-default"
+      
+      if [[ -n "${INSTALLTEMPLATES[$key]}" ]]; then
+        success "Using default install-config template for ${INSTALLOPTS[platform]}..."
+        installtemplate="${INSTALLTEMPLATES[$key]}"
+      else
+        die "Unable to find a valid install-config template for the given platform/version."
+      fi
+    fi
+  fi
+
+  echo ${installtemplate} | base64 -d > ${clusterdir}/install-config.yaml
 
   sed -i "s/NAME/${INSTALLOPTS[name]}/g;" ${clusterdir}/install-config.yaml
   sed -i "s/DOMAIN/${INSTALLOPTS[domain]}/g;" ${clusterdir}/install-config.yaml