Remove non-kubeadm deployment (#3811)

* Remove non-kubeadm deployment

* More cleanup

* More cleanup

* More cleanup

* More cleanup

* Fix gitlab

* Try stop gce first before absent to make the delete process work

* More cleanup

* Fix bug with checking if kubeadm has already run

* Fix bug with checking if kubeadm has already run

* More fixes

* Fix test

* fix

* Fix gitlab checkout untill kubespray 2.8 is on quay

* Fixed

* Add upgrade path from non-kubeadm to kubeadm. Revert ssl path

* Readd secret checking

* Do gitlab checks from v2.7.0 test upgrade path to 2.8.0

* fix typo

* Fix CI jobs to kubeadm again. Fix broken hyperkube path

* Fix gitlab

* Fix rotate tokens

* More fixes

* More fixes

* Fix tokens
This commit is contained in:
Andreas Krüger
2018-12-06 11:33:38 +01:00
committed by Kubernetes Prow Robot
parent 0d1be39a97
commit ddffdb63bf
65 changed files with 111 additions and 2042 deletions

View File

@@ -18,6 +18,21 @@
k8s-{{test_name}}-1,k8s-{{test_name}}-2
{%- endif -%}
- name: stop gce instances
gce:
instance_names: "{{instance_names}}"
image: "{{ cloud_image | default(omit) }}"
service_account_email: "{{ gce_service_account_email }}"
pem_file: "{{ gce_pem_file | default(omit)}}"
credentials_file: "{{gce_credentials_file | default(omit)}}"
project_id: "{{ gce_project_id }}"
zone: "{{cloud_region | default('europe-west1-b')}}"
state: 'stopped'
async: 120
poll: 3
retries: 3
register: gce
- name: delete gce instances
gce:
instance_names: "{{instance_names}}"

View File

@@ -6,7 +6,7 @@ mode: ha
# Deployment settings
kube_network_plugin: flannel
kubeadm_enabled: false
kubeadm_enabled: true
skip_non_kubeadm_warning: true
deploy_netchecker: true
dns_min_replicas: 1

View File

@@ -9,4 +9,3 @@
password: "{{ lookup('password', credentials_dir + '/kube_user.creds length=15 chars=ascii_letters,digits') }}"
validate_certs: no
status_code: 200,401
when: not kubeadm_enabled|default(false)