Merge pull request #34 from satyamodi/master

Changes for issues #32 and #33
IBM · Sep 1, 2020 · d5f0939 · d5f0939
2 parents 62da6e4 + ea45ffa
commit d5f0939
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/aws/aws_infra/ocp-install.tf b/aws/aws_infra/ocp-install.tf
@@ -214,7 +214,8 @@ resource "null_resource" "install_efs" {
         "./create-efs.sh ${var.region} ${var.vpc_cidr} ${local.vpcid}",
         "sleep 180",
 
-        "FILESYSTEMID=`aws efs describe-file-systems --query 'FileSystems[*].FileSystemId' --output text`",
+        "CLUSTERID=$(oc get machineset -n openshift-machine-api -o jsonpath='{.items[0].metadata.labels.machine\\.openshift\\.io/cluster-api-cluster}')",
+        "FILESYSTEMID=$(aws efs describe-file-systems --query FileSystems[?Name==\\'$CLUSTERID-efs\\'].FileSystemId --output text)",
         "DNSNAME=$FILESYSTEMID.efs.${var.region}.amazonaws.com",
         "sed -i s/FILESYSTEMID/$FILESYSTEMID/g ${local.ocptemplates}/efs-configmap.yaml",
         "sed -i s/DNSNAME/$DNSNAME/g ${local.ocptemplates}/efs-configmap.yaml",

diff --git a/aws/ocs_module/deploy-with-olm.yaml b/aws/ocs_module/deploy-with-olm.yaml
@@ -25,9 +25,9 @@ metadata:
   name: ocs-operator
   namespace: openshift-storage
 spec:
-  channel: stable-4.3
+  channel: stable-4.4
   installPlanApproval: Automatic
   name: ocs-operator
   source: redhat-operators
   sourceNamespace: openshift-marketplace
-  startingCSV: ocs-operator.v4.3.0
+  startingCSV: ocs-operator.v4.4.2
diff --git a/aws/scripts/delete-efs.sh b/aws/scripts/delete-efs.sh
@@ -7,7 +7,8 @@ export PATH="~/.local/bin:$PATH"
 source ~/.bash_profile > /dev/null
 pip install awscli --upgrade --user > /dev/null
 
-FILESYSTEMID=`aws efs describe-file-systems --query 'FileSystems[*].FileSystemId' --output text`
+CLUSTERID=$(oc get machineset -n openshift-machine-api -o jsonpath='{.items[0].metadata.labels.machine\.openshift\.io/cluster-api-cluster}')
+FILESYSTEMID=`aws efs describe-file-systems --query FileSystems[?Name==\'$CLUSTERID-efs\'].FileSystemId --output text`
 MOUNT_TARGETID=`aws efs describe-mount-targets --file-system-id $FILESYSTEMID --query 'MountTargets[*].MountTargetId' --output text`
 for ids in ${MOUNT_TARGETID[@]}; do
 aws efs delete-mount-target --mount-target-id $ids