Merge pull request #2508 from melkosoft/cilium

Cilium v.1.0.0-rc8
pull/2333/head
Chad Swenson 2018-03-21 20:25:43 -05:00 committed by GitHub
commit bbb6e7b3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 2 deletions

View File

@ -257,10 +257,14 @@ before_script:
# stage: deploy-special
MOVED_TO_GROUP_VARS: "true"
.ubuntu_cilium_sep_variables: &ubuntu_cilium_sep_variables
.coreos_cilium_variables: &coreos_cilium_variables
# stage: deploy-special
MOVED_TO_GROUP_VARS: "true"
.ubuntu_cilium_sep_variables: &ubuntu_cilium_sep_variables
# stage: deploy-special
MOVED_TO_GROUP_VARS: "true"
.rhel7_weave_variables: &rhel7_weave_variables
# stage: deploy-part1
MOVED_TO_GROUP_VARS: "true"
@ -459,6 +463,17 @@ gce_ubuntu-contiv-sep:
except: ['triggers']
only: ['master', /^pr-.*$/]
gce_coreos-cilium:
stage: deploy-special
<<: *job
<<: *gce
variables:
<<: *gce_variables
<<: *coreos_cilium_variables
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
gce_ubuntu-cilium-sep:
stage: deploy-special
<<: *job

View File

@ -41,7 +41,7 @@ vault_version: 0.8.1
weave_version: 2.2.0
pod_infra_version: 3.0
contiv_version: 1.1.7
cilium_version: "v1.0.0-rc4"
cilium_version: "v1.0.0-rc8"
# Download URLs
istioctl_download_url: "https://storage.googleapis.com/istio-release/releases/{{ istio_version }}/istioctl/istioctl-linux"

View File

@ -54,9 +54,11 @@ rules:
- get
- list
- watch
- update
- apiGroups:
- cilium.io
resources:
- ciliumnetworkpolicies
- ciliumendpoints
verbs:
- "*"

View File

@ -79,6 +79,13 @@ spec:
optional: true
key: prometheus-serve-addr
{% endif %}
resources:
limits:
cpu: {{ cilium_cpu_limit }}
memory: {{ cilium_memory_limit }}
requests:
cpu: {{ cilium_cpu_requests }}
memory: {{ cilium_memory_requests }}
livenessProbe:
exec:
command:

View File

@ -7,5 +7,6 @@ mode: default
# Deployment settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
kubedns_min_replicas: 1
cloud_provider: gce

View File

@ -9,5 +9,6 @@ kube_network_plugin: cilium
bootstrap_os: coreos
resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
deploy_netchecker: true
enable_network_policy: true
kubedns_min_replicas: 1
cloud_provider: gce

View File

@ -6,5 +6,6 @@ mode: default
# Deployment settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
kubedns_min_replicas: 1
cloud_provider: gce

View File

@ -6,6 +6,7 @@ mode: separate
# Deployment settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
kubedns_min_replicas: 1
cloud_provider: gce