updates

Author: screeley44

lib/post-install.sh

@@ -61,47 +61,32 @@
       pS=$( cat $PULLSECRETPATH )
       echo " ... ... ... uuid = $cID"
       cd ~/$CLUSTER_NAME
-      echo "apiVersion: v1beta4" > install-config.yaml
+      echo "apiVersion: v1" > install-config.yaml
       echo "baseDomain: $HOSTED_ZONE" >> install-config.yaml
-
-      # not sure I need this anymore - keeping for now
-      # echo "clusterID: $cID" >> install-config.yaml
-
       echo "compute:" >> install-config.yaml
-      echo "- name: worker" >> install-config.yaml
+      echo "- hyperthreading: Enabled" >> install-config.yaml
+      echo "  name: worker" >> install-config.yaml
       echo "  platform: {}" >> install-config.yaml
       echo "  replicas: $WORKER_COUNT" >> install-config.yaml
       echo "controlPlane:" >> install-config.yaml
+      echo "  hyperthreading: Enabled" >> install-config.yaml
       echo "  name: master" >> install-config.yaml
       echo "  platform: {}" >> install-config.yaml
       echo "  replicas: $MASTER_COUNT" >> install-config.yaml
-      # echo "machines:" >> install-config.yaml
-      # echo "- name: master" >> install-config.yaml
-      # echo "  platform: {}" >> install-config.yaml
-      # echo "  replicas: $MASTER_COUNT" >> install-config.yaml
-      # echo "- name: worker" >> install-config.yaml
-      # echo "  platform:" >> install-config.yaml
-      # echo "    $ISCLOUD:" >> install-config.yaml
-      # echo "      rootVolume:" >> install-config.yaml
-      # echo "        iops: 4000" >> install-config.yaml
-      # echo "        size: $ROOTSIZE" >> install-config.yaml
-      # echo "        type: io1" >> install-config.yaml
-      # echo "      type: c5.9xlarge" >> install-config.yaml
-      # echo "  replicas: $WORKER_COUNT" >> install-config.yaml
-
       echo "metadata:" >> install-config.yaml
       echo "  creationTimestamp: null" >> install-config.yaml
       echo "  name: $CLUSTER_NAME" >> install-config.yaml
       echo "networking:" >> install-config.yaml
-      echo "  clusterNetworks:" >> install-config.yaml
+      echo "  clusterNetwork:" >> install-config.yaml
       echo "  - cidr: 10.128.0.0/14" >> install-config.yaml
-      echo "    hostSubnetLength: 9" >> install-config.yaml
-      echo "  serviceCIDR: 172.30.0.0/16" >> install-config.yaml
-      echo "  type: OpenshiftSDN" >> install-config.yaml
+      echo "    hostPrefix: 23" >> install-config.yaml
+      echo "  machineCIDR: 10.0.0.0/16" >> install-config.yaml
+      echo "  networkType: OpenshiftSDN" >> install-config.yaml
+      echo "  serviceNetwork:" >> install-config.yaml
+      echo "  - 172.30.0.0/16" >> install-config.yaml
       echo "platform:" >> install-config.yaml
       echo "  $ISCLOUD:" >> install-config.yaml
       echo "    region: us-east-1" >> install-config.yaml
-      # echo "    vpcCIDRBlock: 10.0.0.0/16" >> install-config.yaml
       echo "pullSecret: '$pS'" >> install-config.yaml
       echo "sshKey: \"$sshK\"" >> install-config.yaml
       echo " ... ... ... install-config.yaml created!"