diff --git a/defaults.yml b/defaults.yml index 33cb64ac..5386d76c 100644 --- a/defaults.yml +++ b/defaults.yml @@ -57,7 +57,7 @@ vsphere_repo: "https://px-deploy.s3.eu-west-1.amazonaws.com/templates/" #vsphere_folder: "" ocp4_domain: "" -ocp4_version: 4.14.16 +ocp4_version: 4.16.17 ocp4_pull_secret: "" #env: diff --git a/terraform/aws/ocp4/ocp4-install-config.tpl b/terraform/aws/ocp4/ocp4-install-config.tpl index 8233e432..c6172348 100644 --- a/terraform/aws/ocp4/ocp4-install-config.tpl +++ b/terraform/aws/ocp4/ocp4-install-config.tpl @@ -21,7 +21,7 @@ networking: - cidr: 10.128.0.0/14 hostPrefix: 23 machineCIDR: ${tpl_cidr} - networkType: OpenShiftSDN + networkType: OVNKubernetes serviceNetwork: - 172.30.0.0/16 platform: diff --git a/vagrant/ocp4-master b/vagrant/ocp4-master index 8a7e43f9..b3b29085 100644 --- a/vagrant/ocp4-master +++ b/vagrant/ocp4-master @@ -10,9 +10,9 @@ ln -s /usr/local/bin/aws /usr/bin/aws eval $(ssh-agent) cd /tmp wget -q https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$ocp4_version/openshift-install-linux-$ocp4_version.tar.gz -wget -q https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$ocp4_version/openshift-client-linux-$ocp4_version.tar.gz +wget -q https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.15.38/openshift-client-linux-4.15.38.tar.gz tar xzf openshift-install-linux-$ocp4_version.tar.gz -tar xzf openshift-client-linux-$ocp4_version.tar.gz +tar xzf openshift-client-linux-4.15.38.tar.gz mv openshift-install oc kubectl /usr/bin rm -f openshift-install-linux-$ocp4_version.tar.gz openshift-client-linux-$ocp4_version.tar.gz