Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Jan 16, 2020
2 parents cd3282f + 6b67039 commit c622500
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 27 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Ansible Role for Kubernetes

## 4.1.0 - TBC
## 4.2.0 - TBC

### Major Changes

## 4.1.0 - 2020-01-16

### Major Changes

- Default `interpreter_python` with `python3`
- Bugfix `python3-xml` not exists for openSUSE Leap 15.1
- Bugfix `kubernetes_version` with other roles

## 4.0.0 - 2019-11-05

### Major Changes
Expand Down
2 changes: 1 addition & 1 deletion ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ scp_if_ssh = true
ansible_managed = Ansible managed: Do NOT edit this file manually!
forks = 10
host_key_checking = false
interpreter_python = auto
interpreter_python = python3
nocows = 1
retry_files_enabled = false
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

# Kubernetes version.
kubernetes_version: "v1.17.0"
kubernetes_version: "v1.17.1"

# Kubernetes cluster name.
kubernetes_cluster_name: "{{ hostvars[ansible_play_hosts[0]].ansible_machine_id | to_uuid }}"
Expand Down
8 changes: 4 additions & 4 deletions molecule/centos-7/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down
8 changes: 4 additions & 4 deletions molecule/redhat-7-vagrant/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down
8 changes: 4 additions & 4 deletions molecule/suse-15/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down
8 changes: 4 additions & 4 deletions molecule/ubuntu-16.04/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down
8 changes: 4 additions & 4 deletions molecule/ubuntu-18.04-vagrant/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down
8 changes: 4 additions & 4 deletions molecule/ubuntu-18.04/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
--autosubscribe
ignore_errors: true

- name: redhat | yum install ca-certificates curl python3 sudo
- name: redhat | yum install -y ca-certificates curl python3 sudo
raw: |
yum install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: suse | zypper install ca-certificates* curl python3 sudo
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
raw: |
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y ca-certificates* curl python3 sudo
zypper -n install -y ca-certificates curl python3 sudo
ignore_errors: true

- name: debian | apt-get install ca-certificates curl python3 sudo
- name: debian | apt-get install -y ca-certificates curl python3 sudo
raw: |
apt-get update
apt-get install -y ca-certificates curl python3 sudo
Expand Down

0 comments on commit c622500

Please sign in to comment.