Matthew Mosesohn 7 years ago
committed by GitHub
parent
commit
781f31d2b8
1 changed files with 20 additions and 18 deletions
  1. 38
      .gitlab-ci.yml

38
.gitlab-ci.yml

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

|||||||
100:0
Loading…
Cancel
Save