From 38bf2779870ec8ab95955990ecb0a5288b72de94 Mon Sep 17 00:00:00 2001
From: Paul Bastide <pbastide@us.ibm.com>
Date: Wed, 6 Dec 2023 11:57:00 -0500
Subject: [PATCH] chore: update the ibmcloud power-iaas plugin to v0.6.0

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
---
 modules/4_pvs_support/pvs_support.tf        | 38 ---------------------
 modules/5_image/files/upload_rhcos_image.sh |  4 +--
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/modules/4_pvs_support/pvs_support.tf b/modules/4_pvs_support/pvs_support.tf
index 6822eb2..4dd41a2 100644
--- a/modules/4_pvs_support/pvs_support.tf
+++ b/modules/4_pvs_support/pvs_support.tf
@@ -310,44 +310,6 @@ EOF
   }
 }
 
-# # Dev Note: create the dns lookup
-# resource "null_resource" "update_dns_resolver_for_vpc" {
-#   #  depends_on = [null_resource.wait_on_mcp]
-#   depends_on = [null_resource.latest_ignition]
-#   connection {
-#     type        = "ssh"
-#     user        = var.rhel_username
-#     host        = var.bastion_public_ip
-#     private_key = file(var.private_key_file)
-#     agent       = var.ssh_agent
-#     timeout     = "${var.connection_timeout}m"
-#   }
-
-#   provisioner "remote-exec" {
-#     inline = [<<EOF
-# if [ -z "$(command -v ibmcloud)" ]
-# then
-#   echo "ibmcloud CLI doesn't exist, installing"
-#   curl -fsSL https://clis.cloud.ibm.com/install/linux | sh
-# fi
-
-# ibmcloud login --apikey "${var.ibmcloud_api_key}" -r "${var.vpc_region}" -g "${var.resource_group}"
-# ibmcloud plugin install -f cloud-internet-services vpc-infrastructure cloud-object-storage power-iaas is
-
-# export IBMCLOUD_IS_FEATURE_VPC_DNS_SHARING=true
-# ibmcloud is vpcu ${var.vpc_name}  --dns-enable-hub true --dns-resolver-type manual --dns-resolver-manual-servers '[
-#     {
-#         "address": "${var.ignition_ip}"
-#     }
-# ]'
-
-# echo "waiting to reconcile the status"
-# sleep 60
-# EOF
-#     ]
-#   }
-# }
-
 # Dev Note: only on destroy - restore chrony
 resource "null_resource" "remove_chrony_changes" {
   depends_on = [null_resource.set_routing_via_host]
diff --git a/modules/5_image/files/upload_rhcos_image.sh b/modules/5_image/files/upload_rhcos_image.sh
index b962524..b0291ab 100644
--- a/modules/5_image/files/upload_rhcos_image.sh
+++ b/modules/5_image/files/upload_rhcos_image.sh
@@ -23,8 +23,8 @@ fi
 ibmcloud login --apikey "${API_KEY}" -r "${REGION}" -g "${RESOURCE_GROUP}"
 ibmcloud plugin install -f cloud-internet-services vpc-infrastructure cloud-object-storage is
 
-# Pin the version to 0.4.9 (v1.0.0 may be incompatible)
-ibmcloud plugin install -v 0.4.9 -f power-iaas
+# Pin the version to 0.6.0 (v1.0.0 may be incompatible)
+ibmcloud plugin install -v 0.6.0 -f power-iaas
 
 # Download the RHCOS qcow2
 TARGET_DIR=".openshift/image-local"