Merge pull request #378 from bpradipt/podvm-builder

Adapt the scripts and Dockerfile for downstream builds

Author: snir911

Diff for: config/peerpods/podvm/Dockerfile

@@ -4,7 +4,7 @@ FROM quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-paylo
 # azure-podvm-image-handler.sh script under /scripts/azure-podvm-image-handler.sh
 # aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh
 # sources for cloud-api-adaptor under /src/cloud-api-adaptor
-# Binaries like kubectl, packer and yq under /usr/local/bin
+# Binaries like kubectl, packer and yq under /usr/local/bin will be installed by the scripts
 
 
 FROM registry.access.redhat.com/ubi9/ubi:9.3
@@ -18,12 +18,9 @@ COPY --from=payload /podvm-binaries.tar.gz /payload/
 ADD lib.sh aws-podvm-image-handler.sh azure-podvm-image-handler.sh  /scripts/
 
 RUN /scripts/azure-podvm-image-handler.sh -- install_rpms
-RUN /scripts/azure-podvm-image-handler.sh -- install_cli
-RUN /scripts/aws-podvm-image-handler.sh -- install_cli
-RUN /scripts/aws-podvm-image-handler.sh -- install_binaries
 
-ARG CAA_SRC
-ARG CAA_REF
+ARG CAA_SRC=https://github.com/confidential-containers/cloud-api-adaptor
+ARG CAA_REF=main
 ENV CAA_SRC=$CAA_SRC
 ENV CAA_REF=$CAA_REF
 RUN git clone ${CAA_SRC} -b ${CAA_REF} /src/cloud-api-adaptor

Diff for: config/peerpods/podvm/podvm-builder.sh

@@ -1,6 +1,22 @@
 #!/bin/bash
 #
 
+# Function to install Azure deps
+function install_azure_deps() {
+  echo "Installing Azure deps"
+  # Install the required packages
+  /scripts/azure-podvm-image-handler.sh -- install_cli
+  /scripts/azure-podvm-image-handler.sh -- install_binaries
+}
+
+# Function to install AWS deps
+function install_aws_deps() {
+  echo "Installing AWS deps"
+  # Install the required packages
+  /scripts/aws-podvm-image-handler.sh -- install_cli
+  /scripts/aws-podvm-image-handler.sh -- install_binaries
+}
+
 # Function to check if peer-pods-cm configmap exists
 function check_peer_pods_cm_exists() {
   if kubectl get configmap peer-pods-cm -n openshift-sandboxed-containers-operator >/dev/null 2>&1; then
@@ -82,7 +98,6 @@ function delete_podvm_image() {
 
   case "${CLOUD_PROVIDER}" in
   azure)
-
     # If IMAGE_ID is not set, then exit
     if [ -z "${IMAGE_ID}" ]; then
       echo "IMAGE_ID is not set. Skipping the deletion of Azure image"
@@ -173,8 +188,27 @@ function delete_podvm_image_gallery() {
   fi
 }
 
-# Call the function to create or delete podvm image based on argument
+function display_usage() {
+  echo "Usage: $0 {create|delete [-f]|delete-gallery [-f]}"
+}
 
+# Check if CLOUD_PROVIDER is set to azure or aws
+# Install the required dependencies
+case "${CLOUD_PROVIDER}" in
+azure)
+  install_azure_deps
+  ;;
+aws)
+  install_aws_deps
+  ;;
+*)
+  echo "CLOUD_PROVIDER is not set to azure or aws"
+  display_usage
+  exit 1
+  ;;
+esac
+
+# Call the function to create or delete podvm image based on argument
 case "$1" in
 create)
   create_podvm_image
@@ -186,7 +220,7 @@ delete-gallery)
   delete_podvm_image_gallery "$2"
   ;;
 *)
-  echo "Usage: $0 {create|delete [-f]|delete-gallery [-f]}"
+  display_usage
   exit 1
   ;;
 esac