Merge pull request #688 from PureStorage-OpenConnect/px34

OCP 4.19 PX 3.4

Author: andrewh1978

defaults.yml

@@ -4,7 +4,7 @@ clusters: 1
 nodes: 3
 #ssh_pub_key: "ssh-rsa XXXXXXXXXXXXXXXXXXXXXX user@example"
 k8s_version: 1.31.8
-px_version: 3.3.1.1
+px_version: 3.4.0.1
 stop_after: 6
 quiet: false
 tags: "project=pxdeploy"
@@ -56,7 +56,7 @@ vsphere_repo: "https://px-deploy.s3.eu-west-1.amazonaws.com/templates/"
 #vsphere_folder: ""
 
 ocp4_domain: ""
-ocp4_version: 4.18.17
+ocp4_version: 4.19.9
 ocp4_credentials_mode: Mint
 ocp4_pull_secret: ""
 

scripts/clusterpair

@@ -45,13 +45,22 @@ if [ "$platform" = eks ] || [ "$platform" = ocp4 ]; then
     echo "waiting for remote portworx api lb service to respond http 200. ELB $REMOTE_EP"
     sleep 5
   done
+
+  LOCAL_PORT=$(kubectl get service portworx-api -n portworx -ojson | jq -r '.spec.ports[] | select(.name=="px-api") | .port')
+  REMOTE_PORT=$(kubectl --kubeconfig /tmp/dest_kubeconfig get service portworx-api -n portworx -ojson | jq -r '.spec.ports[] | select(.name=="px-api") | .port')
+
+  LOCAL_EP="--src-ep $LOCAL_EP:$LOCAL_PORT"
+  REMOTE_EP="--dest-ep $REMOTE_EP:$REMOTE_PORT"
+  echo "LOCAL_EP has been set to $LOCAL_EP"
+  echo "REMOTE_EP has been set to $REMOTE_EP"
+  
 #elif [ "$platform" = rancher ]; then
 #else
 #  host=$(kubectl get nodes -l 'node-role.kubernetes.io/worker in (worker,true)' -o json |jq -r '.items[0].status.addresses[] | select(.type=="InternalIP") | .address')
 fi
 
 #improvement: we may try to detect if DR licenses are enabled on both sides -> px api?
-kubectl pxc pxctl license list | grep PX-DR | grep -q yes && MODE=async-dr || MODE=migration
+/usr/bin/pxctl license list | grep PX-DR | grep -q yes && MODE=async-dr || MODE=migration
 echo Mode is $MODE
 
 if [ "$platform" = eks ]; then
@@ -63,6 +72,6 @@ if [ "$platform" = eks ]; then
 fi
 
 while : ; do
-  storkctl create clusterpair remotecluster --namespace kube-system --dest-kube-file /tmp/dest_kubeconfig --src-kube-file /root/.kube/config --provider s3 --s3-endpoint s3.amazonaws.com --s3-access-key $AWS_ACCESS_KEY --s3-secret-key $AWS_SECRET_KEY --s3-region $BUCKET_REGION  --bucket $DR_BUCKET --mode $MODE && break
+  storkctl create clusterpair remotecluster --namespace kube-system $LOCAL_EP $REMOTE_EP --dest-kube-file /tmp/dest_kubeconfig --src-kube-file /root/.kube/config --provider s3 --s3-endpoint s3.amazonaws.com --s3-access-key $AWS_ACCESS_KEY --s3-secret-key $AWS_SECRET_KEY --s3-region $BUCKET_REGION  --bucket $DR_BUCKET --mode $MODE && break
   sleep 5
 done

templates/ocp-kubevirt-single.yml

@@ -0,0 +1,9 @@
+description: Cluster OCP Virtualization Demo on a aws bare-metal
+scripts: ["install-awscli","install-px", "licenses", "ocp-kubevirt","kubevirt-apps"]
+aws_type: "c5n.metal"
+platform: "ocp4"
+cloud: "aws"
+clusters: 1
+env:
+  cloud_drive: "type%3Dgp2%2Csize%3D150"
+

terraform/aws/ocp4/ocp4-install-config.tpl

@@ -34,9 +34,17 @@ platform:
 %{ for tag_key, tag_value in tpl_aws_tag ~}
       ${tag_key} : ${tag_value}
 %{ endfor ~}
-    subnets:
-    - ${tpl_privsubnet}
-    - ${tpl_pubsubnet}
+    vpc:
+      subnets:
+      - id: ${tpl_privsubnet}
+        roles:
+        - type: ClusterNode
+        - type: ControlPlaneInternalLB
+      - id: ${tpl_pubsubnet}
+        roles:
+        - type: IngressControllerLB
+        - type: BootstrapNode
+        - type: ControlPlaneExternalLB
 pullSecret: '${tpl_ocp4pullsecret}'
 sshKey: '${tpl_sshkey}'