Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: okd 3.11 #78

Merged
merged 1 commit into from
Mar 6, 2019
Merged

feat: okd 3.11 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This project shows you how to set up OpenShift on AWS using Terraform. This the companion project to my article [Get up and running with OpenShift on AWS](http://www.dwmkerr.com/get-up-and-running-with-openshift-on-aws/).

![OpenShift Sample Project](./docs/okd_3.10_screenshot.png)
![OpenShift Sample Project](./docs/okd_3.11_screenshot.png)

I am also adding some 'recipes' which you can use to mix in more advanced features:

Expand Down Expand Up @@ -219,19 +219,20 @@ When you run `make openshift`, all that happens is the `inventory.template.cfg`

## Choosing the OpenShift Version

Currently, OKD 3.10 is installed.
Currently, OKD 3.11 is installed.

To change the version, you can attempt to update the version identifier in this line of the [`./install-from-bastion.sh`](./install-from-bastion.sh) script:

```bash
git clone -b release-3.10 https://github.com/openshift/openshift-ansible
git clone -b release-3.11 https://github.com/openshift/openshift-ansible
```

However, this may not work if the version you change to requires a different setup. To allow people to install earlier versions, stable branches are available. Available versions are listed [here](https://github.com/openshift/openshift-ansible#getting-the-correct-version).


| Version | Status | Branch |
|---------|---------------------|------------------------------------------------------------------------------------------------|
| 3.11 | Work in Progress | [`release/okd-3.11`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/okd-3.11) |
| 3.10 | Tested successfully | [`release/okd-3.10`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/okd-3.10) |
| 3.9 | Tested successfully | [`release/ocp-3.9`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/ocp-3.9) |
| 3.8 | Untested | |
Expand Down
Binary file added docs/okd_3.11_screenshot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions install-from-bastion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ sudo -E su
# Install dev tools.
yum install -y "@Development Tools" python2-pip openssl-devel python-devel gcc libffi-devel

# Get the OpenShift 3.10 installer.
# Get the OKD 3.11 installer.
pip install -I ansible==2.6.5
git clone -b release-3.10 https://github.com/openshift/openshift-ansible
git clone -b release-3.11 https://github.com/openshift/openshift-ansible

# # Get the OpenShift 3.10 installer.
# pip install -I ansible==2.6.5
# git clone -b release-3.10 https://github.com/openshift/openshift-ansible

# Get the OpenShift 3.9 installer.
# pip install -I ansible==2.4.3.0
Expand Down
4 changes: 2 additions & 2 deletions inventory.template.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ ansible_ssh_user=ec2-user
# If ansible_ssh_user is not root, ansible_become must be set to true
ansible_become=true

# Deploy OKD 3.10.
# Deploy OKD 3.11.
openshift_deployment_type=origin
openshift_release=v3.10
openshift_release=v3.11

# We need a wildcard DNS setup for our public access to services, fortunately
# we can use the superb xip.io to get one for free.
Expand Down