Fixed deploy cluster with vault cert manager (#1548)

* Added custom ips to etcd vault distributed certificates

* Added custom ips to kube-master vault distributed certificates

* Added comment about issue_cert_copy_ca var in vault/issue_cert role file

* Generate kube-proxy, controller-manager and scheduler certificates by vault

* Revert "Disable vault from CI (#1546)"

This reverts commit 781f31d2b8.

* Fixed upgrade cluster with vault cert manager

* Remove vault dir in reset playbook
This commit is contained in:
Maxim Krasilnikov
2017-08-20 13:53:58 +03:00
committed by Matthew Mosesohn
parent 72ae7638bc
commit 2ba285a544
8 changed files with 81 additions and 35 deletions

View File

@@ -367,15 +367,14 @@ before_script:
KUBELET_DEPLOYMENT: rkt
STARTUP_SCRIPT: ""
#Note(mattymo): Vault deployment is broken and needs work
#.ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables
## stage: deploy-gce-part1
# KUBE_NETWORK_PLUGIN: canal
# CERT_MGMT: vault
# CLOUD_IMAGE: ubuntu-1604-xenial
# CLOUD_REGION: us-central1-b
# CLUSTER_MODE: separate
# STARTUP_SCRIPT: ""
.ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables
# stage: deploy-gce-part1
KUBE_NETWORK_PLUGIN: canal
CERT_MGMT: vault
CLOUD_IMAGE: ubuntu-1604-xenial
CLOUD_REGION: us-central1-b
CLUSTER_MODE: separate
STARTUP_SCRIPT: ""
.ubuntu_flannel_rbac_variables: &ubuntu_flannel_rbac_variables
# stage: deploy-gce-special
@@ -600,17 +599,16 @@ ubuntu-rkt-sep:
except: ['triggers']
only: ['master', /^pr-.*$/]
#Note(mattymo): Vault deployment is broken (https://github.com/kubernetes-incubator/kubespray/issues/1545)
#ubuntu-vault-sep:
# stage: deploy-gce-part1
# <<: *job
# <<: *gce
# variables:
# <<: *gce_variables
# <<: *ubuntu_vault_sep_variables
# when: manual
# except: ['triggers']
# only: ['master', /^pr-.*$/]
ubuntu-vault-sep:
stage: deploy-gce-part1
<<: *job
<<: *gce
variables:
<<: *gce_variables
<<: *ubuntu_vault_sep_variables
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
ubuntu-flannel-rbac-sep:
stage: deploy-gce-special