|
@ -375,10 +375,10 @@ before_script: |
|
|
CLUSTER_MODE: separate |
|
|
CLUSTER_MODE: separate |
|
|
STARTUP_SCRIPT: "" |
|
|
STARTUP_SCRIPT: "" |
|
|
|
|
|
|
|
|
.ubuntu_calico_rbac_variables: &ubuntu_calico_rbac_variables |
|
|
|
|
|
|
|
|
.ubuntu_flannel_rbac_variables: &ubuntu_flannel_rbac_variables |
|
|
# stage: deploy-gce-special |
|
|
# stage: deploy-gce-special |
|
|
AUTHORIZATION_MODES: "{ 'authorization_modes': [ 'RBAC' ] }" |
|
|
AUTHORIZATION_MODES: "{ 'authorization_modes': [ 'RBAC' ] }" |
|
|
KUBE_NETWORK_PLUGIN: calico |
|
|
|
|
|
|
|
|
KUBE_NETWORK_PLUGIN: flannel |
|
|
CLOUD_IMAGE: ubuntu-1604-xenial |
|
|
CLOUD_IMAGE: ubuntu-1604-xenial |
|
|
CLOUD_REGION: europe-west1-b |
|
|
CLOUD_REGION: europe-west1-b |
|
|
CLUSTER_MODE: separate |
|
|
CLUSTER_MODE: separate |
|
@ -609,13 +609,13 @@ ubuntu-vault-sep: |
|
|
except: ['triggers'] |
|
|
except: ['triggers'] |
|
|
only: ['master', /^pr-.*$/] |
|
|
only: ['master', /^pr-.*$/] |
|
|
|
|
|
|
|
|
ubuntu-calico-rbac-sep: |
|
|
|
|
|
|
|
|
ubuntu-flannel-rbac-sep: |
|
|
stage: deploy-gce-special |
|
|
stage: deploy-gce-special |
|
|
<<: *job |
|
|
<<: *job |
|
|
<<: *gce |
|
|
<<: *gce |
|
|
variables: |
|
|
variables: |
|
|
<<: *gce_variables |
|
|
<<: *gce_variables |
|
|
<<: *ubuntu_calico_rbac_variables |
|
|
|
|
|
|
|
|
<<: *ubuntu_flannel_rbac_variables |
|
|
when: manual |
|
|
when: manual |
|
|
except: ['triggers'] |
|
|
except: ['triggers'] |
|
|
only: ['master', /^pr-.*$/] |
|
|
only: ['master', /^pr-.*$/] |
|
|