Adjust weave daemonset for serial deployment

This commit is contained in:
Matthew Mosesohn
2017-02-16 18:12:54 +03:00
parent 97ebbb9672
commit 617edda9ba
2 changed files with 6 additions and 8 deletions

View File

@@ -262,7 +262,6 @@ before_script:
KUBE_NETWORK_PLUGIN: weave
CLOUD_IMAGE: rhel-7
CLOUD_REGION: europe-west1-b
UPGRADE_TEST: "graceful"
CLUSTER_MODE: default
.centos7_flannel_variables: &centos7_flannel_variables
@@ -278,6 +277,7 @@ before_script:
CLOUD_IMAGE: debian-8-kubespray
CLOUD_REGION: us-central1-b
CLUSTER_MODE: default
UPGRADE_TEST: "graceful"
.coreos_canal_variables: &coreos_canal_variables
# stage: deploy-gce-part2
@@ -328,6 +328,7 @@ before_script:
CLUSTER_MODE: separate
ETCD_DEPLOYMENT: rkt
KUBELET_DEPLOYMENT: rkt
UPGRADE_TEST: "graceful"
.ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables
# stage: deploy-gce-part1
@@ -540,7 +541,7 @@ coreos-alpha-weave-ha:
except: ['triggers']
only: ['master', /^pr-.*$/]
ubuntu-rkt-sep:
ubuntu-rkt-sep-upgrade:
stage: deploy-gce-part1
<<: *job
<<: *gce