mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-22 13:36:06 -03:30
Remove support for CoreOS Container Linux (#6576)
This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
- sfo2
|
||||
- blr1
|
||||
cloud_images:
|
||||
- coreos-beta
|
||||
- fedora-24-x64
|
||||
- centos-5-x64
|
||||
- centos-5-x32
|
||||
@@ -31,12 +30,10 @@
|
||||
- debian-8-x32
|
||||
- centos-6-x32
|
||||
- centos-6-x64
|
||||
- coreos-stable
|
||||
- ubuntu-16-10-x32
|
||||
- ubuntu-16-10-x64
|
||||
- freebsd-11-0-x64-zfs
|
||||
- freebsd-10-3-x64-zfs
|
||||
- coreos-alpha
|
||||
- ubuntu-12-04-x32
|
||||
- ubuntu-12-04-x64
|
||||
- ubuntu-16-04-x64
|
||||
|
||||
@@ -23,7 +23,7 @@ export ANSIBLE_BECOME_USER=root
|
||||
cd tests && make create-${CI_PLATFORM} -s ; cd -
|
||||
ansible-playbook tests/cloud_playbooks/wait-for-ssh.yml
|
||||
|
||||
# CoreOS needs auto update disabled
|
||||
# Flatcar Container Linux needs auto update disabled
|
||||
if [[ "$CI_JOB_NAME" =~ "coreos" ]]; then
|
||||
ansible all -m raw -a 'systemctl disable locksmithd'
|
||||
ansible all -m raw -a 'systemctl stop locksmithd'
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
- hosts: kube-master[0]
|
||||
tasks:
|
||||
|
||||
- name: Force binaries directory for Container Linux by CoreOS and Flatcar
|
||||
- name: Force binaries directory for Flatcar Container Linux by Kinvolk
|
||||
set_fact:
|
||||
bin_dir: "/opt/bin"
|
||||
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: Force binaries directory for other hosts
|
||||
set_fact:
|
||||
bin_dir: "/usr/local/bin"
|
||||
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- import_role:
|
||||
name: cluster-dump
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
- hosts: kube-master[0]
|
||||
tasks:
|
||||
|
||||
- name: Force binaries directory for Container Linux by CoreOS and Flatcar
|
||||
- name: Force binaries directory for Flatcar Container Linux by Kinvolk
|
||||
set_fact:
|
||||
bin_dir: "/opt/bin"
|
||||
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: Force binaries directory for other hosts
|
||||
set_fact:
|
||||
bin_dir: "/usr/local/bin"
|
||||
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- import_role:
|
||||
name: cluster-dump
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
test_image_tag: latest
|
||||
|
||||
tasks:
|
||||
- name: Force binaries directory for Container Linux by CoreOS and Flatcar
|
||||
- name: Force binaries directory for Flatcar Container Linux by Kinvolk
|
||||
set_fact:
|
||||
bin_dir: "/opt/bin"
|
||||
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: Force binaries directory for other hosts
|
||||
set_fact:
|
||||
bin_dir: "/usr/local/bin"
|
||||
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: Create test namespace # noqa 301 305
|
||||
shell: "{{ bin_dir }}/kubectl create namespace test"
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
- name: Force binaries directory for Container Linux by CoreOS and Flatcar
|
||||
set_fact:
|
||||
bin_dir: "/opt/bin"
|
||||
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: Force binaries directory on other hosts
|
||||
set_fact:
|
||||
bin_dir: "/usr/local/bin"
|
||||
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- import_role:
|
||||
name: cluster-dump
|
||||
|
||||
Reference in New Issue
Block a user