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

Allow to use minishift > v1.13.0 #53

Closed
wants to merge 4 commits into from
Closed

Allow to use minishift > v1.13.0 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c82dac
Allow to use minishift >= v1.13.0
Jun 19, 2018
319adba
Bump to latest release of docker-machine-kvm
Jun 19, 2018
cb49455
Bump default version of minishift
Jun 19, 2018
fc29ab2
Drop support for older versions of minishift
Jun 19, 2018
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ contra-env-setup/playbooks/group_vars/all/global.yml

### Minishift setup options
* setup_minishift: Setup a minishift cluster : default=true
* minishift_version: Minishift version to use : default=v1.12.0
* minishift_version: Minishift version to use : default=v1.17.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't support this as the default until we update the Custom CentOS ISO or we need to change the default CentOS ISO from minishift. I vote for the former since that will break others.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should work, because the MR also contains the Workaround for wrong SELinux context (which was the issue with newer versions of minishift). If we upgrade the CentOS image, then this workaround should no longer be needed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, that's main purpose of the 1st patch.
Allow to use v.1.17 with current default ISO.

The commit message even say that it can be reverted later when default ISO have right SELinux labeling

* minishift_dest_dir: Minishift binary and ISO directory : default={{ contra_env_setup_dir }}/minishift
* profile: Minishift profile : default=minishift
* disk_size: Disk size to use for minishift : default=40gb
Expand Down
4 changes: 2 additions & 2 deletions playbooks/group_vars/all/global.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ force_repo_clone: true
contra_env_setup_dir: "{{ ansible_env.HOME }}/.contra-env-setup"

# Docker KVM version
dkvm_version: v0.7.0
dkvm_version: v0.10.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this driver work with 1.12.0 of minishift?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will need to test with 1.12.0 but then we will need to drop the patch if we want to still support v1.12.0

fc29ab2

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping v0.10.0 is not enough because since 0.10.0 docker-machine-driver-kvm does not exist.
There are more versions with "distribution suffix" after name
e.g. docker-machine-driver-kvm-{centos7,alpine3.4,alpine3.5,ubuntu14.04,ubuntu16.04}

Previously it passed for me because I already had /usr/local/bin/docker-machine-driver-kvm on testing machines


## minishift values
# minishift version
minishift_version: v1.12.0
minishift_version: v1.17.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't support this as the default until we update the Custom CentOS ISO or we need to change the default CentOS ISO from minishift. I vote for the former since that will break others.


# default location for minishift
minishift_dest_dir: "{{ contra_env_setup_dir }}/minishift"
Expand Down
3 changes: 3 additions & 0 deletions playbooks/roles/minishift/tasks/init_minishift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
pause:
minutes: 3

- name: Workaround for wrong SELinux context
shell: "{{ minishift_bin }} ssh --profile {{ profile }} -- sudo restorecon -R /var/lib/docker"

- name: Stop the cluster
shell: "{{ minishift_bin }} stop --profile {{ profile }}"

Expand Down
2 changes: 0 additions & 2 deletions playbooks/roles/minishift/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@

- name: "Set minishift skip-check-openshift-version"
shell: "{{ minishift_bin }} config set skip-check-openshift-version true"
when: minishift_version != "v1.12.0"

- name: "Set minishift skip-check-openshift-release"
shell: "{{ minishift_bin }} config set skip-check-openshift-release true"
when: minishift_version != "v1.12.0"

- name: "Pull down the minishift iso"
get_url:
Expand Down
3 changes: 3 additions & 0 deletions playbooks/roles/os_temps/tasks/start_mcluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
- name: "Start minishift profile {{ profile }}"
shell: "{{ minishift_bin }} start --profile {{ profile }} --cpus {{ cpus }} --disk-size {{ disk_size }} --memory {{ memory }} --openshift-version {{ oc_version }} --iso-url file:///{{ minishift_dest_dir }}/minishift.iso"
when: minishift_status.stdout == "Stopped"

- name: "Workaround for wrong SELinux context"
shell: "{{ minishift_bin }} ssh --profile {{ profile }} -- sudo restorecon -R /var/lib/docker"