Merge pull request #183 from IIG/CPD4.0_dev

change in API for volume attachment script and updated terraform versions
IBM · Jul 29, 2021 · 4dcf3ff · 4dcf3ff
2 parents fb899e0 + 2780ec5
commit 4dcf3ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/managed-openshift/ibmcloud/Dockerfile b/managed-openshift/ibmcloud/Dockerfile
@@ -11,8 +11,8 @@ RUN install_clean wget unzip jq nano
 WORKDIR /tmp
 
 # terraform
-RUN wget --no-verbose https://releases.hashicorp.com/terraform/0.12.29/terraform_0.12.29_linux_amd64.zip \
- && unzip terraform_0.12.29_linux_amd64.zip \
+RUN wget --no-verbose https://releases.hashicorp.com/terraform/0.12.31/terraform_0.12.31_linux_amd64.zip \
+ && unzip terraform_0.12.31_linux_amd64.zip \
  && mv terraform /usr/bin/ \
  && echo 'alias tf=terraform' >> $HOME/.profile
 
@@ -22,10 +22,10 @@ RUN wget --no-verbose https://github.com/IBM/cloud-pak-cli/releases/download/v3.
  && mv cloudctl-linux-amd64 /usr/bin/cloudctl
 
 # terraform-provider-ibm
-RUN wget --no-verbose https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.20.1/terraform-provider-ibm_1.20.1_linux_amd64.zip \
- && unzip terraform-provider-ibm_1.20.1_linux_amd64.zip \
+RUN wget --no-verbose https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.28.0/terraform-provider-ibm_1.28.0_linux_amd64.zip \
+ && unzip terraform-provider-ibm_1.28.0_linux_amd64.zip \
  && mkdir -p $HOME/.terraform.d/plugins \
- && mv terraform-provider-ibm_v1.20.1 $HOME/.terraform.d/plugins/
+ && mv terraform-provider-ibm_v1.28.0 $HOME/.terraform.d/plugins/
 
 # oc and kubectl
 RUN wget --no-verbose https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.6/openshift-client-linux.tar.gz \

diff --git a/managed-openshift/ibmcloud/main.tf b/managed-openshift/ibmcloud/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  required_version = "v0.12.29"
+  required_version = "v0.12.31"
   required_providers {
-    ibm = "1.20.1"
+    ibm = "1.28.0"
     kubernetes = "1.13.3"
     null = "~> 3.0"
   }

diff --git a/managed-openshift/ibmcloud/portworx/scripts/volume_attachment.sh b/managed-openshift/ibmcloud/portworx/scripts/volume_attachment.sh
@@ -17,7 +17,7 @@ ID=$(echo $RESPONSE | jq -r --arg VOLUMEID "$VOLUME_ID" '.volume_attachments[] |
 if [ "$ID" == "" ] || [ "$ID" == "null" ]; then
     if ! RESPONSE=$(
         curl -s -X POST -H "Authorization: $TOKEN" \
-            "https://$REGION.containers.cloud.ibm.com/v2/storage/vpc/createAttachment?cluster=$CLUSTER_ID&worker=$WORKER_ID&volumeID=$VOLUME_ID"
+            "https://$REGION.containers.cloud.ibm.com/v2/storage/vpc/createAttachment?cluster=$CLUSTER_ID&worker=$WORKER_ID&volumeID=$VOLUME_ID" -d '{}'
     ); then
       echo "Error when trying to /createAttachment"
       exit 1